diff --git a/GIT-VERSION-FILE b/GIT-VERSION-FILE
index 9bcde6bcdb849cf1a8198ee728ceeab00cdea2fd..cb31246b9f15a011a05abe5771ee2eed7a4a6fd2 100644
--- a/GIT-VERSION-FILE
+++ b/GIT-VERSION-FILE
@@ -1 +1 @@
-GIT_VERSION = 2.29.0.rc1
+GIT_VERSION = 2.30.0
diff --git a/en/blame-options.txt b/en/blame-options.txt
index 88750af7ae19672dd1b44a6131b180acdc77ba16..dc3bceb6d1cad4f14bc00ace9618716dd459cb04 100644
--- a/en/blame-options.txt
+++ b/en/blame-options.txt
@@ -11,11 +11,12 @@
-L <start>,<end>::
-L :<funcname>::
- Annotate only the given line range. May be specified multiple times.
- Overlapping ranges are allowed.
+ Annotate only the line range given by '<start>,<end>',
+ or by the function name regex '<funcname>'.
+ May be specified multiple times. Overlapping ranges are allowed.
+
-<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>.
+'<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>'.
+
include::line-range-format.txt[]
diff --git a/en/config.txt b/en/config.txt
index bf706b950e6615b955fa481853bfbe5b84d2486c..bbd5c9b3ffa1ae95a1343c93a8a2355bf9d8b6db 100644
--- a/en/config.txt
+++ b/en/config.txt
@@ -64,7 +64,7 @@ The variable names are case-insensitive, allow only alphanumeric characters
and `-`, and must start with an alphabetic character.
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
+ending it with a `\`; the backslash 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
@@ -120,8 +120,8 @@ are:
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
-.git file is.
+would be the final location where the .git directory is, not where
+the .git file is.
+
The pattern can contain standard globbing wildcards and two additional
ones, `**/` and `/**`, that can match multiple path components. Please
@@ -240,13 +240,15 @@ boolean::
When a variable is said to take a boolean value, many
synonyms are accepted for 'true' and 'false'; these are all
case-insensitive.
-
- true;; Boolean true literals are `yes`, `on`, `true`,
- and `1`. Also, a variable defined without `= <value>`
- is taken as true.
-
- false;; Boolean false literals are `no`, `off`, `false`,
- `0` and the empty string.
++
+true;;
+ Boolean true literals are `yes`, `on`, `true`,
+ and `1`. Also, a variable defined without `= <value>`
+ is taken as true.
+
+false;;
+ Boolean false literals are `no`, `off`, `false`,
+ `0` and the empty string.
+
When converting a value to its canonical form using the `--type=bool` type
specifier, 'git config' will ensure that the output is "true" or
@@ -265,7 +267,7 @@ 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. All the basic colors except
-`normal` have a bright variant that can be speficied by prefixing the
+`normal` have a bright variant that can be specified by prefixing the
color with `bright`, like `brightred`.
+
Colors may also be given as numbers between 0 and 255; these use ANSI
@@ -334,6 +336,8 @@ include::config/checkout.txt[]
include::config/clean.txt[]
+include::config/clone.txt[]
+
include::config/color.txt[]
include::config/column.txt[]
diff --git a/en/diff-options.txt b/en/diff-options.txt
index 573fb9bb71e2b7df1062258289a0af308c50bf5b..746b144c76ba15f48b58d77ad88b88379f83529e 100644
--- a/en/diff-options.txt
+++ b/en/diff-options.txt
@@ -36,9 +36,9 @@ endif::git-format-patch[]
-U<n>::
--unified=<n>::
Generate diffs with <n> lines of context instead of
- the usual three. Implies `--patch`.
+ the usual three.
ifndef::git-format-patch[]
- Implies `-p`.
+ Implies `--patch`.
endif::git-format-patch[]
--output=<file>::
@@ -441,12 +441,16 @@ endif::git-format-patch[]
--binary::
In addition to `--full-index`, output a binary diff that
- can be applied with `git-apply`. Implies `--patch`.
+ can be applied with `git-apply`.
+ifndef::git-format-patch[]
+ Implies `--patch`.
+endif::git-format-patch[]
--abbrev[=<n>]::
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.
+ lines, show the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
In diff-patch output format, `--full-index` takes higher
precedence, i.e. if `--full-index` is specified, full blob
names will be shown regardless of `--abbrev`.
@@ -687,6 +691,11 @@ endif::git-format-patch[]
--ignore-blank-lines::
Ignore changes whose lines are all blank.
+-I<regex>::
+--ignore-matching-lines=<regex>::
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+
--inter-hunk-context=<lines>::
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
@@ -695,7 +704,10 @@ endif::git-format-patch[]
-W::
--function-context::
- Show whole surrounding functions of changes.
+ Show whole function as context lines for each change.
+ The function names are determined in the same way as
+ `git diff` works out patch hunk headers (see 'Defining a
+ custom hunk-header' in linkgit:gitattributes[5]).
ifndef::git-format-patch[]
ifndef::git-log[]
diff --git a/en/git-am.txt b/en/git-am.txt
index 38c0852139c17077aacb6bc43fcf8102cc6570f4..06bc063542f3044cc9fe7ced6ecd4922d2e209e2 100644
--- a/en/git-am.txt
+++ b/en/git-am.txt
@@ -33,7 +33,7 @@ OPTIONS
-s::
--signoff::
- Add a `Signed-off-by:` line to the commit message, using
+ Add a `Signed-off-by` trailer to the commit message, using
the committer identity of yourself.
See the signoff option in linkgit:git-commit[1] for more information.
diff --git a/en/git-blame.txt b/en/git-blame.txt
index 7e81541996359cf4b7a4abce35e8cae5c2ce29fb..34b496d4858134fb5c5e91bbd1537cd3ae076ccf 100644
--- a/en/git-blame.txt
+++ b/en/git-blame.txt
@@ -87,7 +87,9 @@ include::blame-options.txt[]
--abbrev=<n>::
Instead of using the default 7+1 hexadecimal digits as the
- abbreviated object name, use <n>+1 digits. Note that 1 column
+ abbreviated object name, use <m>+1 digits, where <m> is at
+ least <n> but ensures the commit object names are unique.
+ Note that 1 column
is used for a caret to mark the boundary commit.
diff --git a/en/git-branch.txt b/en/git-branch.txt
index ace4ad3da8874d7c38173f4badbc51b6a1b7fec5..adaa1782a8b26d4c5fb498ff3a1d33abb8e6ac19 100644
--- a/en/git-branch.txt
+++ b/en/git-branch.txt
@@ -9,7 +9,7 @@ SYNOPSIS
--------
[verse]
'git branch' [--color[=<when>] | --no-color] [--show-current]
- [-v [--abbrev=<length> | --no-abbrev]]
+ [-v [--abbrev=<n> | --no-abbrev]]
[--column[=<options>] | --no-column] [--sort=<key>]
[--merged [<commit>]] [--no-merged [<commit>]]
[--contains [<commit>]] [--no-contains [<commit>]]
@@ -194,8 +194,10 @@ This option is only applicable in non-verbose mode.
Be more quiet when creating or deleting a branch, suppressing
non-error messages.
---abbrev=<length>::
- Alter the sha1's minimum display length in the output listing.
+--abbrev=<n>::
+ In the verbose listing that show the commit object name,
+ show the shortest prefix that is at least '<n>' hexdigits
+ long that uniquely refers the object.
The default value is 7 and can be overridden by the `core.abbrev`
config option.
diff --git a/en/git-checkout.txt b/en/git-checkout.txt
index afa5c11fd3c4d58f978e5bb99a03517c642584c6..b1a6fe4499730690777de66558621446e1e58bac 100644
--- a/en/git-checkout.txt
+++ b/en/git-checkout.txt
@@ -192,7 +192,10 @@ branches from there if `<branch>` is ambiguous but exists on the
'origin' remote. See also `checkout.defaultRemote` in
linkgit:git-config[1].
+
-Use `--no-guess` to disable this.
+`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-l::
Create the new branch's reflog; see linkgit:git-branch[1] for
@@ -351,6 +354,10 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
<tree-ish>::
Tree to checkout from (when paths are given). If not specified,
the index will be used.
++
+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`.
\--::
Do not interpret any more arguments as options.
diff --git a/en/git-cherry-pick.txt b/en/git-cherry-pick.txt
index 75feeef08a0e64ac3f6bfc35290e92984c1a1580..5d750314b299cc7157034b9bffd6a5aa3afe51d4 100644
--- a/en/git-cherry-pick.txt
+++ b/en/git-cherry-pick.txt
@@ -104,7 +104,7 @@ effect to your index in a row.
-s::
--signoff::
- Add Signed-off-by line at the end of the commit message.
+ Add a `Signed-off-by` trailer at the end of the commit message.
See the signoff option in linkgit:git-commit[1] for more information.
-S[<keyid>]::
diff --git a/en/git-clone.txt b/en/git-clone.txt
index 097e6a86c5bdf31c9b30e277e9659bb3015081af..876aedcd472a4b04ee28f3cc524195a701222db5 100644
--- a/en/git-clone.txt
+++ b/en/git-clone.txt
@@ -183,8 +183,9 @@ objects from the source repository into a pack in the cloned repository.
-o <name>::
--origin <name>::
- Instead of using the remote name `origin` to keep track
- of the upstream repository, use `<name>`.
+ Instead of using the remote name `origin` to keep track of the upstream
+ repository, use `<name>`. Overrides `clone.defaultRemoteName` from the
+ config.
-b <name>::
--branch <name>::
diff --git a/en/git-commit.txt b/en/git-commit.txt
index a3baea32aedddfa00077adc5f2a2b36e38a5ea26..17150fa7eabe8092acf09f63220b515a0002a7b4 100644
--- a/en/git-commit.txt
+++ b/en/git-commit.txt
@@ -59,6 +59,7 @@ commit by giving the same set of parameters (options and paths).
If you make a commit and then find a mistake immediately after
that, you can recover from it with 'git reset'.
+:git-commit: 1
OPTIONS
-------
@@ -163,14 +164,7 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
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.
--s::
---signoff::
- 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).
+include::signoff-option.txt[]
-n::
--no-verify::
diff --git a/en/git-config.txt b/en/git-config.txt
index 7573160f21539592ddeccb3e36cdde04ed0347e6..0e9351d3cb550542c84274395717e1a99cf3464a 100644
--- a/en/git-config.txt
+++ b/en/git-config.txt
@@ -9,15 +9,15 @@ git-config - Get and set repository or global options
SYNOPSIS
--------
[verse]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
'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] [--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>] [--fixed-value] --replace-all name value [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
'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>] [--fixed-value] --unset name [value-pattern]
+'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
'git config' [<file-option>] --rename-section old_name new_name
'git config' [<file-option>] --remove-section name
'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
@@ -33,10 +33,13 @@ escaped.
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>>).
+lines, a `value-pattern` (which is an extended regular expression,
+unless the `--fixed-value` option is given) needs to be given. Only the
+existing values that match the pattern are updated or unset. If
+you want to handle the lines that do *not* match the pattern, just
+prepend a single exclamation mark in front (see also <<EXAMPLES>>),
+but note that this only works when the `--fixed-value` option is not
+in use.
The `--type=<type>` option instructs 'git config' to ensure that incoming and
outgoing values are canonicalize-able under the given <type>. If no
@@ -73,11 +76,11 @@ OPTIONS
--replace-all::
Default behavior is to replace at most one line. This replaces
- all lines matching the key (and optionally the value_regex).
+ all lines matching the key (and optionally the `value-pattern`).
--add::
Adds a new line to the option without altering any existing
- values. This is the same as providing '^$' as the value_regex
+ values. This is the same as providing '^$' as the `value-pattern`
in `--replace-all`.
--get::
@@ -165,6 +168,12 @@ See also <<FILES>>.
--list::
List all variables set in config file, along with their values.
+--fixed-value::
+ When used with the `value-pattern` argument, treat `value-pattern` as
+ an exact string instead of a regular expression. This will restrict
+ the name/value pairs that are matched to only those where the value
+ is exactly equal to the `value-pattern`.
+
--type <type>::
'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
diff --git a/en/git-diff-index.txt b/en/git-diff-index.txt
index f4bd8155c0a707308162e050d5d59b5dbd5ca7a6..27acb31cbf26f6d842a7445324950f6dfc2b2e68 100644
--- a/en/git-diff-index.txt
+++ b/en/git-diff-index.txt
@@ -9,7 +9,7 @@ git-diff-index - Compare a tree to the working tree or index
SYNOPSIS
--------
[verse]
-'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
DESCRIPTION
-----------
@@ -27,7 +27,12 @@ include::diff-options.txt[]
The id of a tree object to diff against.
--cached::
- do not consider the on-disk file at all
+ Do not consider the on-disk file at all.
+
+--merge-base::
+ Instead of comparing <tree-ish> directly, use the merge base
+ between <tree-ish> and HEAD instead. <tree-ish> must be a
+ commit.
-m::
By default, files recorded in the index but not checked
diff --git a/en/git-diff-tree.txt b/en/git-diff-tree.txt
index 5c8a2a5e9755db17be4063cdcb2edb8b48237436..2fc24c542f8cbd3e20af3575b09f52b6a4de5822 100644
--- a/en/git-diff-tree.txt
+++ b/en/git-diff-tree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
--------
[verse]
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
- [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+ [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
@@ -43,6 +43,11 @@ include::diff-options.txt[]
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.
+--merge-base::
+ Instead of comparing the <tree-ish>s directly, use the merge
+ base between the two <tree-ish>s as the "before" side. There
+ must be two <tree-ish>s given and they must both be commits.
+
--stdin::
When `--stdin` is specified, the command does not take
<tree-ish> arguments from the command line. Instead, it
diff --git a/en/git-diff.txt b/en/git-diff.txt
index 727f24d16ec931e4bb23f33f4f44f5c341e497f0..7f4c8a8ce7fd54f87e2c3936a6a1cf1cc623c60d 100644
--- a/en/git-diff.txt
+++ b/en/git-diff.txt
@@ -10,8 +10,8 @@ SYNOPSIS
--------
[verse]
'git diff' [<options>] [<commit>] [--] [<path>...]
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]
-'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
+'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]
'git diff' [<options>] <commit>...<commit> [--] [<path>...]
'git diff' [<options>] <blob> <blob>
'git diff' [<options>] --no-index [--] <path> <path>
@@ -40,7 +40,7 @@ files on disk.
or when running the command outside a working tree
controlled by Git. This form implies `--exit-code`.
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]::
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]::
This form is to view the changes you staged for the next
commit relative to the named <commit>. Typically you
@@ -49,6 +49,10 @@ files on disk.
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.
++
+If --merge-base is given, instead of using <commit>, use the merge base
+of <commit> and HEAD. `git diff --merge-base A` is equivalent to
+`git diff $(git merge-base A HEAD)`.
'git diff' [<options>] <commit> [--] [<path>...]::
@@ -58,23 +62,27 @@ files on disk.
branch name to compare with the tip of a different
branch.
-'git diff' [<options>] <commit> <commit> [--] [<path>...]::
+'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]::
This is to view the changes between two arbitrary
<commit>.
++
+If --merge-base is given, use the merge base of the two commits for the
+"before" side. `git diff --merge-base A B` is equivalent to
+`git diff $(git merge-base A B) B`.
'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]::
This form is to view the results of a merge commit. The first
listed <commit> must be the merge itself; the remaining two or
more commits should be its parents. A convenient way to produce
- the desired set of revisions is to use the {caret}@ suffix.
+ the desired set of revisions is to use the `^@` suffix.
For instance, if `master` names a merge commit, `git diff master
master^@` gives the same combined diff as `git show master`.
'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
- This is synonymous to the earlier form (without the "..") for
+ This is synonymous to the earlier form (without the `..`) for
viewing the changes between two arbitrary <commit>. If <commit> on
one side is omitted, it will have the same effect as
using HEAD instead.
@@ -83,20 +91,20 @@ files on disk.
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 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.
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>.
+in the `--merge-base` case and in the last two forms that use `..`
+notations, can be any <tree>.
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
+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].
'git diff' [<options>] <blob> <blob>::
@@ -144,9 +152,9 @@ $ git diff HEAD <3>
+
<1> Changes in the working tree not yet staged for the next commit.
<2> Changes between the index and your last commit; what you
- would be committing if you run "git commit" without "-a" option.
+ would be committing if you run `git commit` without `-a` option.
<3> Changes in the working tree since your last commit; what you
- would be committing if you run "git commit -a"
+ would be committing if you run `git commit -a`
Comparing with arbitrary commits::
+
diff --git a/en/git-filter-branch.txt b/en/git-filter-branch.txt
index 40ba4aa3e65b4c33886ba4334e5d3c84e979853e..62e482a95e23fd87aa0bc5496a0584a7a7285f85 100644
--- a/en/git-filter-branch.txt
+++ b/en/git-filter-branch.txt
@@ -532,7 +532,7 @@ 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
+filter-repo' 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
diff --git a/en/git-format-patch.txt b/en/git-format-patch.txt
index 0f81d0437bb65bd0ee68ef63edf7bb48d9ea87a6..3e49bf221087c06c7850e66cdc833b92d7dcb9bc 100644
--- a/en/git-format-patch.txt
+++ b/en/git-format-patch.txt
@@ -28,6 +28,7 @@ SYNOPSIS
[--no-notes | --notes[=<ref>]]
[--interdiff=<previous>]
[--range-diff=<previous> [--creation-factor=<percent>]]
+ [--filename-max-length=<n>]
[--progress]
[<common diff options>]
[ <since> | <revision range> ]
@@ -119,7 +120,7 @@ include::diff-options.txt[]
-s::
--signoff::
- Add `Signed-off-by:` line to the commit message, using
+ Add a `Signed-off-by` trailer to the commit message, using
the committer identity of yourself.
See the signoff option in linkgit:git-commit[1] for more information.
@@ -200,6 +201,13 @@ populated with placeholder text.
allows for useful naming of a patch series, and can be
combined with the `--numbered` option.
+--filename-max-length=<n>::
+ Instead of the standard 64 bytes, chomp the generated output
+ filenames at around '<n>' bytes (too short a value will be
+ silently raised to a reasonable length). Defaults to the
+ value of the `format.filenameMaxLength` configuration
+ variable, or 64 if unconfigured.
+
--rfc::
Alias for `--subject-prefix="RFC PATCH"`. RFC means "Request For
Comments"; use this when sending an experimental patch for
diff --git a/en/git-grep.txt b/en/git-grep.txt
index 6077ff01a4fce65a8f12c2ede83dce562bf0e1c3..4e0ba8234a0a8c2999c4a790cf0125438794d53d 100644
--- a/en/git-grep.txt
+++ b/en/git-grep.txt
@@ -241,7 +241,7 @@ providing this option will cause it to die.
--show-function::
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
+ 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]).
@@ -266,7 +266,9 @@ providing this option will cause it to die.
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.
+ found. The function names are determined in the same way as
+ `git diff` works out patch hunk headers (see 'Defining a
+ custom hunk-header' in linkgit:gitattributes[5]).
--threads <num>::
Number of grep worker threads to use.
diff --git a/en/git-log.txt b/en/git-log.txt
index 2b8ac5ff882ae84d52d08458c2439f314d2a0370..dd189a353a443e8d1b18ae95ece7d7d24cceee3d 100644
--- a/en/git-log.txt
+++ b/en/git-log.txt
@@ -77,20 +77,7 @@ produced by `--stat`, etc.
Intended to speed up tools that read log messages from `git log`
output by allowing them to allocate space in advance.
--L <start>,<end>:<file>::
--L :<funcname>:<file>::
- 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.
-+
-include::line-range-format.txt[]
+include::line-range-options.txt[]
<revision range>::
Show only commits in the specified revision range. When no
diff --git a/en/git-ls-files.txt b/en/git-ls-files.txt
index 3cb2ebb4380e28e8e4b4e1bb5e3f4ae511960b7a..cbcf5263dd01b88537563a97bd1977bf52c3b88c 100644
--- a/en/git-ls-files.txt
+++ b/en/git-ls-files.txt
@@ -19,7 +19,7 @@ SYNOPSIS
[--exclude-standard]
[--error-unmatch] [--with-tree=<tree-ish>]
[--full-name] [--recurse-submodules]
- [--abbrev] [--] [<file>...]
+ [--abbrev[=<n>]] [--] [<file>...]
DESCRIPTION
-----------
@@ -153,7 +153,8 @@ a space) at the start of each line:
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
- lines, show only a partial prefix.
+ lines, show the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
Non default number of digits can be specified with --abbrev=<n>.
--debug::
diff --git a/en/git-ls-tree.txt b/en/git-ls-tree.txt
index a7515714da1aaa77dddf31272f2fb62a174ba95b..db02d6d79a9c2e092f6c0755300eb2a4579887c0 100644
--- a/en/git-ls-tree.txt
+++ b/en/git-ls-tree.txt
@@ -62,7 +62,8 @@ OPTIONS
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
- lines, show only a partial prefix.
+ lines, show the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
Non default number of digits can be specified with --abbrev=<n>.
--full-name::
diff --git a/en/git-p4.txt b/en/git-p4.txt
index dab9609013fd5c4fb1947bc5f8cd9cd4e2b5063c..ec233ac0c1c1568a5516aa3bfe6a9c1fc4dcc0e4 100644
--- a/en/git-p4.txt
+++ b/en/git-p4.txt
@@ -417,7 +417,7 @@ p4-post-changelist
~~~~~~~~~~~~~~~~~~
The `p4-post-changelist` hook is invoked after the submit has
-successfully occured in P4. It takes no parameters and is meant
+successfully occurred in P4. It takes no parameters and is meant
primarily for notification and cannot affect the outcome of the
git p4 submit action.
diff --git a/en/git-push.txt b/en/git-push.txt
index 3b8053447e204499f28ab1616ce74efa87524536..ab103c82cfdc38c37e7aa0e07c324ca31681ae22 100644
--- a/en/git-push.txt
+++ b/en/git-push.txt
@@ -13,7 +13,7 @@ SYNOPSIS
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
[-u | --set-upstream] [-o <string> | --push-option=<string>]
[--[no-]signed|--signed=(true|false|if-asked)]
- [--force-with-lease[=<refname>[:<expect>]]]
+ [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
[--no-verify] [<repository> [<refspec>...]]
DESCRIPTION
@@ -320,6 +320,14 @@ 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.
++
+Alternatively, specifying `--force-if-includes` as an ancillary option
+along with `--force-with-lease[=<refname>]` (i.e., without saying what
+exact commit the ref on the remote side must be pointing at, or which
+refs on the remote side are being protected) at the time of "push" will
+verify if updates from the remote-tracking refs that may have been
+implicitly updated in the background are integrated locally before
+allowing a forced update.
-f::
--force::
@@ -341,6 +349,22 @@ 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.
+--[no-]force-if-includes::
+ Force an update only if the tip of the remote-tracking ref
+ has been integrated locally.
++
+This option enables a check that verifies if the tip of the
+remote-tracking ref is reachable from one of the "reflog" entries of
+the local branch based in it for a rewrite. The check ensures that any
+updates from the remote have been incorporated locally by rejecting the
+forced update if that is not the case.
++
+If the option is passed without specifying `--force-with-lease`, or
+specified along with `--force-with-lease=<refname>:<expect>`, it is
+a "no-op".
++
+Specifying `--no-force-if-includes` disables this behavior.
+
--repo=<repository>::
This option is equivalent to the <repository> argument. If both
are specified, the command-line argument takes precedence.
diff --git a/en/git-rebase.txt b/en/git-rebase.txt
index cfc7440290ae25a9784bd7c649e5729c59b5af5c..a0487b5cc58816ac8c4ec700e56a5d116fd61824 100644
--- a/en/git-rebase.txt
+++ b/en/git-rebase.txt
@@ -496,7 +496,7 @@ See also INCOMPATIBLE OPTIONS below.
See also INCOMPATIBLE OPTIONS below.
--signoff::
- Add a Signed-off-by: trailer to all the rebased commits. Note
+ 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.
+
@@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible:
* --fork-point and --root
BEHAVIORAL DIFFERENCES
-----------------------
+-----------------------
git rebase has two primary backends: apply and merge. (The apply
backend used to be known as the 'am' backend, but the name led to
diff --git a/en/git-remote.txt b/en/git-remote.txt
index ea73386c811b5fd96ba44cc09e7f6992cbbd747e..31c29c9b31b202eeba1fbb2fe0d31054d46d4882 100644
--- a/en/git-remote.txt
+++ b/en/git-remote.txt
@@ -203,6 +203,17 @@ The remote configuration is achieved using the `remote.origin.url` and
`remote.origin.fetch` configuration variables. (See
linkgit:git-config[1]).
+EXIT STATUS
+-----------
+
+On success, the exit status is `0`.
+
+When subcommands such as 'add', 'rename', and 'remove' can't find the
+remote in question, the exit status is `2`. When the remote already
+exists, the exit status is `3`.
+
+On any other error, the exit status may be any other non-zero value.
+
EXAMPLES
--------
diff --git a/en/git-restore.txt b/en/git-restore.txt
index 84c6c400109851ac34185a4f9004aada07aa79aa..55bde91ef9e54be6c9ecf928f6f72c775b45809a 100644
--- a/en/git-restore.txt
+++ b/en/git-restore.txt
@@ -40,6 +40,10 @@ OPTIONS
+
If not specified, the contents are restored from `HEAD` if `--staged` is
given, otherwise from the index.
++
+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`.
-p::
--patch::
diff --git a/en/git-rev-parse.txt b/en/git-rev-parse.txt
index 19b12b6d43ce5bfeb2dba36e30640ddaf0aca664..5013daa6efebdd92ea93138a751b5a1c61877a56 100644
--- a/en/git-rev-parse.txt
+++ b/en/git-rev-parse.txt
@@ -109,6 +109,10 @@ 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.
++
+Note that if you are verifying a name from an untrusted source, it is
+wise to use `--end-of-options` so that the name argument is not mistaken
+for another option.
-q::
--quiet::
@@ -446,7 +450,7 @@ $ git rev-parse --verify HEAD
* Print the commit object name from the revision in the $REV shell variable:
+
------------
-$ git rev-parse --verify $REV^{commit}
+$ git rev-parse --verify --end-of-options $REV^{commit}
------------
+
This will error out if $REV is empty or not a valid revision.
@@ -454,7 +458,7 @@ This will error out if $REV is empty or not a valid revision.
* Similar to above:
+
------------
-$ git rev-parse --default master --verify $REV
+$ git rev-parse --default master --verify --end-of-options $REV
------------
+
but if $REV is empty, the commit object name from master will be printed.
diff --git a/en/git-revert.txt b/en/git-revert.txt
index 044276e9da62af44af9a8d897df0dd536556610b..bb92a4a4516d2a93a6e85facb0831aabc1be126c 100644
--- a/en/git-revert.txt
+++ b/en/git-revert.txt
@@ -99,7 +99,7 @@ effect to your index in a row.
-s::
--signoff::
- Add Signed-off-by line at the end of the commit message.
+ Add a `Signed-off-by` trailer at the end of the commit message.
See the signoff option in linkgit:git-commit[1] for more information.
--strategy=<strategy>::
diff --git a/en/git-send-email.txt b/en/git-send-email.txt
index 0a69810147e451d7cac290020f009631b1da9e46..b7bbbeadef6df43a9497cbbfad1f8cbf8213cd6f 100644
--- a/en/git-send-email.txt
+++ b/en/git-send-email.txt
@@ -313,7 +313,7 @@ Automating
the value of `sendemail.identity`.
--[no-]signed-off-by-cc::
- If this is set, add emails found in Signed-off-by: or Cc: lines to the
+ If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the
cc list. Default is the value of `sendemail.signedoffbycc` configuration
value; if that is unspecified, default to --signed-off-by-cc.
@@ -340,7 +340,7 @@ Automating
except for self (use 'self' for that).
- 'bodycc' will avoid including anyone mentioned in Cc lines in the
patch body (commit message) except for self (use 'self' for that).
-- 'sob' will avoid including anyone mentioned in Signed-off-by lines except
+- 'sob' will avoid including anyone mentioned in the Signed-off-by trailers except
for self (use 'self' for that).
- 'misc-by' will avoid including anyone mentioned in Acked-by,
Reviewed-by, Tested-by and other "-by" lines in the patch body,
diff --git a/en/git-svn.txt b/en/git-svn.txt
index 6624a14fbd70992a0bfbba99b73cc2110208c421..67b143cc81ea9534722a082fdfbc016081621411 100644
--- a/en/git-svn.txt
+++ b/en/git-svn.txt
@@ -701,7 +701,7 @@ creating the branch or tag.
--use-log-author::
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
- 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
+ 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer
in the log message and use that as the author string.
+
[verse]
@@ -710,7 +710,7 @@ config key: svn.useLogAuthor
--add-author-from::
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
+ `From:` or `Signed-off-by` trailer, 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.
+
diff --git a/en/git-switch.txt b/en/git-switch.txt
index 3759c3a265b5b9761a9df4d8e6b9d733d29aee04..5c438cd505875841763f0151dfe0a2c1454dfcc5 100644
--- a/en/git-switch.txt
+++ b/en/git-switch.txt
@@ -103,6 +103,9 @@ ambiguous but exists on the 'origin' remote. See also
`checkout.defaultRemote` in linkgit:git-config[1].
+
`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-f::
--force::
diff --git a/en/git-update-ref.txt b/en/git-update-ref.txt
index d401234b03ce85722ff9624acb16c125d3780b27..48b6683071e65be1abf29ece20dc90c5f0579ec3 100644
--- a/en/git-update-ref.txt
+++ b/en/git-update-ref.txt
@@ -125,7 +125,8 @@ option::
start::
Start a transaction. In contrast to a non-transactional session, a
transaction will automatically abort if the session ends without an
- explicit commit.
+ explicit commit. This command may create a new empty transaction when
+ the current one has been committed or aborted already.
prepare::
Prepare to commit the transaction. This will create lock files for all
diff --git a/en/git-worktree.txt b/en/git-worktree.txt
index 32e8440cdea5751e6f699fff62ba2d7675057cae..af06128cc9e656de17a3f2b9180ca14135f0418c 100644
--- a/en/git-worktree.txt
+++ b/en/git-worktree.txt
@@ -96,8 +96,9 @@ list::
List details of each working tree. The main working tree is listed first,
followed by each of the linked working trees. The output details include
-whether the working tree is bare, the revision currently checked out, and the
-branch currently checked out (or "detached HEAD" if none).
+whether the working tree is bare, the revision currently checked out, the
+branch currently checked out (or "detached HEAD" if none), and "locked" if
+the worktree is locked.
lock::
diff --git a/en/glossary-content.txt b/en/glossary-content.txt
index 090c888335d3292331d012a5e9074f970035d83e..67c7a50b96a0b29bc3a98edf1e02f4b455969abf 100644
--- a/en/glossary-content.txt
+++ b/en/glossary-content.txt
@@ -18,7 +18,7 @@
Untyped <<def_object,object>>, e.g. the contents of a file.
[[def_branch]]branch::
- A "branch" is an active line of development. The most recent
+ A "branch" is a 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
diff --git a/en/line-range-format.txt b/en/line-range-format.txt
index 829676ff98335913ec037396a659f42f74e5a90d..9b51e9fb66143606e328a554186046f3fd1a0b28 100644
--- a/en/line-range-format.txt
+++ b/en/line-range-format.txt
@@ -1,30 +1,32 @@
-<start> and <end> can take one of these forms:
+'<start>' and '<end>' can take one of these forms:
- number
+
-If <start> or <end> is a number, it specifies an
+If '<start>' or '<end>' is a number, it specifies an
absolute line number (lines count from 1).
+
-- /regex/
+- `/regex/`
+
This form will use the first line matching the given
-POSIX regex. If <start> is a regex, it will search from the end of
+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>.
+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>'.
+
- +offset or -offset
+
-This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.
+This is only valid for '<end>' and will specify a number
+of lines before or after the line given by '<start>'.
+
-If ``:<funcname>'' is given in place of <start> and <end>, it is a
+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>''
+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.
+from the start of file. `^:<funcname>` searches from the start of
+file. The function names are determined in the same way as `git diff`
+works out patch hunk headers (see 'Defining a custom hunk-header'
+in linkgit:gitattributes[5]).
diff --git a/en/merge-options.txt b/en/merge-options.txt
index 80d4831662c5e5fee9cdcc37e14929ce94f9b81a..eb0aabd396ff924ea30dc6f81bc1382a061a0b3d 100644
--- a/en/merge-options.txt
+++ b/en/merge-options.txt
@@ -77,16 +77,7 @@ When not possible, refuse to merge and exit with a non-zero status.
With --no-log do not list one-line descriptions from the
actual commits being merged.
---signoff::
---no-signoff::
- 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).
-+
-With --no-signoff do not add a Signed-off-by line.
+include::signoff-option.txt[]
--stat::
-n::
diff --git a/en/pretty-options.txt b/en/pretty-options.txt
index 17c5aac4b71d5af126a0bd85d3ffef2e94468e3c..27ddaf84a195f46edc7b3f102eb1caf1adf68765 100644
--- a/en/pretty-options.txt
+++ b/en/pretty-options.txt
@@ -16,9 +16,9 @@ configuration (see linkgit:git-config[1]).
--abbrev-commit::
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).
+ name, show a prefix that names the object uniquely.
+ "--abbrev=<n>" (which also modifies diff output, if it is displayed)
+ option can be used to specify the minimum length of the prefix.
+
This should make "--pretty=oneline" a whole lot more readable for
people using 80-column terminals.
diff --git a/po/documentation.pot b/po/documentation.pot
index 28537efb527722cda3c5c7bda38edc243124499e..6f628811c5b8b6a6482f773b34cd9cea5c1da6a6 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,19 +7,17 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-10-26 22:55+0100\n"
+"POT-Creation-Date: 2020-12-16 23:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:675 en/git-instaweb.txt:45
-#: en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126
-#: en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:679 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
#, no-wrap
msgid "-b"
msgstr ""
@@ -32,8 +30,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:351
-#: en/git-fsck.txt:38 en/git-rebase.txt:582
+#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:359 en/git-fsck.txt:38 en/git-rebase.txt:582
#, no-wrap
msgid "--root"
msgstr ""
@@ -69,66 +66,61 @@ msgid "-L :<funcname>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:16
+#: en/blame-options.txt:17
msgid ""
-"Annotate only the given line range. May be specified multiple times. "
-"Overlapping ranges are allowed."
+"Annotate only the line range given by '<start>,<end>', or by the function "
+"name regex '<funcname>'. May be specified multiple times. Overlapping "
+"ranges are allowed."
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:19
+#: en/blame-options.txt:20
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>."
+"'<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:45 en/git-config.txt:164
-#: en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51
-#: en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
+#: en/blame-options.txt:23 en/git-archive.txt:43 en/git-branch.txt:171 en/git-checkout.txt:200 en/git-clone.txt:45 en/git-config.txt:167 en/git-grep.txt:187 en/git-instaweb.txt:23 en/git-ls-tree.txt:51 en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:99 en/git-var.txt:20
#, no-wrap
msgid "-l"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:24
+#: en/blame-options.txt:25
msgid "Show long rev (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:25 en/diff-options.txt:77 en/fetch-options.txt:158
-#: en/git-branch.txt:205 en/git-cat-file.txt:36 en/git-checkout.txt:157
-#: en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26
-#: en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:151
+#: en/blame-options.txt:26 en/diff-options.txt:77 en/fetch-options.txt:158 en/git-branch.txt:207 en/git-cat-file.txt:36 en/git-checkout.txt:157 en/git-diff-tree.txt:39 en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47 en/git-svn.txt:312 en/git-switch.txt:154
#, no-wrap
msgid "-t"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:27
+#: en/blame-options.txt:28
msgid "Show raw timestamp (Default: off)."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:28
+#: en/blame-options.txt:29
#, no-wrap
msgid "-S <revs-file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:30
+#: en/blame-options.txt:31
msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:31
+#: en/blame-options.txt:32
#, no-wrap
msgid "--reverse <rev>..<rev>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:38
+#: en/blame-options.txt:39
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 "
@@ -138,14 +130,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:39 en/git-bisect.txt:368 en/git-describe.txt:121
-#: en/rev-list-options.txt:124
+#: en/blame-options.txt:40 en/git-bisect.txt:368 en/git-describe.txt:121 en/rev-list-options.txt:124
#, no-wrap
msgid "--first-parent"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:44
+#: en/blame-options.txt:45
msgid ""
"Follow only the first parent commit upon seeing a merge commit. This option "
"can be used to determine when a line was introduced to a particular "
@@ -154,60 +145,54 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:45 en/diff-options.txt:16 en/diff-options.txt:22
-#: en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49
-#: en/git-checkout.txt:268 en/git-commit.txt:71 en/git-cvsexportcommit.txt:41
-#: en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63
-#: en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:44
-#: en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
+#: en/blame-options.txt:46 en/diff-options.txt:16 en/diff-options.txt:22 en/fetch-options.txt:109 en/git-add.txt:89 en/git-cat-file.txt:49 en/git-checkout.txt:271 en/git-commit.txt:72 en/git-cvsexportcommit.txt:41 en/git-grep.txt:240 en/git-instaweb.txt:41 en/git-merge-file.txt:63 en/git-rebase.txt:544 en/git-request-pull.txt:29 en/git-restore.txt:48 en/git-stash.txt:183 en/git-svn.txt:535 en/git-svn.txt:679 en/git.txt:101
#, no-wrap
msgid "-p"
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:46 en/git-commit.txt:114 en/git-push.txt:176
-#: en/git-worktree.txt:216
+#: en/blame-options.txt:47 en/git-commit.txt:115 en/git-push.txt:176 en/git-worktree.txt:217
#, no-wrap
msgid "--porcelain"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:48
+#: en/blame-options.txt:49
msgid "Show in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:49
+#: en/blame-options.txt:50
#, no-wrap
msgid "--line-porcelain"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:53
+#: en/blame-options.txt:54
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:54 en/git-pack-objects.txt:138 en/git-svn.txt:373
+#: en/blame-options.txt:55 en/git-pack-objects.txt:138 en/git-svn.txt:373
#, no-wrap
msgid "--incremental"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:57
+#: en/blame-options.txt:58
msgid "Show the result incrementally in a format designed for machine consumption."
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:58 en/git-mailinfo.txt:62 en/pretty-options.txt:35
+#: en/blame-options.txt:59 en/git-mailinfo.txt:62 en/pretty-options.txt:35
#, no-wrap
msgid "--encoding=<encoding>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:64
+#: en/blame-options.txt:65
msgid ""
"Specifies the encoding used to output author names and commit "
"summaries. Setting it to `none` makes blame output unconverted data. For "
@@ -216,13 +201,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:65
+#: en/blame-options.txt:66
#, no-wrap
msgid "--contents <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:71
+#: en/blame-options.txt:72
msgid ""
"When <rev> is not specified, the command annotates the changes starting "
"backwards from the working tree copy. This flag makes the command pretend "
@@ -231,13 +216,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:72
+#: en/blame-options.txt:73
#, no-wrap
msgid "--date <format>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:78
+#: en/blame-options.txt:79
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 "
@@ -246,13 +231,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:79 en/git-fsck.txt:100
+#: en/blame-options.txt:80 en/git-fsck.txt:100
#, no-wrap
msgid "--[no-]progress"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:85
+#: en/blame-options.txt:86
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 "
@@ -261,13 +246,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:86
+#: en/blame-options.txt:87
#, no-wrap
msgid "-M[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:96
+#: en/blame-options.txt:97
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 "
@@ -279,7 +264,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:101
+#: en/blame-options.txt:102
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 "
@@ -287,13 +272,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:102
+#: en/blame-options.txt:103
#, no-wrap
msgid "-C[<num>]"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:111
+#: en/blame-options.txt:112
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 "
@@ -304,7 +289,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:118
+#: en/blame-options.txt:119
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 "
@@ -314,13 +299,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:119
+#: en/blame-options.txt:120
#, no-wrap
msgid "--ignore-rev <rev>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:130
+#: en/blame-options.txt:131
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 "
@@ -335,13 +320,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:131
+#: en/blame-options.txt:132
#, no-wrap
msgid "--ignore-revs-file <file>"
msgstr ""
#. type: Plain text
-#: en/blame-options.txt:137
+#: en/blame-options.txt:138
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 "
@@ -351,19 +336,18 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/blame-options.txt:138 en/git-archimport.txt:71 en/git-cvsimport.txt:184
-#: en/git-cvsserver.txt:48 en/git-grep.txt:145 en/git-ls-remote.txt:24
+#: en/blame-options.txt:139 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 ""
#. type: Plain text
-#: en/blame-options.txt:139
+#: en/blame-options.txt:140
msgid "Show help message."
msgstr ""
#. type: Plain text
-#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:233
+#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:235
#, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr ""
@@ -1980,7 +1964,7 @@ msgid "Update auxiliary info file to help dumb servers."
msgstr ""
#. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:274
+#: en/config.txt:2 en/git-worktree.txt:275
#, no-wrap
msgid "CONFIGURATION FILE"
msgstr ""
@@ -2085,7 +2069,7 @@ msgstr ""
#: en/config.txt:73
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 "
+"with a `\\`; the backslash 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 "
@@ -2178,18 +2162,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:124
+#: en/config.txt:125
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:124
-#, no-wrap
-msgid "git file is."
+"final location where the .git directory is, not where the .git file is."
msgstr ""
#. type: Plain text
@@ -2304,7 +2282,7 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:180 en/git-rev-parse.txt:367 en/git-rev-parse.txt:423
+#: en/config.txt:180 en/git-rev-parse.txt:371 en/git-rev-parse.txt:427
#, no-wrap
msgid "Example"
msgstr ""
@@ -2440,25 +2418,25 @@ msgid "true"
msgstr ""
#. type: Plain text
-#: en/config.txt:247
+#: en/config.txt:248
msgid ""
"Boolean true literals are `yes`, `on`, `true`, and `1`. Also, a variable "
"defined without `= <value>` is taken as true."
msgstr ""
#. type: Labeled list
-#: en/config.txt:248
+#: en/config.txt:249
#, no-wrap
msgid "false"
msgstr ""
#. type: Plain text
-#: en/config.txt:250
+#: en/config.txt:252
msgid "Boolean false literals are `no`, `off`, `false`, `0` and the empty string."
msgstr ""
#. type: Plain text
-#: en/config.txt:254
+#: en/config.txt:256
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\" "
@@ -2466,26 +2444,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:255
+#: en/config.txt:257
#, no-wrap
msgid "integer"
msgstr ""
#. type: Plain text
-#: en/config.txt:259
+#: en/config.txt:261
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:260 en/diff-options.txt:361 en/git-for-each-ref.txt:175
+#: en/config.txt:262 en/diff-options.txt:361 en/git-for-each-ref.txt:175
#, no-wrap
msgid "color"
msgstr ""
#. type: Plain text
-#: en/config.txt:264
+#: en/config.txt:266
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 "
@@ -2493,17 +2471,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:270
+#: en/config.txt:272
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 "
+"`normal` have a bright variant that can be specified by prefixing the color "
"with `bright`, like `brightred`."
msgstr ""
#. type: Plain text
-#: en/config.txt:275
+#: en/config.txt:277
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 "
@@ -2512,7 +2490,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:282
+#: en/config.txt:284
msgid ""
"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
@@ -2522,14 +2500,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:285
+#: en/config.txt:287
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:294
+#: en/config.txt:296
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 "
@@ -2542,13 +2520,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/config.txt:295
+#: en/config.txt:297
#, no-wrap
msgid "pathname"
msgstr ""
#. type: Plain text
-#: en/config.txt:301
+#: en/config.txt:303
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 "
@@ -2557,13 +2535,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/config.txt:304
+#: en/config.txt:306
#, no-wrap
msgid "Variables"
msgstr ""
#. type: Plain text
-#: en/config.txt:309
+#: en/config.txt:311
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 "
@@ -2571,7 +2549,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/config.txt:314
+#: en/config.txt:316
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 "
@@ -3052,8 +3030,7 @@ msgid "mode for \"src\"; 000000 if creation or unmerged."
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46
-#: en/diff-format.txt:48
+#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46 en/diff-format.txt:48
msgid "a space."
msgstr ""
@@ -3176,7 +3153,7 @@ 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
+#: en/diff-format.txt:85 en/git-ls-files.txt:213 en/git-ls-tree.txt:102
msgid ""
"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
"explained for the configuration variable `core.quotePath` (see "
@@ -3324,8 +3301,7 @@ msgid "the number of added lines;"
msgstr ""
#. type: Plain text
-#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173
-#: en/diff-format.txt:175
+#: en/diff-format.txt:157 en/diff-format.txt:159 en/diff-format.txt:173 en/diff-format.txt:175
msgid "a tab;"
msgstr ""
@@ -3642,8 +3618,7 @@ msgid "It is followed by two-line from-file/to-file header"
msgstr ""
#. type: Plain text
-#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157
-#: en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
+#: en/diff-generate-patch.txt:146 en/diff-generate-patch.txt:157 en/diff-generate-patch.txt:158 en/diff-generate-patch.txt:159
msgid "a/file"
msgstr ""
@@ -3738,7 +3713,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:93
+#: en/diff-options.txt:17 en/git-rebase.txt:410 en/merge-options.txt:84
#, no-wrap
msgid "--no-stat"
msgstr ""
@@ -3749,17 +3724,13 @@ msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112
-#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
-#: en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52
-#: en/git-push.txt:348 en/git-read-tree.txt:45 en/git-stash.txt:161
+#: en/diff-options.txt:23 en/fetch-options.txt:220 en/git-add.txt:112 en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64 en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52 en/git-push.txt:372 en/git-read-tree.txt:45 en/git-stash.txt:161
#, no-wrap
msgid "-u"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:269
-#: en/git-commit.txt:72 en/git-restore.txt:45 en/git-stash.txt:184
+#: en/diff-options.txt:24 en/git-add.txt:90 en/git-checkout.txt:272 en/git-commit.txt:73 en/git-restore.txt:49 en/git-stash.txt:184
#, no-wrap
msgid "--patch"
msgstr ""
@@ -3776,12 +3747,7 @@ msgid "\tThis is the default.\n"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75
-#: en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67
-#: en/git-commit.txt:166 en/git-diff-tree.txt:72 en/git-format-patch.txt:120
-#: en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34
-#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
-#: en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
+#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:75 en/git-cat-file.txt:40 en/git-cherry-pick.txt:105 en/git-clone.txt:67 en/git-diff-tree.txt:77 en/git-format-patch.txt:121 en/git-ls-files.txt:59 en/git-revert.txt:100 en/git-shortlog.txt:34 en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38 en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
#, no-wrap
msgid "-s"
msgstr ""
@@ -3813,15 +3779,13 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:40
-msgid ""
-"Generate diffs with <n> lines of context instead of the usual three. Implies "
-"`--patch`."
+msgid "Generate diffs with <n> lines of context instead of the usual three."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:42
+#: en/diff-options.txt:42 en/diff-options.txt:447
#, no-wrap
-msgid "\tImplies `-p`.\n"
+msgid "\tImplies `--patch`.\n"
msgstr ""
#. type: Labeled list
@@ -3861,8 +3825,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19
-#: en/git-verify-tag.txt:19
+#: en/diff-options.txt:55 en/git-replace.txt:78 en/git-verify-commit.txt:19 en/git-verify-tag.txt:19
#, no-wrap
msgid "--raw"
msgstr ""
@@ -4245,8 +4208,7 @@ msgid "Synonym for --dirstat=files,param1,param2..."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35
-#: en/merge-options.txt:140
+#: en/diff-options.txt:217 en/git-apply.txt:52 en/git-shortlog.txt:35 en/merge-options.txt:131
#, no-wrap
msgid "--summary"
msgstr ""
@@ -4270,11 +4232,7 @@ msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34
-#: en/git-check-ignore.txt:47 en/git-checkout-index.txt:67
-#: en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207
-#: en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23
-#: en/git-status.txt:126 en/git-update-index.txt:174
+#: en/diff-options.txt:228 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:124 en/git-config.txt:215 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 ""
@@ -4309,8 +4267,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:244 en/git-config.txt:215 en/git-grep.txt:189
-#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
+#: en/diff-options.txt:244 en/git-config.txt:224 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, no-wrap
msgid "--name-only"
msgstr ""
@@ -4354,8 +4311,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60
-#: en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
+#: en/diff-options.txt:263 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap
msgid "--color[=<when>]"
msgstr ""
@@ -4376,8 +4332,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228
-#: en/git-show-branch.txt:124
+#: en/diff-options.txt:272 en/git-branch.txt:144 en/git-grep.txt:228 en/git-show-branch.txt:124
#, no-wrap
msgid "--no-color"
msgstr ""
@@ -4437,7 +4392,7 @@ msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:291 en/git-commit.txt:212
+#: en/diff-options.txt:291 en/git-commit.txt:206
#, no-wrap
msgid "default"
msgstr ""
@@ -4559,7 +4514,7 @@ msgid "ignore-space-at-eol"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:335 en/diff-options.txt:674
+#: en/diff-options.txt:335 en/diff-options.txt:678
msgid "Ignore changes in whitespace at EOL."
msgstr ""
@@ -4570,7 +4525,7 @@ msgid "ignore-space-change"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:339 en/diff-options.txt:680
+#: en/diff-options.txt:339 en/diff-options.txt:684
msgid ""
"Ignore changes in amount of whitespace. This ignores whitespace at line "
"end, and considers all other sequences of one or more whitespace characters "
@@ -4815,21 +4770,21 @@ msgstr ""
#: en/diff-options.txt:445
msgid ""
"In addition to `--full-index`, output a binary diff that can be applied with "
-"`git-apply`. Implies `--patch`."
+"`git-apply`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:446 en/git-ls-files.txt:154 en/git-ls-tree.txt:63
-#: en/git-show-ref.txt:65
+#: en/diff-options.txt:449 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:454
+#: en/diff-options.txt:458
msgid ""
"Instead of showing the full 40-byte hexadecimal object name in diff-raw "
-"format output and diff-tree header lines, show only a partial prefix. In "
+"format output and diff-tree header lines, show the shortest prefix that is "
+"at least '<n>' hexdigits long that uniquely refers the object. In "
"diff-patch output format, `--full-index` takes higher precedence, i.e. if "
"`--full-index` is specified, full blob names will be shown regardless of "
"`--abbrev`. Non default number of digits can be specified with "
@@ -4837,26 +4792,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:455
+#: en/diff-options.txt:459
#, no-wrap
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:456
+#: en/diff-options.txt:460
#, no-wrap
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:459
+#: en/diff-options.txt:463
msgid ""
"Break complete rewrite changes into pairs of delete and create. This serves "
"two purposes:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:469
+#: en/diff-options.txt:473
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 "
@@ -4869,7 +4824,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:477
+#: en/diff-options.txt:481
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 "
@@ -4880,25 +4835,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:478
+#: en/diff-options.txt:482
#, no-wrap
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:479 en/git-status.txt:147
+#: en/diff-options.txt:483 en/git-status.txt:147
#, no-wrap
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:482
+#: en/diff-options.txt:486
#, no-wrap
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:487
+#: en/diff-options.txt:491
#, no-wrap
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
@@ -4907,7 +4862,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:497
+#: en/diff-options.txt:501
#, no-wrap
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
@@ -4922,32 +4877,32 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:498
+#: en/diff-options.txt:502
#, no-wrap
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:499
+#: en/diff-options.txt:503
#, no-wrap
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:502
+#: en/diff-options.txt:506
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:503 en/git-svn.txt:626
+#: en/diff-options.txt:507 en/git-svn.txt:626
#, no-wrap
msgid "--find-copies-harder"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:511
+#: en/diff-options.txt:515
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 "
@@ -4957,19 +4912,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:512 en/git-branch.txt:103 en/git-http-push.txt:45
+#: en/diff-options.txt:516 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap
msgid "-D"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:513
+#: en/diff-options.txt:517
#, no-wrap
msgid "--irreversible-delete"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:521
+#: en/diff-options.txt:525
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 "
@@ -4980,20 +4935,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:524
+#: en/diff-options.txt:528
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:525 en/git-svn.txt:625
+#: en/diff-options.txt:529 en/git-svn.txt:625
#, no-wrap
msgid "-l<num>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:531
+#: en/diff-options.txt:535
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 "
@@ -5002,13 +4957,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:533
+#: en/diff-options.txt:537
#, no-wrap
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:544
+#: en/diff-options.txt:548
msgid ""
"Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), "
"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
@@ -5021,14 +4976,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:547
+#: en/diff-options.txt:551
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:553
+#: en/diff-options.txt:557
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 "
@@ -5038,20 +4993,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:554
+#: en/diff-options.txt:558
#, no-wrap
msgid "-S<string>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:558
+#: en/diff-options.txt:562
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:564
+#: en/diff-options.txt:568
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: "
@@ -5061,32 +5016,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:566
+#: en/diff-options.txt:570
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:567
+#: en/diff-options.txt:571
#, no-wrap
msgid "-G<regex>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:570
+#: en/diff-options.txt:574
msgid ""
"Look for differences whose patch text contains added/removed lines that "
"match <regex>."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:574
+#: en/diff-options.txt:578
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:579
+#: en/diff-options.txt:583
#, no-wrap
msgid ""
"+ return frotz(nitfol, two->ptr, 1, 0);\n"
@@ -5095,7 +5050,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:584
+#: en/diff-options.txt:588
msgid ""
"While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log "
"-S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of "
@@ -5103,25 +5058,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:587
+#: en/diff-options.txt:591
msgid ""
"Unless `--text` is supplied patches of binary files without a textconv "
"filter will be ignored."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:590
+#: en/diff-options.txt:594
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:591
+#: en/diff-options.txt:595
#, no-wrap
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:596
+#: en/diff-options.txt:600
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 "
@@ -5129,46 +5084,46 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:599
+#: en/diff-options.txt:603
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:600
+#: en/diff-options.txt:604
#, no-wrap
msgid "--pickaxe-all"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:604
+#: en/diff-options.txt:608
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:605
+#: en/diff-options.txt:609
#, no-wrap
msgid "--pickaxe-regex"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:608
+#: en/diff-options.txt:612
msgid ""
"Treat the <string> given to `-S` as an extended POSIX regular expression to "
"match."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:611 en/git-mergetool.txt:95
+#: en/diff-options.txt:615 en/git-mergetool.txt:95
#, no-wrap
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:616
+#: en/diff-options.txt:620
msgid ""
"Control the order in which files appear in the output. This overrides the "
"`diff.orderFile` configuration variable (see linkgit:git-config[1]). To "
@@ -5176,7 +5131,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:628
+#: en/diff-options.txt:632
msgid ""
"The output order is determined by the order of glob patterns in "
"<orderfile>. All files with pathnames that match the first pattern are "
@@ -5189,17 +5144,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:630
+#: en/diff-options.txt:634
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:634
+#: en/diff-options.txt:638
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:638
+#: en/diff-options.txt:642
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 "
@@ -5207,12 +5162,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:640
+#: en/diff-options.txt:644
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:647
+#: en/diff-options.txt:651
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 "
@@ -5222,32 +5177,32 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:649 en/git-apply.txt:104 en/git-cvsimport.txt:168
+#: en/diff-options.txt:653 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap
msgid "-R"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:652
+#: en/diff-options.txt:656
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:654
+#: en/diff-options.txt:658
#, no-wrap
msgid "--relative[=<path>]"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:655
+#: en/diff-options.txt:659
#, no-wrap
msgid "--no-relative"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:664
+#: en/diff-options.txt:668
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 "
@@ -5258,89 +5213,102 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:665 en/fetch-options.txt:4 en/git-archimport.txt:99
-#: en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65
-#: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102
-#: en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26
-#: en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154
-#: en/git-tag.txt:60
+#: en/diff-options.txt:669 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:66 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:666 en/git-grep.txt:103
+#: en/diff-options.txt:670 en/git-grep.txt:103
#, no-wrap
msgid "--text"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:668
+#: en/diff-options.txt:672
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:669
+#: en/diff-options.txt:673
#, no-wrap
msgid "--ignore-cr-at-eol"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:671
+#: en/diff-options.txt:675
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:672
+#: en/diff-options.txt:676
#, no-wrap
msgid "--ignore-space-at-eol"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:676 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:680 en/git-am.txt:107 en/git-apply.txt:182
#, no-wrap
msgid "--ignore-space-change"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:681 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71
-#: en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:685 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 ""
#. type: Labeled list
-#: en/diff-options.txt:682
+#: en/diff-options.txt:686
#, no-wrap
msgid "--ignore-all-space"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:690
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:687
+#: en/diff-options.txt:691
#, no-wrap
msgid "--ignore-blank-lines"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:689
+#: en/diff-options.txt:693
msgid "Ignore changes whose lines are all blank."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:690
+#: en/diff-options.txt:694
+#, no-wrap
+msgid "-I<regex>"
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:695
+#, no-wrap
+msgid "--ignore-matching-lines=<regex>"
+msgstr ""
+
+#. type: Plain text
+#: en/diff-options.txt:698
+msgid ""
+"Ignore changes whose all lines match <regex>. This option may be specified "
+"more than once."
+msgstr ""
+
+#. type: Labeled list
+#: en/diff-options.txt:699
#, no-wrap
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:695
+#: en/diff-options.txt:704
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 "
@@ -5348,67 +5316,57 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:696 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264
-#: en/git-restore.txt:54
+#: en/diff-options.txt:705 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:58
#, no-wrap
msgid "-W"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:697 en/git-grep.txt:265
+#: en/diff-options.txt:706 en/git-grep.txt:265
#, no-wrap
msgid "--function-context"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:699
-msgid "Show whole surrounding functions of changes."
+#: en/diff-options.txt:711
+msgid ""
+"Show whole function as context lines for each change. The function names "
+"are determined in the same way as `git diff` works out patch hunk headers "
+"(see 'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:702 en/git-ls-remote.txt:48
+#: en/diff-options.txt:714 en/git-ls-remote.txt:48
#, no-wrap
msgid "--exit-code"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:706
+#: en/diff-options.txt:718
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:707 en/fetch-options.txt:238 en/git-am.txt:74
-#: en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31
-#: en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121
-#: en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49
-#: en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316
-#: en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39
-#: en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78
-#: en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:398
-#: en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114
-#: en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71
-#: en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671
-#: en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:222
-#: en/merge-options.txt:147 en/rev-list-options.txt:219
+#: en/diff-options.txt:719 en/fetch-options.txt:238 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:113 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:324 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:339 en/git-gc.txt:68 en/git-grep.txt:318 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:386 en/git-read-tree.txt:133 en/git-rebase.txt:398 en/git-reset.txt:106 en/git-restore.txt:67 en/git-rev-parse.txt:118 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:144 en/git-symbolic-ref.txt:40 en/git-worktree.txt:223 en/merge-options.txt:138 en/rev-list-options.txt:219
#, no-wrap
msgid "--quiet"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:709
+#: en/diff-options.txt:721
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:712
+#: en/diff-options.txt:724
#, no-wrap
msgid "--ext-diff"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:716
+#: en/diff-options.txt:728
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 "
@@ -5416,30 +5374,30 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:717
+#: en/diff-options.txt:729
#, no-wrap
msgid "--no-ext-diff"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:719
+#: en/diff-options.txt:731
msgid "Disallow external diff drivers."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:720 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:732 en/git-cat-file.txt:60 en/git-grep.txt:106
#, no-wrap
msgid "--textconv"
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:721 en/git-grep.txt:109
+#: en/diff-options.txt:733 en/git-grep.txt:109
#, no-wrap
msgid "--no-textconv"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:730
+#: en/diff-options.txt:742
msgid ""
"Allow (or disallow) external text conversion filters to be run when "
"comparing binary files. See linkgit:gitattributes[5] for details. Because "
@@ -5451,13 +5409,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:731 en/git-status.txt:87
+#: en/diff-options.txt:743 en/git-status.txt:87
#, no-wrap
msgid "--ignore-submodules[=<when>]"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:755
msgid ""
"Ignore changes to submodules in the diff generation. <when> can be either "
"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
@@ -5473,57 +5431,57 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:756
#, no-wrap
msgid "--src-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:758
msgid "Show the given source prefix instead of \"a/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:759
#, no-wrap
msgid "--dst-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:749
+#: en/diff-options.txt:761
msgid "Show the given destination prefix instead of \"b/\"."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:750
+#: en/diff-options.txt:762
#, no-wrap
msgid "--no-prefix"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:752
+#: en/diff-options.txt:764
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:753
+#: en/diff-options.txt:765
#, no-wrap
msgid "--line-prefix=<prefix>"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:755
+#: en/diff-options.txt:767
msgid "Prepend an additional prefix to every line of output."
msgstr ""
#. type: Labeled list
-#: en/diff-options.txt:756
+#: en/diff-options.txt:768
#, no-wrap
msgid "--ita-invisible-in-index"
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:763
+#: en/diff-options.txt:775
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 "
@@ -5534,21 +5492,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/diff-options.txt:765
+#: en/diff-options.txt:777
msgid ""
"For more detailed explanation on these common options, see also "
"linkgit:gitdiffcore[7]."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167
-#: en/git-checkout-index.txt:39 en/git-commit.txt:66 en/git-describe.txt:50
-#: en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25
-#: en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77
-#: en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149
-#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37
-#: en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276
-#: en/rev-list-options.txt:137
+#: en/fetch-options.txt:1 en/git-add.txt:124 en/git-branch.txt:167 en/git-checkout-index.txt:39 en/git-commit.txt:67 en/git-describe.txt:50 en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25 en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77 en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149 en/git-reflog.txt:72 en/git-rev-parse.txt:165 en/git-send-pack.txt:37 en/git-show-branch.txt:48 en/git-stash.txt:155 en/git-submodule.txt:276 en/rev-list-options.txt:137
#, no-wrap
msgid "--all"
msgstr ""
@@ -5603,7 +5554,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:22 en/git-clone.txt:232 en/git-fetch-pack.txt:90
+#: en/fetch-options.txt:22 en/git-clone.txt:233 en/git-fetch-pack.txt:90
#, no-wrap
msgid "--shallow-since=<date>"
msgstr ""
@@ -5616,7 +5567,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:26 en/git-clone.txt:235 en/git-fetch-pack.txt:94
+#: en/fetch-options.txt:26 en/git-clone.txt:236 en/git-fetch-pack.txt:94
#, no-wrap
msgid "--shallow-exclude=<revision>"
msgstr ""
@@ -5703,13 +5654,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50
-#: en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40
-#: en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32
-#: en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35
-#: en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51
-#: en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688
-#: en/git-worktree.txt:212
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:327 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:213
#, no-wrap
msgid "--dry-run"
msgstr ""
@@ -5735,26 +5680,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81
-#: en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34
-#: en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54
-#: en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31
-#: en/git-notes.txt:127 en/git-push.txt:324 en/git-rebase.txt:430
-#: en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46
-#: en/git-submodule.txt:289 en/git-switch.txt:107 en/git-tag.txt:79
-#: en/git-worktree.txt:153
+#: en/fetch-options.txt:76 en/git-add.txt:78 en/git-archimport.txt:81 en/git-blame.txt:65 en/git-branch.txt:116 en/git-checkout-index.txt:34 en/git-checkout.txt:118 en/git-clean.txt:36 en/git-cvsexportcommit.txt:54 en/git-filter-branch.txt:208 en/git-ls-files.txt:139 en/git-mv.txt:31 en/git-notes.txt:127 en/git-push.txt:332 en/git-rebase.txt:430 en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:46 en/git-submodule.txt:289 en/git-switch.txt:110 en/git-tag.txt:79 en/git-worktree.txt:154
#, no-wrap
msgid "-f"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117
-#: en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37
-#: en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71
-#: en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128
-#: en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:47
-#: en/git-send-email.txt:429 en/git-send-pack.txt:54 en/git-submodule.txt:290
-#: en/git-switch.txt:108 en/git-tag.txt:80 en/git-worktree.txt:154
+#: en/fetch-options.txt:77 en/git-add.txt:79 en/git-branch.txt:117 en/git-checkout-index.txt:35 en/git-checkout.txt:119 en/git-clean.txt:37 en/git-fast-import.txt:37 en/git-filter-branch.txt:209 en/git-gc.txt:71 en/git-http-push.txt:30 en/git-mv.txt:32 en/git-notes.txt:128 en/git-push.txt:333 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:111 en/git-tag.txt:80 en/git-worktree.txt:155
#, no-wrap
msgid "--force"
msgstr ""
@@ -5787,17 +5719,13 @@ msgid "\tThis option overrides that check.\n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67
-#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:115
-#: en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34
-#: en/git-repack.txt:156 en/git-stash.txt:176
+#: en/fetch-options.txt:89 en/git-am.txt:40 en/git-cvsexportcommit.txt:67 en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:116 en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34 en/git-repack.txt:156 en/git-stash.txt:176
#, no-wrap
msgid "-k"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54
-#: en/git-index-pack.txt:54 en/git-reset.txt:85
+#: en/fetch-options.txt:90 en/git-am.txt:41 en/git-fetch-pack.txt:54 en/git-index-pack.txt:54 en/git-reset.txt:85
#, no-wrap
msgid "--keep"
msgstr ""
@@ -5878,8 +5806,7 @@ msgid "See the PRUNING section below for more details."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166
-#: en/git.txt:108 en/rev-list-options.txt:92
+#: en/fetch-options.txt:124 en/git-cvsexportcommit.txt:57 en/git-grep.txt:166 en/git.txt:108 en/rev-list-options.txt:92
#, no-wrap
msgid "-P"
msgstr ""
@@ -5901,22 +5828,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71
-#: en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49
-#: en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100
-#: en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39
-#: en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31
-#: en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34
-#: en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119
-#: en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50
-#: en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687
-#: en/git-unpack-objects.txt:30 en/git-worktree.txt:211 en/merge-options.txt:92
+#: en/fetch-options.txt:138 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:169 en/git-format-patch.txt:101 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:409 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:212 en/merge-options.txt:83
#, no-wrap
msgid "-n"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:140 en/git-clone.txt:250
+#: en/fetch-options.txt:140 en/git-clone.txt:251
#, no-wrap
msgid "--no-tags"
msgstr ""
@@ -5949,9 +5867,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:159 en/git-describe.txt:55 en/git-fsck.txt:41
-#: en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186
-#: en/git-show-ref.txt:41
+#: en/fetch-options.txt:159 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
#, no-wrap
msgid "--tags"
msgstr ""
@@ -6020,8 +5936,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:194 en/git-checkout.txt:295 en/git-push.txt:377
-#: en/git-restore.txt:108 en/git-switch.txt:182
+#: en/fetch-options.txt:194 en/git-checkout.txt:298 en/git-push.txt:401 en/git-restore.txt:112 en/git-switch.txt:185
#, no-wrap
msgid "--no-recurse-submodules"
msgstr ""
@@ -6034,7 +5949,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:199 en/git-branch.txt:225 en/git-push.txt:349
+#: en/fetch-options.txt:199 en/git-branch.txt:227 en/git-push.txt:373
#, no-wrap
msgid "--set-upstream"
msgstr ""
@@ -6094,7 +6009,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:230 en/git-clone.txt:199
+#: en/fetch-options.txt:230 en/git-clone.txt:200
#, no-wrap
msgid "--upload-pack <upload-pack>"
msgstr ""
@@ -6108,20 +6023,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192
-#: en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107
-#: en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329
-#: en/git-diff-files.txt:44 en/git-fetch-pack.txt:48
-#: en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36
-#: en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67
-#: en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173
-#: en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361
-#: en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78
-#: en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113
-#: en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215
-#: en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140
-#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
-#: en/git-update-index.txt:59 en/git-worktree.txt:221 en/merge-options.txt:146
+#: en/fetch-options.txt:237 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:112 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:323 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:338 en/git-grep.txt:317 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:385 en/git-read-tree.txt:132 en/git-rebase.txt:397 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:66 en/git-rev-parse.txt:117 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:143 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:222 en/merge-options.txt:137
#, no-wrap
msgid "-q"
msgstr ""
@@ -6134,57 +6036,30 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224
-#: en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181
-#: en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314
-#: en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82
-#: en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111
-#: en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32
-#: en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43
-#: en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41
-#: en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63
-#: en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50
-#: en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23
-#: en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:225
-#: en/merge-options.txt:150
+#: en/fetch-options.txt:243 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:308 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:83 en/git-fetch-pack.txt:111 en/git-grep.txt: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:391 en/git-read-tree.txt:63 en/git-rebase.txt:401 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:226 en/merge-options.txt:141
#, no-wrap
msgid "-v"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225
-#: en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126
-#: en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148
-#: en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40
-#: en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211
-#: en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42
-#: en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:402
-#: en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61
-#: en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159
-#: en/git-verify-commit.txt:24 en/git-verify-pack.txt:27
-#: en/git-verify-tag.txt:24 en/git-worktree.txt:226 en/merge-options.txt:151
+#: en/fetch-options.txt:244 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:309 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:392 en/git-rebase.txt:402 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:227 en/merge-options.txt:142
#, no-wrap
msgid "--verbose"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35
-#: en/merge-options.txt:153
+#: en/fetch-options.txt:246 en/git-add.txt:77 en/git-imap-send.txt:35 en/merge-options.txt:144
msgid "Be verbose."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111
-#: en/git-clone.txt:130 en/git-format-patch.txt:358 en/git-pack-objects.txt:151
-#: en/git-prune.txt:45 en/git-push.txt:371 en/git-restore.txt:66
-#: en/git-submodule.txt:269 en/git-switch.txt:144 en/merge-options.txt:154
+#: en/fetch-options.txt:248 en/git-bundle.txt:84 en/git-checkout.txt:111 en/git-clone.txt:130 en/git-format-patch.txt:366 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:395 en/git-restore.txt:70 en/git-submodule.txt:269 en/git-switch.txt:147 en/merge-options.txt:145
#, no-wrap
msgid "--progress"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156
-#: en/git-push.txt:376
+#: en/fetch-options.txt:253 en/git-bundle.txt:89 en/git-pack-objects.txt:156 en/git-push.txt:400
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 "
@@ -6244,36 +6119,36 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:276 en/git-push.txt:398
+#: en/fetch-options.txt:276 en/git-push.txt:422
#, no-wrap
msgid "-4"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:277 en/git-push.txt:399
+#: en/fetch-options.txt:277 en/git-push.txt:423
#, no-wrap
msgid "--ipv4"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:279 en/git-push.txt:401
+#: en/fetch-options.txt:279 en/git-push.txt:425
msgid "Use IPv4 addresses only, ignoring IPv6 addresses."
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:280 en/git-push.txt:402
+#: en/fetch-options.txt:280 en/git-push.txt:426
#, no-wrap
msgid "-6"
msgstr ""
#. type: Labeled list
-#: en/fetch-options.txt:281 en/git-push.txt:403
+#: en/fetch-options.txt:281 en/git-push.txt:427
#, no-wrap
msgid "--ipv6"
msgstr ""
#. type: Plain text
-#: en/fetch-options.txt:282 en/git-push.txt:405
+#: en/fetch-options.txt:282 en/git-push.txt:429
msgid "Use IPv6 addresses only, ignoring IPv4 addresses."
msgstr ""
@@ -6284,59 +6159,7 @@ msgid "git-add(1)"
msgstr ""
#. type: Title -
-#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5
-#: en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5
-#: en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5
-#: en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5
-#: en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5
-#: en/git-checkout-index.txt:5 en/git-checkout.txt:5
-#: en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5
-#: en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5
-#: en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5
-#: en/git-config.txt:5 en/git-count-objects.txt:5
-#: en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5
-#: en/git-credential-store.txt:5 en/git-credential.txt:5
-#: en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5
-#: en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5
-#: en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5
-#: en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5
-#: en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5
-#: en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5
-#: en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5
-#: en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5
-#: en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5
-#: en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5
-#: en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5
-#: en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5
-#: en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5
-#: en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5
-#: en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5
-#: en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5
-#: en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5
-#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5
-#: en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5
-#: en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5
-#: en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5
-#: en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5
-#: en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5
-#: en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5
-#: en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5
-#: en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5
-#: en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5
-#: en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5
-#: en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5
-#: en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5
-#: en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5
-#: en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5
-#: en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5
-#: en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5
-#: en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5
-#: en/git-unpack-objects.txt:5 en/git-update-index.txt:5
-#: en/git-update-ref.txt:5 en/git-update-server-info.txt:5
-#: en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5
-#: en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5
-#: en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5
-#: en/git-write-tree.txt:5 en/gitglossary.txt:5
+#: en/git-add.txt:5 en/git-am.txt:5 en/git-annotate.txt:5 en/git-apply.txt:5 en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5 en/git-blame.txt:5 en/git-branch.txt:5 en/git-bugreport.txt:5 en/git-bundle.txt:5 en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5 en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5 en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5 en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5 en/git-credential-store.txt:5 en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5 en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5 en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5 en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5 en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5 en/git-restore.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5 en/git-switch.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5 en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5 en/git-update-index.txt:5 en/git-update-ref.txt:5 en/git-update-server-info.txt:5 en/git-upload-archive.txt:5 en/git-upload-pack.txt:5 en/git-var.txt:5 en/git-verify-commit.txt:5 en/git-verify-pack.txt:5 en/git-verify-tag.txt:5 en/git-web--browse.txt:5 en/git-whatchanged.txt:5 en/git-worktree.txt:5 en/git-write-tree.txt:5 en/gitglossary.txt:5
#, no-wrap
msgid "NAME"
msgstr ""
@@ -6347,60 +6170,7 @@ msgid "git-add - Add file contents to the index"
msgstr ""
#. type: Title -
-#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10
-#: en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10
-#: en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9
-#: en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10
-#: en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10
-#: en/git-checkout-index.txt:10 en/git-checkout.txt:9
-#: en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9
-#: en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10
-#: en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9
-#: en/git-config.txt:10 en/git-count-objects.txt:9
-#: en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9
-#: en/git-credential-store.txt:9 en/git-credential.txt:9
-#: en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9
-#: en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10
-#: en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10
-#: en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10
-#: en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9
-#: en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9
-#: en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10
-#: en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10
-#: en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9
-#: en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10
-#: en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10
-#: en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9
-#: en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10
-#: en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9
-#: en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10
-#: en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9
-#: en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10
-#: en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10
-#: en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10
-#: en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10
-#: en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9
-#: en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10
-#: en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10
-#: en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10
-#: en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10
-#: en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9
-#: en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9
-#: en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10
-#: en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10
-#: en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9
-#: en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10
-#: en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9
-#: en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10
-#: en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9
-#: en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10
-#: en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10
-#: en/git-update-index.txt:10 en/git-update-ref.txt:9
-#: en/git-update-server-info.txt:10 en/git-upload-archive.txt:10
-#: en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9
-#: en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9
-#: en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10
-#: en/gitglossary.txt:9
+#: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bugreport.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-restore.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-switch.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 en/gitglossary.txt:9
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
@@ -6419,61 +6189,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14
-#: en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18
-#: en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28
-#: en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16
-#: en/git-check-attr.txt:16 en/git-check-ignore.txt:16
-#: en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19
-#: en/git-checkout.txt:20 en/git-check-ref-format.txt:17
-#: en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14
-#: en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15
-#: en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29
-#: en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14
-#: en/git-credential-cache.txt:15 en/git-credential-store.txt:15
-#: en/git-credential.txt:15 en/git-cvsexportcommit.txt:17
-#: en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27
-#: en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15
-#: en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20
-#: en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18
-#: en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16
-#: en/git-for-each-ref.txt:18 en/git-format-patch.txt:36
-#: en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15
-#: en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14
-#: en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14
-#: en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16
-#: en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19
-#: en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15
-#: en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17
-#: en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19
-#: en/git-merge-file.txt:18 en/git-merge-index.txt:15
-#: en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14
-#: en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19
-#: en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15
-#: en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19
-#: en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15
-#: en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14
-#: en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16
-#: en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19
-#: en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15
-#: en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27
-#: en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14
-#: en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16
-#: en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15
-#: en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18
-#: en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14
-#: en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16
-#: en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14
-#: en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15
-#: en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14
-#: en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22
-#: en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
-#: en/git-update-index.txt:32 en/git-update-ref.txt:14
-#: en/git-update-server-info.txt:15 en/git-upload-archive.txt:15
-#: en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14
-#: en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14
-#: en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15
-#: en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:19 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:37 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:22 en/git-write-tree.txt:15 en/gitglossary.txt:13
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -6534,59 +6250,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-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30
-#: en/git-check-attr.txt:21 en/git-check-ignore.txt:27
-#: en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24
-#: en/git-checkout.txt:106 en/git-check-ref-format.txt:100
-#: en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27
-#: en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46
-#: en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20
-#: en/git-credential-cache.txt:27 en/git-credential-store.txt:30
-#: en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51
-#: en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36
-#: en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21
-#: en/git-diff-tree.txt:26 en/git-diff.txt:108 en/git-fast-export.txt:25
-#: en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46
-#: en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25
-#: en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22
-#: en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24
-#: en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24
-#: en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40
-#: en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28
-#: en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37
-#: en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70
-#: en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26
-#: en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30
-#: en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199
-#: en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29
-#: en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30
-#: en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32
-#: en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40
-#: en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29
-#: en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103
-#: en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27
-#: en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43
-#: en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32
-#: en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36
-#: en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37
-#: en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35
-#: en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41
-#: en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29
-#: en/git-update-index.txt:44 en/git-upload-archive.txt:56
-#: en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18
-#: en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43
-#: en/git-worktree.txt:151 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:38 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:65 en/git-config.txt:75 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt: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:116 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:89 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:28 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:210 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:27 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:152 en/git-write-tree.txt:29
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:53 en/git-checkout.txt:358 en/git-commit.txt:361
-#: en/git-grep.txt:328 en/git-reset.txt:128 en/git-restore.txt:141
-#: en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
+#: en/git-add.txt:53 en/git-checkout.txt:365 en/git-commit.txt:355 en/git-grep.txt:330 en/git-reset.txt:128 en/git-restore.txt:145 en/git-rm.txt:31 en/git-stash.txt:227 en/git-status.txt:152
#, no-wrap
msgid "<pathspec>..."
msgstr ""
@@ -6606,7 +6276,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-add.txt:68 en/git-grep.txt:334
+#: en/git-add.txt:68 en/git-grep.txt:336
msgid ""
"For more details about the <pathspec> syntax, see the 'pathspec' entry in "
"linkgit:gitglossary[7]."
@@ -6625,18 +6295,13 @@ msgid "Allow adding otherwise ignored files."
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149
-#: en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88
-#: en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51
-#: en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163
-#: en/git-tag.txt:130 en/rev-list-options.txt:73
+#: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:255 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:505 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
#, no-wrap
msgid "-i"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45
-#: en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
+#: en/git-add.txt:83 en/git-am.txt:128 en/git-clean.txt:45 en/git-rebase.txt:506 en/git-rebase.txt:645 en/git-svn.txt:297
#, no-wrap
msgid "--interactive"
msgstr ""
@@ -6666,18 +6331,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:252
-#: en/git-grep.txt:295 en/git-revert.txt:44 en/git-shortlog.txt:38
-#: en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
+#: en/git-add.txt:100 en/git-blame.txt:78 en/git-cat-file.txt:44 en/git-cherry-pick.txt:53 en/git-commit.txt:214 en/git-config.txt:261 en/git-grep.txt:297 en/git-revert.txt:44 en/git-shortlog.txt:38 en/git-svn.txt:614 en/git-tag.txt:177 en/merge-options.txt:16
#, no-wrap
msgid "-e"
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:221
-#: en/git-config.txt:253 en/git-revert.txt:45 en/git-svn.txt:615
-#: en/git-tag.txt:178 en/merge-options.txt:15
+#: en/git-add.txt:101 en/git-cherry-pick.txt:54 en/git-commit.txt:215 en/git-config.txt:262 en/git-revert.txt:45 en/git-svn.txt:615 en/git-tag.txt:178 en/merge-options.txt:15
#, no-wrap
msgid "--edit"
msgstr ""
@@ -6779,7 +6439,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:147 en/git-format-patch.txt:104 en/git-submodule.txt:351
+#: en/git-add.txt:147 en/git-format-patch.txt:105 en/git-submodule.txt:351
#, no-wrap
msgid "-N"
msgstr ""
@@ -6828,8 +6488,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73
-#: en/rev-list-options.txt:200
+#: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:200
#, no-wrap
msgid "--ignore-missing"
msgstr ""
@@ -6886,17 +6545,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:191 en/git-checkout.txt:312 en/git-commit.txt:282
-#: en/git-reset.txt:112 en/git-restore.txt:125 en/git-rm.txt:78
-#: en/git-stash.txt:198
+#: en/git-add.txt:191 en/git-checkout.txt:315 en/git-commit.txt:276 en/git-reset.txt:112 en/git-restore.txt:129 en/git-rm.txt:78 en/git-stash.txt:198
#, no-wrap
msgid "--pathspec-from-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:198 en/git-checkout.txt:319 en/git-commit.txt:289
-#: en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85
-#: en/git-stash.txt:207
+#: en/git-add.txt:198 en/git-checkout.txt:322 en/git-commit.txt:283 en/git-reset.txt:119 en/git-restore.txt:136 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 "
@@ -6906,17 +6561,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:199 en/git-checkout.txt:320 en/git-commit.txt:290
-#: en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86
-#: en/git-stash.txt:208
+#: en/git-add.txt:199 en/git-checkout.txt:323 en/git-commit.txt:284 en/git-reset.txt:120 en/git-restore.txt:137 en/git-rm.txt:86 en/git-stash.txt:208
#, no-wrap
msgid "--pathspec-file-nul"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:203 en/git-checkout.txt:324 en/git-commit.txt:294
-#: en/git-reset.txt:124 en/git-restore.txt:137 en/git-rm.txt:90
-#: en/git-stash.txt:214
+#: en/git-add.txt:203 en/git-checkout.txt:327 en/git-commit.txt:288 en/git-reset.txt:124 en/git-restore.txt:141 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 "
@@ -6924,11 +6575,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71
-#: en/git-checkout.txt:355 en/git-commit.txt:358 en/git-grep.txt:324
-#: en/git-ls-files.txt:182 en/git-merge-index.txt:23 en/git-prune.txt:51
-#: en/git-reset.txt:125 en/git-restore.txt:138 en/git-rm.txt:60
-#: en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
+#: en/git-add.txt:204 en/git-check-attr.txt:39 en/git-checkout-index.txt:71 en/git-checkout.txt:362 en/git-commit.txt:352 en/git-grep.txt:326 en/git-ls-files.txt:183 en/git-merge-index.txt:23 en/git-prune.txt:51 en/git-reset.txt:125 en/git-restore.txt:142 en/git-rm.txt:60 en/git-stash.txt:222 en/git-update-index.txt:227 en/git-verify-pack.txt:36
#, no-wrap
msgid "\\--"
msgstr ""
@@ -6941,29 +6588,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380
-#: en/git-branch.txt:306 en/git-bundle.txt:143 en/git-check-attr.txt:71
-#: en/git-checkout-index.txt:143 en/git-checkout.txt:511
-#: en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169
-#: en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50
-#: en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55
-#: en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91
-#: en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:135
-#: en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247
-#: en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294
-#: en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67
-#: en/git-imap-send.txt:60 en/git-init.txt:151
-#: en/git-interpret-trailers.txt:256 en/git-log.txt:169 en/git-ls-remote.txt:95
-#: en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65
-#: en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60
-#: en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77
-#: en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50
-#: en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125
-#: en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483
-#: en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124
-#: en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49
-#: en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27
-#: en/git-worktree.txt:393
+#: en/git-add.txt:211 en/git-archive.txt:155 en/git-bisect.txt:380 en/git-branch.txt:308 en/git-bundle.txt:143 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:518 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:316 en/git-column.txt:50 en/git-commit.txt:364 en/git-config.txt:352 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:143 en/git-fast-export.txt:167 en/git-fetch.txt:246 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:294 en/git-format-patch.txt:677 en/git-grep.txt:338 en/git-http-backend.txt:67 en/git-imap-send.txt:60 en/git-init.txt:151 en/git-interpret-trailers.txt:256 en/git-log.txt:156 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:594 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:218 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:151 en/git-revert.txt:125 en/git-rev-parse.txt:442 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:194 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:394
#, no-wrap
msgid "EXAMPLES"
msgstr ""
@@ -7367,28 +6992,7 @@ msgid "modifying the contents of context or removal lines"
msgstr ""
#. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28
-#: en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504
-#: en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115
-#: en/git-check-ignore.txt:119 en/git-checkout.txt:597
-#: en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137
-#: en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137
-#: en/git-diff.txt:205 en/git-fast-export.txt:279 en/git-fast-import.txt:1568
-#: en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73
-#: en/git-for-each-ref.txt:415 en/git-format-patch.txt:714 en/git-gc.txt:153
-#: en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89
-#: en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245
-#: en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404
-#: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81
-#: en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251
-#: en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249
-#: en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209
-#: en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521
-#: en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349
-#: en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170
-#: en/git-switch.txt:267 en/git-tag.txt:386 en/git.txt:1001
-#: en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63
-#: en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:198 en/git-bisect.txt:504 en/git-blame.txt:233 en/git-branch.txt:376 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:604 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:531 en/git-difftool.txt:137 en/git-diff.txt:213 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:298 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:415 en/git-format-patch.txt:722 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:139 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:246 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:404 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:260 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:213 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:270 en/git-tag.txt:386 en/git.txt:1001 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -7401,121 +7005,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32
-#: en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202
-#: en/git-bisect.txt:509 en/git-blame.txt:235 en/git-branch.txt:382
-#: en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318
-#: en/git-check-attr.txt:119 en/git-check-ignore.txt:125
-#: en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176
-#: en/git-checkout.txt:602 en/git-check-ref-format.txt:139
-#: en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24
-#: en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78
-#: en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499
-#: en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29
-#: en/git-credential-cache.txt:79 en/git-credential-store.txt:109
-#: en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227
-#: en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206
-#: en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148
-#: en/git-diff-tree.txt:125 en/git-diff.txt:215 en/git-fast-export.txt:283
-#: en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302
-#: en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77
-#: en/git-for-each-ref.txt:419 en/git-format-patch.txt:718
-#: en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160
-#: en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120
-#: en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276
-#: en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143
-#: en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167
-#: en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:288
-#: en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103
-#: en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246
-#: en/git-merge-file.txt:94 en/git-merge-index.txt:82
-#: en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48
-#: en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376
-#: en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68
-#: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410
-#: en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72
-#: en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46
-#: en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672
-#: en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284
-#: en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124
-#: en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187
-#: en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221
-#: en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144
-#: en/git-rev-list.txt:35 en/git-rev-parse.txt:463 en/git-rm.txt:195
-#: en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105
-#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42
-#: en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51
-#: en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94
-#: en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442
-#: en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174
-#: en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:391
-#: en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
-#: en/git-update-index.txt:575 en/git-update-ref.txt:178
-#: en/git-update-server-info.txt:34 en/git-upload-archive.txt:61
-#: en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31
-#: en/git-verify-pack.txt:52 en/git-verify-tag.txt:31
-#: en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:419
-#: en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:202 en/git-bisect.txt:509 en/git-blame.txt:237 en/git-branch.txt:384 en/git-bugreport.txt:53 en/git-bundle.txt:251 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:609 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:354 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:539 en/git-config.txt:508 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:126 en/git-difftool.txt:148 en/git-diff-tree.txt:130 en/git-diff.txt:223 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:302 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:419 en/git-format-patch.txt:726 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:367 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:143 en/git-index-pack.txt:117 en/git-init-db.txt:22 en/git-init.txt:167 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:275 en/git-ls-files.txt:250 en/git-ls-remote.txt:120 en/git-ls-tree.txt:104 en/git-mailinfo.txt:100 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:410 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:696 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1284 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:266 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:218 en/git-revert.txt:144 en/git-rev-list.txt:35 en/git-rev-parse.txt:467 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:121 en/git-show-branch.txt:203 en/git-show-index.txt:51 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:275 en/git-symbolic-ref.txt:68 en/git-tag.txt:391 en/git.txt:1009 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:179 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:420 en/git-write-tree.txt:41 en/gitglossary.txt:26
#, no-wrap
msgid "GIT"
msgstr ""
#. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33
-#: en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203
-#: en/git-bisect.txt:510 en/git-blame.txt:236 en/git-branch.txt:383
-#: en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319
-#: en/git-check-attr.txt:120 en/git-check-ignore.txt:126
-#: en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177
-#: en/git-checkout.txt:603 en/git-check-ref-format.txt:140
-#: en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25
-#: en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79
-#: en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500
-#: en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30
-#: en/git-credential-cache.txt:80 en/git-credential-store.txt:110
-#: en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228
-#: en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207
-#: en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149
-#: en/git-diff-tree.txt:126 en/git-diff.txt:216 en/git-fast-export.txt:284
-#: en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303
-#: en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78
-#: en/git-for-each-ref.txt:420 en/git-format-patch.txt:719
-#: en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161
-#: en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121
-#: en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277
-#: en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144
-#: en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168
-#: en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:289
-#: en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104
-#: en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247
-#: en/git-merge-file.txt:95 en/git-merge-index.txt:83
-#: en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49
-#: en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377
-#: en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69
-#: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411
-#: en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73
-#: en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47
-#: en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673
-#: en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285
-#: en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125
-#: en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188
-#: en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222
-#: en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145
-#: en/git-rev-list.txt:36 en/git-rev-parse.txt:464 en/git-rm.txt:196
-#: en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106
-#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43
-#: en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52
-#: en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95
-#: en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443
-#: en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175
-#: en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:392
-#: en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
-#: en/git-update-index.txt:576 en/git-update-ref.txt:179
-#: en/git-update-server-info.txt:35 en/git-upload-archive.txt:62
-#: en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32
-#: en/git-verify-pack.txt:53 en/git-verify-tag.txt:32
-#: en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:420
-#: en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:203 en/git-bisect.txt:510 en/git-blame.txt:238 en/git-branch.txt:385 en/git-bugreport.txt:54 en/git-bundle.txt:252 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:610 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:355 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:540 en/git-config.txt:509 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:127 en/git-difftool.txt:149 en/git-diff-tree.txt:131 en/git-diff.txt:224 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:303 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:420 en/git-format-patch.txt:727 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:368 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:144 en/git-index-pack.txt:118 en/git-init-db.txt:23 en/git-init.txt:168 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:276 en/git-ls-files.txt:251 en/git-ls-remote.txt:121 en/git-ls-tree.txt:105 en/git-mailinfo.txt:101 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:411 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:697 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1285 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:267 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:219 en/git-revert.txt:145 en/git-rev-list.txt:36 en/git-rev-parse.txt:468 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:122 en/git-show-branch.txt:204 en/git-show-index.txt:52 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:276 en/git-symbolic-ref.txt:69 en/git-tag.txt:392 en/git.txt:1010 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:180 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:421 en/git-write-tree.txt:42 en/gitglossary.txt:27
msgid "Part of the linkgit:git[1] suite"
msgstr ""
@@ -7567,17 +7063,15 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167
-#: en/git-format-patch.txt:121 en/git-rebase.txt:498 en/git-revert.txt:101
-#: en/merge-options.txt:80
+#: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-format-patch.txt:122 en/git-rebase.txt:498 en/git-revert.txt:101
#, no-wrap
msgid "--signoff"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:39
+#: en/git-am.txt:39 en/git-format-patch.txt:126
msgid ""
-"Add a `Signed-off-by:` line to the commit message, using the committer "
+"Add a `Signed-off-by` trailer to the commit message, using the committer "
"identity of yourself. See the signoff option in linkgit:git-commit[1] for "
"more information."
msgstr ""
@@ -7614,11 +7108,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:219 en/git-help.txt:54
-#: en/git-log.txt:130 en/git-ls-files.txt:35 en/git-shortlog.txt:79
-#: en/git-stripspace.txt:42
+#: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:93 en/git-grep.txt:219 en/git-help.txt:54 en/git-log.txt:117 en/git-ls-files.txt:35 en/git-shortlog.txt:79 en/git-stripspace.txt:42
#, no-wrap
msgid "-c"
msgstr ""
@@ -7649,13 +7139,7 @@ msgid "Ignore scissors lines (see linkgit:git-mailinfo[1])."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:240
-#: en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118
-#: en/git-diff-index.txt:32 en/git-diff-tree.txt:66 en/git-help.txt:69
-#: en/git-instaweb.txt:36 en/git-log.txt:150 en/git-ls-files.txt:43
-#: en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347
-#: en/git-restore.txt:82 en/git-svn.txt:308 en/git-svn.txt:675
-#: en/git-switch.txt:118 en/git-symbolic-ref.txt:49
+#: en/git-am.txt:62 en/git-branch.txt:125 en/git-checkout.txt:243 en/git-cvsexportcommit.txt:60 en/git-cvsimport.txt:118 en/git-diff-index.txt:37 en/git-diff-tree.txt:71 en/git-help.txt:69 en/git-instaweb.txt:36 en/git-log.txt:137 en/git-ls-files.txt:43 en/git-mailinfo.txt:69 en/git-read-tree.txt:34 en/git-rebase.txt:347 en/git-restore.txt:86 en/git-svn.txt:308 en/git-svn.txt:675 en/git-switch.txt:121 en/git-symbolic-ref.txt:49
#, no-wrap
msgid "-m"
msgstr ""
@@ -7755,22 +7239,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85
-#: en/git-rebase.txt:383 en/git-revert.txt:115
+#: en/git-am.txt:102 en/git-cherry-pick.txt:159 en/git-merge.txt:85 en/git-rebase.txt:383 en/git-revert.txt:115
#, no-wrap
msgid "--rerere-autoupdate"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86
-#: en/git-rebase.txt:384 en/git-revert.txt:116
+#: en/git-am.txt:103 en/git-cherry-pick.txt:160 en/git-merge.txt:86 en/git-rebase.txt:384 en/git-revert.txt:116
#, no-wrap
msgid "--no-rerere-autoupdate"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89
-#: en/git-rebase.txt:387 en/git-revert.txt:119
+#: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:387 en/git-revert.txt:119
msgid ""
"Allow the rerere mechanism to update the index with the result of "
"auto-conflict resolution if possible."
@@ -7895,32 +7376,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62
-#: en/git-commit.txt:349 en/git-rebase.txt:388 en/git-revert.txt:91
-#: en/merge-options.txt:62
+#: en/git-am.txt:149 en/git-cherry-pick.txt:110 en/git-commit-tree.txt:62 en/git-commit.txt:343 en/git-rebase.txt:388 en/git-revert.txt:91 en/merge-options.txt:62
#, no-wrap
msgid "-S[<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63
-#: en/git-commit.txt:350 en/git-rebase.txt:389 en/git-revert.txt:92
-#: en/merge-options.txt:63
+#: en/git-am.txt:150 en/git-cherry-pick.txt:111 en/git-commit-tree.txt:63 en/git-commit.txt:344 en/git-rebase.txt:389 en/git-revert.txt:92 en/merge-options.txt:63
#, no-wrap
msgid "--gpg-sign[=<keyid>]"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64
-#: en/git-commit.txt:351 en/git-rebase.txt:390 en/git-revert.txt:93
-#: en/merge-options.txt:64
+#: en/git-am.txt:151 en/git-cherry-pick.txt:112 en/git-commit-tree.txt:64 en/git-commit.txt:345 en/git-rebase.txt:390 en/git-revert.txt:93 en/merge-options.txt:64
#, no-wrap
msgid "--no-gpg-sign"
msgstr ""
#. type: Plain text
-#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357
-#: en/git-rebase.txt:396 en/git-revert.txt:99
+#: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:351 en/git-rebase.txt:396 en/git-revert.txt:99
msgid ""
"GPG-sign commits. The `keyid` argument is optional and defaults to the "
"committer identity; if specified, it must be stuck to the option without a "
@@ -7929,17 +7403,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247
-#: en/sequencer.txt:1
+#: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:247 en/sequencer.txt:1
#, no-wrap
msgid "--continue"
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79
-#: en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44
-#: en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56
-#: en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
+#: en/git-am.txt:159 en/git-branch.txt:161 en/git-cherry-pick.txt:79 en/git-diff-tree.txt:36 en/git-grep.txt:128 en/git-ls-tree.txt:44 en/git-pull.txt:104 en/git-rebase.txt:517 en/git-rm.txt:56 en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#, no-wrap
msgid "-r"
msgstr ""
@@ -7975,8 +7445,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201
-#: en/git-rebase.txt:250 en/sequencer.txt:15
+#: en/git-am.txt:175 en/git-merge.txt:95 en/git-notes.txt:201 en/git-rebase.txt:250 en/sequencer.txt:15
#, no-wrap
msgid "--abort"
msgstr ""
@@ -7987,8 +7456,7 @@ msgid "Restore the original branch and abort the patching operation."
msgstr ""
#. type: Labeled list
-#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257
-#: en/sequencer.txt:10
+#: en/git-am.txt:178 en/git-merge.txt:111 en/git-rebase.txt:257 en/sequencer.txt:10
#, no-wrap
msgid "--quit"
msgstr ""
@@ -8013,11 +7481,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386
-#: en/git-fsck.txt:113 en/git-log.txt:226 en/git-merge-base.txt:76
-#: en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77
-#: en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245
-#: en/git-tag.txt:231
+#: en/git-am.txt:189 en/git-commit.txt:495 en/git-format-patch.txt:394 en/git-fsck.txt:113 en/git-log.txt:213 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
#, no-wrap
msgid "DISCUSSION"
msgstr ""
@@ -8115,7 +7579,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-am.txt:239 en/git-commit.txt:521 en/git-gc.txt:146
+#: en/git-am.txt:239 en/git-commit.txt:515 en/git-gc.txt:146
#, no-wrap
msgid "HOOKS"
msgstr ""
@@ -8224,7 +7688,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:91
+#: en/git-apply.txt:41 en/git-rebase.txt:405 en/merge-options.txt:82
#, no-wrap
msgid "--stat"
msgstr ""
@@ -8278,9 +7742,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:65
-#: en/git-submodule.txt:302
+#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29 en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:65 en/git-submodule.txt:302
#, no-wrap
msgid "--cached"
msgstr ""
@@ -8637,14 +8099,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:300
-#: en/git-config.txt:268 en/git-cvsexportcommit.txt:86
-#: en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:362 en/git-fsck.txt:108
-#: en/git-gc.txt:107 en/git-grep.txt:42 en/git-imap-send.txt:52
-#: en/git-instaweb.txt:70 en/git-log.txt:231 en/git-merge.txt:358
-#: en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444
-#: en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215
-#: en/git-update-index.txt:525
+#: en/git-apply.txt:254 en/git-archive.txt:104 en/git-branch.txt:302 en/git-config.txt:277 en/git-cvsexportcommit.txt:86 en/git-fmt-merge-msg.txt:53 en/git-format-patch.txt:370 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:218 en/git-merge.txt:358 en/git-notes.txt:311 en/git-rebase.txt:204 en/git-send-email.txt:444 en/git-status.txt:402 en/git-svn.txt:1084 en/git-tag.txt:215 en/git-update-index.txt:525
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
@@ -8850,8 +8305,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archimport.txt:86 en/git-commit.txt:268 en/git-grep.txt:214
-#: en/git-ls-files.txt:47 en/git-merge-index.txt:29
+#: en/git-archimport.txt:86 en/git-commit.txt:262 en/git-grep.txt:214 en/git-ls-files.txt:47 en/git-merge-index.txt:29
#, no-wrap
msgid "-o"
msgstr ""
@@ -8965,8 +8419,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:165
-#: en/git-show-branch.txt:80 en/git-tag.txt:100
+#: en/git-archive.txt:44 en/git-branch.txt:172 en/git-config.txt:168 en/git-show-branch.txt:80 en/git-tag.txt:100
#, no-wrap
msgid "--list"
msgstr ""
@@ -9072,8 +8525,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:83 en/git-checkout.txt:351 en/git-diff-index.txt:26
-#: en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
+#: en/git-archive.txt:83 en/git-checkout.txt:354 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:358
#, no-wrap
msgid "<tree-ish>"
msgstr ""
@@ -9110,7 +8562,7 @@ msgid "zip"
msgstr ""
#. type: Labeled list
-#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:121
+#: en/git-archive.txt:96 en/git-diff-files.txt:28 en/git-diff.txt:129
#, no-wrap
msgid "-0"
msgstr ""
@@ -9760,9 +9212,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-bisect.txt:245 en/git-tag.txt:373 en/git-bisect-lk2009.txt:914
-#: en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152
-#: en/git-bisect-lk2009.txt:1175
+#: en/git-bisect.txt:245 en/git-tag.txt:373 en/git-bisect-lk2009.txt:914 en/git-bisect-lk2009.txt:1136 en/git-bisect-lk2009.txt:1152 en/git-bisect-lk2009.txt:1175
msgid "For example:"
msgstr ""
@@ -10371,49 +9821,50 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-blame.txt:88 en/git-describe.txt:65
+#: en/git-blame.txt:88 en/git-branch.txt:197 en/git-describe.txt:65
#, no-wrap
msgid "--abbrev=<n>"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:92
+#: en/git-blame.txt:94
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 "
+"object name, use <m>+1 digits, where <m> is at least <n> but ensures the "
+"commit object names are unique. Note that 1 column is used for a caret to "
"mark the boundary commit."
msgstr ""
#. type: Title -
-#: en/git-blame.txt:95
+#: en/git-blame.txt:97
#, no-wrap
msgid "THE PORCELAIN FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:99
+#: en/git-blame.txt:101
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
+#: en/git-blame.txt:103
msgid "40-byte SHA-1 of the commit the line is attributed to;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:102
+#: en/git-blame.txt:104
msgid "the line number of the line in the original file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:103
+#: en/git-blame.txt:105
msgid "the line number of the line in the final file;"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:106
+#: en/git-blame.txt:108
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 "
@@ -10421,38 +9872,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:109
+#: en/git-blame.txt:111
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
+#: en/git-blame.txt:115
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
+#: en/git-blame.txt:116
msgid "the filename in the commit that the line is attributed to."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:115
+#: en/git-blame.txt:117
msgid "the first line of the commit log message (\"summary\")."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:119
+#: en/git-blame.txt:121
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
+#: en/git-blame.txt:129
msgid ""
"The porcelain format generally suppresses commit information that has "
"already been seen. For example, two lines that are blamed to the same commit "
@@ -10464,7 +9915,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:132
+#: en/git-blame.txt:134
#, no-wrap
msgid ""
"\t# count the number of lines attributed to each author\n"
@@ -10474,13 +9925,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-blame.txt:135 en/revisions.txt:247
+#: en/git-blame.txt:137 en/revisions.txt:247
#, no-wrap
msgid "SPECIFYING RANGES"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:141
+#: en/git-blame.txt:143
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 "
@@ -10489,7 +9940,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:146
+#: en/git-blame.txt:148
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 "
@@ -10497,7 +9948,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:149
+#: en/git-blame.txt:151
#, no-wrap
msgid ""
"\tgit blame -L 40,60 foo\n"
@@ -10505,23 +9956,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:151
+#: en/git-blame.txt:153
msgid "Also you can use a regular expression to specify the line range:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:153
+#: en/git-blame.txt:155
#, no-wrap
msgid "\tgit blame -L '/^sub hello {/,/^}$/' foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:155
+#: en/git-blame.txt:157
msgid "which limits the annotation to the body of the `hello` subroutine."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:159
+#: en/git-blame.txt:161
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 "
@@ -10529,7 +9980,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:162
+#: en/git-blame.txt:164
#, no-wrap
msgid ""
"\tgit blame v2.6.18.. -- foo\n"
@@ -10537,7 +9988,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:168
+#: en/git-blame.txt:170
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 "
@@ -10546,7 +9997,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:174
+#: en/git-blame.txt:176
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 "
@@ -10555,32 +10006,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:176
+#: en/git-blame.txt:178
#, no-wrap
msgid "\tgit log --diff-filter=A --pretty=short -- foo\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:179
+#: en/git-blame.txt:181
msgid ""
"and then annotate the change between the commit and its parents, using "
"`commit^!` notation:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:181
+#: en/git-blame.txt:183
#, no-wrap
msgid "\tgit blame -C -C -f $commit^! -- foo\n"
msgstr ""
#. type: Title -
-#: en/git-blame.txt:184
+#: en/git-blame.txt:186
#, no-wrap
msgid "INCREMENTAL OUTPUT"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:191
+#: en/git-blame.txt:193
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 "
@@ -10589,30 +10040,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:195
+#: en/git-blame.txt:197
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
+#: en/git-blame.txt:199
msgid "Each blame entry always starts with a line of:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:199
+#: en/git-blame.txt:201
#, no-wrap
msgid "<40-byte hex sha1> <sourceline> <resultline> <num_lines>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:201
+#: en/git-blame.txt:203
msgid "Line numbers count from 1."
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:206
+#: en/git-blame.txt:208
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 "
@@ -10621,27 +10072,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:209
+#: en/git-blame.txt:211
msgid ""
"Unlike the Porcelain format, the filename information is always given and "
"terminates the entry:"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:211
+#: en/git-blame.txt:213
#, no-wrap
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
msgstr ""
#. type: Plain text
-#: en/git-blame.txt:214
+#: en/git-blame.txt:216
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
+#: en/git-blame.txt:224
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 "
@@ -10652,7 +10103,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-blame.txt:225 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
+#: en/git-blame.txt:227 en/git-check-mailmap.txt:40 en/git-shortlog.txt:112
#, no-wrap
msgid "MAPPING AUTHORS"
msgstr ""
@@ -10673,7 +10124,7 @@ msgstr ""
#, no-wrap
msgid ""
"'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
-"\t[-v [--abbrev=<length> | --no-abbrev]]\n"
+"\t[-v [--abbrev=<n> | --no-abbrev]]\n"
"\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
"\t[--merged [<commit>]] [--no-merged [<commit>]]\n"
"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
@@ -10793,19 +10244,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:97 en/git-checkout.txt:201 en/git-clean.txt:28
-#: en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44
-#: en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41
-#: en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65
-#: en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35
-#: en/git-tag.txt:83 en/git-worktree.txt:179
+#: en/git-branch.txt:97 en/git-checkout.txt:204 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49 en/git-difftool.txt:22 en/git-http-push.txt:44 en/git-instaweb.txt:27 en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181 en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47 en/git-switch.txt:81 en/git-symbolic-ref.txt:35 en/git-tag.txt:83 en/git-worktree.txt:180
#, no-wrap
msgid "-d"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66
-#: en/git-symbolic-ref.txt:36 en/git-tag.txt:84
+#: en/git-branch.txt:98 en/git-push.txt:182 en/git-replace.txt:66 en/git-symbolic-ref.txt:36 en/git-tag.txt:84
#, no-wrap
msgid "--delete"
msgstr ""
@@ -10910,8 +10355,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114
-#: en/git-tag.txt:131
+#: en/git-branch.txt:150 en/git-for-each-ref.txt:93 en/git-grep.txt:114 en/git-tag.txt:131
#, no-wrap
msgid "--ignore-case"
msgstr ""
@@ -11010,38 +10454,34 @@ msgid ""
"messages."
msgstr ""
-#. type: Labeled list
-#: en/git-branch.txt:197
-#, no-wrap
-msgid "--abbrev=<length>"
-msgstr ""
-
#. type: Plain text
-#: en/git-branch.txt:201
+#: en/git-branch.txt:203
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."
+"In the verbose listing that show the commit object name, show the shortest "
+"prefix that is at least '<n>' hexdigits long that uniquely refers the "
+"object. The default value is 7 and can be overridden by the `core.abbrev` "
+"config option."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:202
+#: en/git-branch.txt:204
#, no-wrap
msgid "--no-abbrev"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:204
+#: en/git-branch.txt:206
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
+#: en/git-branch.txt:208 en/git-checkout.txt:158 en/git-switch.txt:155
#, no-wrap
msgid "--track"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:214
+#: en/git-branch.txt:216
msgid ""
"When creating a new branch, set up `branch.<name>.remote` and "
"`branch.<name>.merge` configuration entries to mark the start-point branch "
@@ -11052,7 +10492,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:220
+#: en/git-branch.txt:222
msgid ""
"This behavior is the default when the start point is a remote-tracking "
"branch. Set the branch.autoSetupMerge configuration variable to `false` if "
@@ -11062,39 +10502,39 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:221 en/git-checkout.txt:172 en/git-switch.txt:167
+#: en/git-branch.txt:223 en/git-checkout.txt:172 en/git-switch.txt:170
#, no-wrap
msgid "--no-track"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:224
+#: en/git-branch.txt:226
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
+#: en/git-branch.txt:230
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
+#: en/git-branch.txt:231
#, no-wrap
msgid "-u <upstream>"
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:230
+#: en/git-branch.txt:232
#, no-wrap
msgid "--set-upstream-to=<upstream>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:234
+#: en/git-branch.txt:236
msgid ""
"Set up <branchname>'s tracking information so <upstream> is considered "
"<branchname>'s upstream branch. If no <branchname> is specified, then it "
@@ -11102,26 +10542,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:235
+#: en/git-branch.txt:237
#, no-wrap
msgid "--unset-upstream"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:238
+#: en/git-branch.txt: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
+#: en/git-branch.txt:241
#, no-wrap
msgid "--edit-description"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:244
+#: en/git-branch.txt:246
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 "
@@ -11129,65 +10569,65 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:245 en/git-tag.txt:142
+#: en/git-branch.txt:247 en/git-tag.txt:142
#, no-wrap
msgid "--contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:248
+#: en/git-branch.txt:250
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
+#: en/git-branch.txt:251 en/git-tag.txt:146
#, no-wrap
msgid "--no-contains [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:252
+#: en/git-branch.txt:254
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
+#: en/git-branch.txt:255 en/git-tag.txt:150
#, no-wrap
msgid "--merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:256
+#: en/git-branch.txt:258
msgid ""
"Only list branches whose tips are reachable from the specified commit (HEAD "
"if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:257 en/git-tag.txt:154
+#: en/git-branch.txt:259 en/git-tag.txt:154
#, no-wrap
msgid "--no-merged [<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:260
+#: en/git-branch.txt:262
msgid ""
"Only list branches whose tips are not reachable from the specified commit "
"(HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:261
+#: en/git-branch.txt:263
#, no-wrap
msgid "<branchname>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:266
+#: 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 "
@@ -11195,13 +10635,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:267 en/git-switch.txt:42
+#: en/git-branch.txt:269 en/git-switch.txt:42
#, no-wrap
msgid "<start-point>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:271
+#: 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 "
@@ -11209,38 +10649,37 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:272
+#: en/git-branch.txt:274
#, no-wrap
msgid "<oldbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:274
+#: en/git-branch.txt:276
msgid "The name of an existing branch to rename."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:275
+#: en/git-branch.txt:277
#, no-wrap
msgid "<newbranch>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:278
+#: en/git-branch.txt:280
msgid ""
"The new name for an existing branch. The same restrictions as for "
"<branchname> apply."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:279 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65
-#: en/git-tag.txt:112
+#: en/git-branch.txt: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 ""
#. type: Plain text
-#: en/git-branch.txt:289
+#: 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 "
@@ -11253,24 +10692,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:291 en/git-tag.txt:158
+#: en/git-branch.txt:293 en/git-tag.txt:158
#, no-wrap
msgid "--points-at <object>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:293
+#: en/git-branch.txt:295
msgid "Only list branches of the given object."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:294
+#: en/git-branch.txt:296
#, no-wrap
msgid "--format <format>"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:298
+#: 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 "
@@ -11278,7 +10717,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:304
+#: 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 "
@@ -11286,13 +10725,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:308
+#: en/git-branch.txt:310
#, no-wrap
msgid "Start development from a known tag"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:315
+#: en/git-branch.txt:317
#, no-wrap
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux-2.6 my2.6\n"
@@ -11302,20 +10741,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:319
+#: 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\"."
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:320
+#: en/git-branch.txt:322
#, no-wrap
msgid "Delete an unneeded branch"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:327
+#: en/git-branch.txt:329
#, no-wrap
msgid ""
"$ git clone git://git.kernel.org/.../git.git my.git\n"
@@ -11325,7 +10764,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:332
+#: 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. "
@@ -11333,7 +10772,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:334
+#: 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 "
@@ -11341,13 +10780,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-branch.txt:335
+#: en/git-branch.txt:337
#, no-wrap
msgid "Listing branches from a specific remote"
msgstr ""
#. type: delimited block -
-#: en/git-branch.txt:340
+#: en/git-branch.txt:342
#, no-wrap
msgid ""
"$ git branch -r -l '<remote>/<pattern>' <1>\n"
@@ -11355,34 +10794,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:344
+#: 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."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:345
+#: en/git-branch.txt:347
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:347
+#: en/git-branch.txt:349
msgid "Patterns will normally need quoting."
msgstr ""
#. type: Title -
-#: en/git-branch.txt:349 en/git-for-each-ref.txt:410 en/git-gc.txt:115
-#: en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-rebase.txt:807
-#: en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-for-each-ref.txt:410 en/git-gc.txt:115 en/git-index-pack.txt:107 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-tag.txt:381 en/git-update-index.txt:553
#, no-wrap
msgid "NOTES"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:354
+#: 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 "
@@ -11390,14 +10827,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:357
+#: en/git-branch.txt:359
msgid ""
"The options `--contains`, `--no-contains`, `--merged` and `--no-merged` "
"serve four related but different purposes:"
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:361
+#: 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 "
@@ -11405,28 +10842,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:364
+#: en/git-branch.txt:366
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:367
+#: 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."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:370
+#: 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."
msgstr ""
#. type: Plain text
-#: en/git-branch.txt:380
+#: en/git-branch.txt:382
msgid ""
"linkgit:git-check-ref-format[1], linkgit:git-fetch[1], "
"linkgit:git-remote[1], "
@@ -12316,11 +11753,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66
-#: en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194
-#: en/git-ls-files.txt:190 en/git-push.txt:409 en/git-show-branch.txt:134
-#: en/git-show-ref.txt:97 en/git-status.txt:156
-#: en/git-update-server-info.txt:23
+#: en/git-cat-file.txt:177 en/git-check-attr.txt:48 en/git-check-ignore.txt:66 en/git-check-mailmap.txt:32 en/git-cvsimport.txt:188 en/git-fetch.txt:194 en/git-ls-files.txt:191 en/git-push.txt:433 en/git-show-branch.txt:134 en/git-show-ref.txt:97 en/git-status.txt:156 en/git-update-server-info.txt:23
#, no-wrap
msgid "OUTPUT"
msgstr ""
@@ -12668,12 +12101,7 @@ msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
#. type: Labeled list
-#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43
-#: en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62
-#: en/git-diff-tree.txt:46 en/git-fetch-pack.txt:38 en/git-fetch.txt:51
-#: en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38
-#: en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41
-#: en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
+#: en/git-check-attr.txt:30 en/git-check-ignore.txt:43 en/git-check-mailmap.txt:26 en/git-checkout-index.txt:62 en/git-diff-tree.txt:51 en/git-fetch-pack.txt:38 en/git-fetch.txt:51 en/git-hash-object.txt:32 en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45 en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595 en/git-update-index.txt:154 en/rev-list-options.txt:212
#, no-wrap
msgid "--stdin"
msgstr ""
@@ -13032,7 +12460,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239
+#: en/git-check-ignore.txt:107 en/git-filter-branch.txt:239 en/git-remote.txt:207
#, no-wrap
msgid "EXIT STATUS"
msgstr ""
@@ -13234,10 +12662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout-index.txt:73 en/git-checkout.txt:357 en/git-commit.txt:360
-#: en/git-ls-files.txt:184 en/git-merge-index.txt:25 en/git-prune.txt:53
-#: en/git-reset.txt:127 en/git-restore.txt:140 en/git-update-index.txt:229
-#: en/git-verify-pack.txt:38
+#: en/git-checkout-index.txt:73 en/git-checkout.txt:364 en/git-commit.txt:354 en/git-ls-files.txt:185 en/git-merge-index.txt:25 en/git-prune.txt:53 en/git-reset.txt:127 en/git-restore.txt:144 en/git-update-index.txt:229 en/git-verify-pack.txt:38
msgid "Do not interpret any more arguments as options."
msgstr ""
@@ -13625,20 +13050,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221
-#: en/git-switch.txt:143
+#: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:146
msgid "Quiet, suppress feedback messages."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:67
-#: en/git-switch.txt:145 en/merge-options.txt:155
+#: en/git-checkout.txt:112 en/git-fetch-pack.txt:104 en/git-restore.txt:71 en/git-switch.txt:148 en/merge-options.txt:146
#, no-wrap
msgid "--no-progress"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:117 en/git-restore.txt:72 en/git-switch.txt:150
+#: en/git-checkout.txt:117 en/git-restore.txt:76 en/git-switch.txt:153
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 "
@@ -13661,13 +13084,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:73
+#: en/git-checkout.txt:127 en/git-merge-file.txt:73 en/git-restore.txt:77
#, no-wrap
msgid "--ours"
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:74
+#: en/git-checkout.txt:128 en/git-merge-file.txt:74 en/git-restore.txt:78
#, no-wrap
msgid "--theirs"
msgstr ""
@@ -13749,7 +13172,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:175 en/git-switch.txt:170
+#: en/git-checkout.txt:175 en/git-switch.txt:173
msgid ""
"Do not set up \"upstream\" configuration, even if the "
"`branch.autoSetupMerge` configuration variable is true."
@@ -13786,24 +13209,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:196
-msgid "Use `--no-guess` to disable this."
+#: en/git-checkout.txt:196 en/git-switch.txt:106
+msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:200
+#: en/git-checkout.txt:199 en/git-switch.txt:109
+msgid ""
+"The default behavior can be set via the `checkout.guess` configuration "
+"variable."
+msgstr ""
+
+#. type: Plain text
+#: en/git-checkout.txt:203
msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:202 en/git-daemon.txt:156 en/git-switch.txt:82
-#: en/git-worktree.txt:180
+#: en/git-checkout.txt:205 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:181
#, no-wrap
msgid "--detach"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:208
+#: en/git-checkout.txt:211
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 "
@@ -13812,13 +13241,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:209
+#: en/git-checkout.txt:212
#, no-wrap
msgid "--orphan <new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:215
+#: en/git-checkout.txt:218
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 "
@@ -13827,7 +13256,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:220
+#: en/git-checkout.txt:223
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 "
@@ -13836,7 +13265,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:226
+#: en/git-checkout.txt:229
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 "
@@ -13845,7 +13274,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:233
+#: en/git-checkout.txt:236
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 "
@@ -13856,13 +13285,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:234 en/git-restore.txt:100
+#: en/git-checkout.txt:237 en/git-restore.txt:104
#, no-wrap
msgid "--ignore-skip-worktree-bits"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:239
+#: en/git-checkout.txt:242
msgid ""
"In sparse checkout mode, `git checkout -- <paths>` would update only entries "
"matched by `<paths>` and sparse patterns in "
@@ -13871,15 +13300,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:241 en/git-rebase.txt:348 en/git-rebase.txt:638
-#: en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365
-#: en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:298
+#: en/git-checkout.txt:244 en/git-rebase.txt:348 en/git-rebase.txt:638 en/git-reset.txt:74 en/git-restore.txt:87 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:122 en/rev-list-options.txt:298
#, no-wrap
msgid "--merge"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:250
+#: en/git-checkout.txt:253
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 "
@@ -13890,7 +13317,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:255 en/git-switch.txt:132
+#: en/git-checkout.txt:258 en/git-switch.txt:135
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 "
@@ -13899,25 +13326,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:258
+#: en/git-checkout.txt:261
msgid ""
"When checking out paths from the index, this option lets you recreate the "
"conflicted merge in the specified paths."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:260
+#: en/git-checkout.txt:263
msgid "When switching branches with `--merge`, staged changes may be lost."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:261 en/git-restore.txt:87 en/git-switch.txt:133
+#: en/git-checkout.txt:264 en/git-restore.txt:91 en/git-switch.txt:136
#, no-wrap
msgid "--conflict=<style>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:267 en/git-restore.txt:93 en/git-switch.txt:139
+#: en/git-checkout.txt:270 en/git-restore.txt:97 en/git-switch.txt:142
msgid ""
"The same as `--merge` option above, but changes the way the conflicting "
"hunks are presented, overriding the `merge.conflictStyle` configuration "
@@ -13926,7 +13353,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:274
+#: en/git-checkout.txt:277
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 "
@@ -13935,7 +13362,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:278
+#: en/git-checkout.txt:281
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 "
@@ -13943,20 +13370,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:281
+#: en/git-checkout.txt:284
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:282 en/git-switch.txt:175
+#: en/git-checkout.txt:285 en/git-switch.txt:178
#, no-wrap
msgid "--ignore-other-worktrees"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:287
+#: en/git-checkout.txt:290
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 "
@@ -13964,19 +13391,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:288 en/git-merge.txt:90
+#: en/git-checkout.txt:291 en/git-merge.txt:90
#, no-wrap
msgid "--overwrite-ignore"
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:289 en/git-merge.txt:91
+#: en/git-checkout.txt:292 en/git-merge.txt:91
#, no-wrap
msgid "--no-overwrite-ignore"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:293
+#: en/git-checkout.txt:296
msgid ""
"Silently overwrite ignored files when switching branches. This is the "
"default behavior. Use `--no-overwrite-ignore` to abort the operation when "
@@ -13984,14 +13411,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:294 en/git-grep.txt:95 en/git-ls-files.txt:150
-#: en/git-restore.txt:107 en/git-switch.txt:181
+#: en/git-checkout.txt:297 en/git-grep.txt:95 en/git-ls-files.txt:150 en/git-restore.txt:111 en/git-switch.txt:184
#, no-wrap
msgid "--recurse-submodules"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:303
+#: en/git-checkout.txt:306
msgid ""
"Using `--recurse-submodules` will update the content of all active "
"submodules according to the commit recorded in the superproject. If local "
@@ -14002,19 +13428,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:304 en/git-restore.txt:118
+#: en/git-checkout.txt:307 en/git-restore.txt:122
#, no-wrap
msgid "--overlay"
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:305 en/git-restore.txt:119
+#: en/git-checkout.txt:308 en/git-restore.txt:123
#, no-wrap
msgid "--no-overlay"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:311
+#: en/git-checkout.txt:314
msgid ""
"In the default overlay mode, `git checkout` never removes files from the "
"index or the working tree. When specifying `--no-overlay`, files that "
@@ -14023,13 +13449,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:325 en/git-rebase.txt:244 en/git-switch.txt:36
+#: en/git-checkout.txt:328 en/git-rebase.txt:244 en/git-switch.txt:36
#, no-wrap
msgid "<branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:331
+#: en/git-checkout.txt:334
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 "
@@ -14038,7 +13464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:335
+#: en/git-checkout.txt:338
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 "
@@ -14046,7 +13472,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:339 en/git-switch.txt:58
+#: en/git-checkout.txt:342 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 "
@@ -14054,31 +13480,31 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:340
+#: en/git-checkout.txt:343
#, no-wrap
msgid "<new_branch>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:342 en/git-switch.txt:41
+#: en/git-checkout.txt:345 en/git-switch.txt:41
msgid "Name for the new branch."
msgstr ""
#. type: Labeled list
-#: en/git-checkout.txt:343
+#: en/git-checkout.txt:346
#, no-wrap
msgid "<start_point>"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:346
+#: en/git-checkout.txt:349
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:350
+#: en/git-checkout.txt:353 en/git-checkout.txt:361 en/git-restore.txt:47
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 "
@@ -14086,31 +13512,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:354
+#: en/git-checkout.txt:357
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:360 en/git-reset.txt:130 en/git-restore.txt:143
+#: en/git-checkout.txt:367 en/git-reset.txt:130 en/git-restore.txt:147
msgid "Limits the paths affected by the operation."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:362 en/git-commit.txt:368 en/git-reset.txt:132
-#: en/git-restore.txt:145 en/git-rm.txt:45 en/git-stash.txt:236
+#: en/git-checkout.txt:369 en/git-commit.txt:362 en/git-reset.txt:132 en/git-restore.txt:149 en/git-rm.txt:45 en/git-stash.txt:236
msgid "For more details, see the 'pathspec' entry in linkgit:gitglossary[7]."
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:364
+#: en/git-checkout.txt:371
#, no-wrap
msgid "DETACHED HEAD"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:368
+#: en/git-checkout.txt:375
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, "
@@ -14118,7 +13543,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:377
+#: en/git-checkout.txt:384
#, no-wrap
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -14131,7 +13556,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:384
+#: en/git-checkout.txt:391
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 "
@@ -14141,13 +13566,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:387 en/git-checkout.txt:422 en/git-checkout.txt:439
+#: en/git-checkout.txt:394 en/git-checkout.txt:429 en/git-checkout.txt:446
#, no-wrap
msgid "$ edit; git add; git commit\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:395
+#: en/git-checkout.txt:402
#, no-wrap
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -14160,7 +13585,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:401
+#: en/git-checkout.txt:408
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 "
@@ -14169,7 +13594,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:405
+#: en/git-checkout.txt:412
#, no-wrap
msgid ""
"$ git checkout v2.0 # or\n"
@@ -14177,7 +13602,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:413
+#: en/git-checkout.txt:420
#, no-wrap
msgid ""
" HEAD (refers to commit 'b')\n"
@@ -14190,7 +13615,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:419
+#: en/git-checkout.txt:426
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 "
@@ -14199,7 +13624,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:432
+#: en/git-checkout.txt:439
#, no-wrap
msgid ""
" HEAD (refers to commit 'e')\n"
@@ -14214,14 +13639,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:436
+#: en/git-checkout.txt:443
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:449
+#: en/git-checkout.txt:456
#, no-wrap
msgid ""
"\t HEAD (refers to commit 'f')\n"
@@ -14236,20 +13661,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:453
+#: en/git-checkout.txt:460
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:456
+#: en/git-checkout.txt:463
#, no-wrap
msgid "$ git checkout master\n"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:464
+#: en/git-checkout.txt:471
#, no-wrap
msgid ""
" HEAD (refers to branch 'master')\n"
@@ -14262,7 +13687,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:471
+#: en/git-checkout.txt:478
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 "
@@ -14272,7 +13697,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:476
+#: en/git-checkout.txt:483
#, no-wrap
msgid ""
"$ git checkout -b foo <1>\n"
@@ -14281,7 +13706,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:481
+#: en/git-checkout.txt:488
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 "
@@ -14289,21 +13714,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:484
+#: en/git-checkout.txt:491
msgid ""
"similarly creates a new branch `foo`, which refers to commit `f`, but leaves "
"`HEAD` detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:487
+#: en/git-checkout.txt:494
msgid ""
"creates a new tag `foo`, which refers to commit `f`, leaving `HEAD` "
"detached."
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:492
+#: en/git-checkout.txt:499
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 "
@@ -14312,7 +13737,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:496
+#: en/git-checkout.txt:503
#, no-wrap
msgid ""
"$ git reflog -2 HEAD # or\n"
@@ -14320,13 +13745,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-checkout.txt:499
+#: en/git-checkout.txt:506
#, no-wrap
msgid "ARGUMENT DISAMBIGUATION"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:509
+#: en/git-checkout.txt:516
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 "
@@ -14338,7 +13763,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:516
+#: en/git-checkout.txt:523
msgid ""
"The following sequence checks out the `master` branch, reverts the "
"`Makefile` to two revisions back, deletes `hello.c` by mistake, and gets it "
@@ -14346,7 +13771,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:522
+#: en/git-checkout.txt:529
#, no-wrap
msgid ""
"$ git checkout master <1>\n"
@@ -14356,33 +13781,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:525
+#: en/git-checkout.txt:532
msgid "switch branch"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:526 en/git-restore.txt:161
+#: en/git-checkout.txt:533 en/git-restore.txt:165
msgid "take a file out of another commit"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:527
+#: en/git-checkout.txt:534
msgid "restore `hello.c` from the index"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:530
+#: en/git-checkout.txt:537
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:533
+#: en/git-checkout.txt:540
#, no-wrap
msgid "$ git checkout -- '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:539
+#: en/git-checkout.txt:546
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 "
@@ -14391,7 +13816,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:543
+#: en/git-checkout.txt:550
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 "
@@ -14399,26 +13824,26 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:546
+#: en/git-checkout.txt:553
#, no-wrap
msgid "$ git checkout -- hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:550 en/git-switch.txt:201
+#: en/git-checkout.txt:557 en/git-switch.txt:204
msgid ""
"After working in the wrong branch, switching to the correct branch would be "
"done using:"
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:553
+#: en/git-checkout.txt:560
#, no-wrap
msgid "$ git checkout mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:558
+#: en/git-checkout.txt:565
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 "
@@ -14426,7 +13851,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:562
+#: en/git-checkout.txt:569
#, no-wrap
msgid ""
"$ git checkout mytopic\n"
@@ -14434,14 +13859,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:566 en/git-switch.txt:217
+#: en/git-checkout.txt:573 en/git-switch.txt:220
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:570
+#: en/git-checkout.txt:577
#, no-wrap
msgid ""
"$ git checkout -m mytopic\n"
@@ -14449,7 +13874,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:575 en/git-switch.txt:226
+#: en/git-checkout.txt:582 en/git-switch.txt:229
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 "
@@ -14457,14 +13882,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:578
+#: en/git-checkout.txt:585
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:584
+#: en/git-checkout.txt:591
#, no-wrap
msgid ""
"$ git checkout -m mytopic\n"
@@ -14474,7 +13899,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:590
+#: en/git-checkout.txt:597
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 "
@@ -14482,7 +13907,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-checkout.txt:594
+#: en/git-checkout.txt:601
#, no-wrap
msgid ""
"$ edit frotz\n"
@@ -14490,7 +13915,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-checkout.txt:600
+#: en/git-checkout.txt:607
msgid "linkgit:git-switch[1], linkgit:git-restore[1]"
msgstr ""
@@ -14801,8 +14226,7 @@ msgid "See linkgit:git-merge[1] for some hints on resolving such conflicts."
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:43 en/git-merge.txt:121 en/git-revert.txt:36
-#: en/git-verify-commit.txt:27
+#: en/git-cherry-pick.txt:43 en/git-merge.txt:121 en/git-revert.txt:36 en/git-verify-commit.txt:27
#, no-wrap
msgid "<commit>..."
msgstr ""
@@ -14826,8 +14250,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:58 en/git-commit.txt:192 en/git-revert.txt:70
-#: en/git-tag.txt:183 en/merge-options.txt:35
+#: en/git-cherry-pick.txt:58 en/git-commit.txt:186 en/git-revert.txt:70 en/git-tag.txt:183 en/merge-options.txt:35
#, no-wrap
msgid "--cleanup=<mode>"
msgstr ""
@@ -14917,8 +14340,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:109 en/git-revert.txt:104
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."
+"Add a `Signed-off-by` trailer at the end of the commit message. See the "
+"signoff option in linkgit:git-commit[1] for more information."
msgstr ""
#. type: Labeled list
@@ -14935,7 +14358,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:124 en/git-commit.txt:180 en/git-notes.txt:158
+#: en/git-cherry-pick.txt:124 en/git-commit.txt:174 en/git-notes.txt:158
#, no-wrap
msgid "--allow-empty"
msgstr ""
@@ -14956,8 +14379,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:328
-#: en/git-rebase.txt:641
+#: en/git-cherry-pick.txt:137 en/git-commit.txt:180 en/git-rebase.txt:328 en/git-rebase.txt:641
#, no-wrap
msgid "--allow-empty-message"
msgstr ""
@@ -14987,8 +14409,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362
-#: en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
+#: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:362 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:111
#, no-wrap
msgid "--strategy=<strategy>"
msgstr ""
@@ -15007,7 +14428,7 @@ msgid "-X<option>"
msgstr ""
#. type: Labeled list
-#: en/git-cherry-pick.txt:155 en/git-revert.txt:111 en/merge-options.txt:128
+#: en/git-cherry-pick.txt:155 en/git-revert.txt:111 en/merge-options.txt:119
#, no-wrap
msgid "--strategy-option=<option>"
msgstr ""
@@ -15729,8 +15150,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:46 en/git-config.txt:127 en/git-instaweb.txt:24
-#: en/git-pack-objects.txt:142 en/git-svn.txt:245
+#: en/git-clone.txt:46 en/git-config.txt:130 en/git-instaweb.txt:24 en/git-pack-objects.txt:142 en/git-svn.txt:245
#, no-wrap
msgid "--local"
msgstr ""
@@ -15910,8 +15330,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357
-#: en/rev-list-options.txt:490
+#: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:357 en/rev-list-options.txt:490
#, no-wrap
msgid "--sparse"
msgstr ""
@@ -15972,26 +15391,27 @@ msgid "--origin <name>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:188
+#: en/git-clone.txt:189
msgid ""
"Instead of using the remote name `origin` to keep track of the upstream "
-"repository, use `<name>`."
+"repository, use `<name>`. Overrides `clone.defaultRemoteName` from the "
+"config."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:189
+#: en/git-clone.txt:190
#, no-wrap
msgid "-b <name>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:190
+#: en/git-clone.txt:191
#, no-wrap
msgid "--branch <name>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:197
+#: en/git-clone.txt:198
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 "
@@ -16001,45 +15421,45 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:198
+#: en/git-clone.txt:199
#, no-wrap
msgid "-u <upload-pack>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:203
+#: en/git-clone.txt:204
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:204 en/git-init.txt:59 en/git-svn.txt:578
+#: en/git-clone.txt:205 en/git-init.txt:59 en/git-svn.txt:578
#, no-wrap
msgid "--template=<template_directory>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:207
+#: en/git-clone.txt:208
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:208
+#: en/git-clone.txt:209
#, no-wrap
msgid "-c <key>=<value>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:209
+#: en/git-clone.txt:210
#, no-wrap
msgid "--config <key>=<value>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:218
+#: en/git-clone.txt:219
msgid ""
"Set a configuration variable in the newly-created repository; this takes "
"effect immediately after the repository is initialized, but before the "
@@ -16051,7 +15471,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:224
+#: en/git-clone.txt:225
msgid ""
"Due to limitations of the current implementation, some configuration "
"variables do not take effect until after the initial fetch and checkout. "
@@ -16061,13 +15481,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:225
+#: en/git-clone.txt:226
#, no-wrap
msgid "--depth <depth>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:231
+#: en/git-clone.txt:232
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 "
@@ -16076,12 +15496,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:234
+#: en/git-clone.txt:235
msgid "Create a shallow clone with a history after the specified time."
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:239
+#: en/git-clone.txt:240
msgid ""
"Create a shallow clone with a history, excluding commits reachable from a "
"specified remote branch or tag. This option can be specified multiple "
@@ -16089,13 +15509,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:240 en/git-submodule.txt:433
+#: en/git-clone.txt:241 en/git-submodule.txt:433
#, no-wrap
msgid "--[no-]single-branch"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:249
+#: en/git-clone.txt:250
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` "
@@ -16106,7 +15526,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:256
+#: en/git-clone.txt:257
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 "
@@ -16115,7 +15535,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:261
+#: en/git-clone.txt:262
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 "
@@ -16124,13 +15544,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:262
+#: en/git-clone.txt:263
#, no-wrap
msgid "--recurse-submodules[=<pathspec>]"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:270
+#: en/git-clone.txt:271
msgid ""
"After the clone is created, initialize and clone submodules within based on "
"the provided pathspec. If no pathspec is provided, all submodules are "
@@ -16141,7 +15561,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:277
+#: en/git-clone.txt:278
msgid ""
"Submodules are initialized and cloned using their default settings. This is "
"equivalent to running `git submodule update --init --recursive <pathspec>` "
@@ -16151,24 +15571,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:278
+#: en/git-clone.txt:279
#, no-wrap
msgid "--[no-]shallow-submodules"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:280
+#: en/git-clone.txt:281
msgid "All submodules which are cloned will be shallow with a depth of 1."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:281
+#: en/git-clone.txt:282
#, no-wrap
msgid "--[no-]remote-submodules"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:286
+#: en/git-clone.txt:287
msgid ""
"All submodules which are cloned will use the status of the submodule's "
"remote-tracking branch to update the submodule, rather than the "
@@ -16177,13 +15597,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:64
+#: en/git-clone.txt:288 en/git-init.txt:64
#, no-wrap
msgid "--separate-git-dir=<git dir>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:293
+#: en/git-clone.txt:294
msgid ""
"Instead of placing the cloned repository where it is supposed to be, place "
"the cloned repository at the specified directory, then make a "
@@ -16192,48 +15612,45 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:294 en/git-submodule.txt:427
+#: en/git-clone.txt:295 en/git-submodule.txt:427
#, no-wrap
msgid "-j <n>"
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:295 en/git-submodule.txt:428
+#: en/git-clone.txt:296 en/git-submodule.txt:428
#, no-wrap
msgid "--jobs <n>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:298
+#: en/git-clone.txt:299
msgid ""
"The number of submodules fetched at the same time. Defaults to the "
"`submodule.fetchJobs` option."
msgstr ""
#. type: Labeled list
-#: en/git-clone.txt:299 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:83
-#: en/git-push.txt:50 en/pull-fetch-param.txt:1
+#: en/git-clone.txt:300 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 ""
#. type: Plain text
-#: en/git-clone.txt:303
+#: en/git-clone.txt:304
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:304 en/git-cvsserver.txt:53 en/git-daemon.txt:220
-#: en/git-receive-pack.txt:41 en/git-send-pack.txt:95
-#: en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
+#: en/git-clone.txt:305 en/git-cvsserver.txt:53 en/git-daemon.txt:220 en/git-receive-pack.txt:41 en/git-send-pack.txt:95 en/git-upload-archive.txt:57 en/git-upload-pack.txt:44
#, no-wrap
msgid "<directory>"
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:310
+#: en/git-clone.txt:311
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 "
@@ -16242,12 +15659,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:318
+#: en/git-clone.txt:319
msgid "Clone from upstream:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:323
+#: en/git-clone.txt:324
#, no-wrap
msgid ""
"$ git clone git://git.kernel.org/pub/scm/.../linux.git my-linux\n"
@@ -16256,14 +15673,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:327
+#: en/git-clone.txt:328
msgid ""
"Make a local clone that borrows from the current directory, without checking "
"things out:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:332
+#: en/git-clone.txt:333
#, no-wrap
msgid ""
"$ git clone -l -s -n . ../copy\n"
@@ -16272,12 +15689,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:336
+#: en/git-clone.txt:337
msgid "Clone from upstream while borrowing from an existing local directory:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:342
+#: en/git-clone.txt:343
#, no-wrap
msgid ""
"$ git clone --reference /git/linux.git \\\n"
@@ -16287,12 +15704,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-clone.txt:346
+#: en/git-clone.txt:347
msgid "Create a bare repository to publish your changes to the public:"
msgstr ""
#. type: delimited block -
-#: en/git-clone.txt:349
+#: en/git-clone.txt:350
#, no-wrap
msgid "$ git clone --bare -l /home/proj/.git /pub/scm/proj.git\n"
msgstr ""
@@ -16558,8 +15975,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit-tree.txt:57 en/git-commit.txt:132 en/git-fmt-merge-msg.txt:47
-#: en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
+#: en/git-commit-tree.txt:57 en/git-commit.txt:133 en/git-fmt-merge-msg.txt:47 en/git-merge.txt:77 en/git-notes.txt:140 en/git-tag.txt:170
#, no-wrap
msgid "-F <file>"
msgstr ""
@@ -16622,9 +16038,7 @@ msgid "Discussion"
msgstr ""
#. type: Title -
-#: en/git-commit-tree.txt:91 en/git-commit.txt:527 en/git-config.txt:275
-#: en/git-credential-store.txt:45 en/git-show-ref.txt:174
-#: en/git-submodule.txt:443 en/git-svn.txt:1157
+#: en/git-commit-tree.txt:91 en/git-commit.txt:521 en/git-config.txt:284 en/git-credential-store.txt:45 en/git-show-ref.txt:174 en/git-submodule.txt:443 en/git-svn.txt:1157
#, no-wrap
msgid "FILES"
msgstr ""
@@ -16737,65 +16151,65 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:70
+#: en/git-commit.txt:71
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
+#: en/git-commit.txt:77
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
+#: en/git-commit.txt:78
#, no-wrap
msgid "-C <commit>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:78
+#: en/git-commit.txt:79
#, no-wrap
msgid "--reuse-message=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:82
+#: en/git-commit.txt:83
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
+#: en/git-commit.txt:84
#, no-wrap
msgid "-c <commit>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:84
+#: en/git-commit.txt:85
#, no-wrap
msgid "--reedit-message=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:87
+#: en/git-commit.txt:88
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
+#: en/git-commit.txt:89
#, no-wrap
msgid "--fixup=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:93
+#: en/git-commit.txt:94
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 "
@@ -16803,13 +16217,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:94
+#: en/git-commit.txt:95
#, no-wrap
msgid "--squash=<commit>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:100
+#: en/git-commit.txt:101
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 "
@@ -16818,13 +16232,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:101
+#: en/git-commit.txt:102
#, no-wrap
msgid "--reset-author"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:106
+#: en/git-commit.txt:107
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 "
@@ -16832,58 +16246,57 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:107 en/git-status.txt:28 en/git-symbolic-ref.txt:45
+#: en/git-commit.txt:108 en/git-status.txt:28 en/git-symbolic-ref.txt:45
#, no-wrap
msgid "--short"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:110
+#: en/git-commit.txt:111
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
+#: en/git-commit.txt:112 en/git-status.txt:32
#, no-wrap
msgid "--branch"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:113 en/git-status.txt:34
+#: en/git-commit.txt:114 en/git-status.txt:34
msgid "Show the branch and tracking info even in short-format."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:118
+#: en/git-commit.txt:119
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
+#: en/git-commit.txt:120 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
#, no-wrap
msgid "--long"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:122
+#: en/git-commit.txt:123
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:208
+#: en/git-commit.txt:125 en/git-config.txt:216 en/git-grep.txt:208
#, no-wrap
msgid "--null"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:131
+#: en/git-commit.txt:132
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 "
@@ -16893,27 +16306,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141
-#: en/git-tag.txt:171
+#: en/git-commit.txt:134 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
#, no-wrap
msgid "--file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:136
+#: en/git-commit.txt:137
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
+#: en/git-commit.txt:138
#, no-wrap
msgid "--author=<author>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:143
+#: en/git-commit.txt:144
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 "
@@ -16923,56 +16335,54 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:144
+#: en/git-commit.txt:145
#, no-wrap
msgid "--date=<date>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:146
+#: en/git-commit.txt:147
msgid "Override the author date used in the commit."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:147 en/git-merge.txt:66 en/git-notes.txt:132
-#: en/git-svn.txt:468 en/git-tag.txt:162
+#: en/git-commit.txt:148 en/git-merge.txt:66 en/git-notes.txt:132 en/git-svn.txt:468 en/git-tag.txt:162
#, no-wrap
msgid "-m <msg>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:148 en/git-notes.txt:133 en/git-svn.txt:469
-#: en/git-tag.txt:163
+#: en/git-commit.txt:149 en/git-notes.txt:133 en/git-svn.txt:469 en/git-tag.txt:163
#, no-wrap
msgid "--message=<msg>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:152
+#: en/git-commit.txt:153
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
+#: en/git-commit.txt:155
msgid "The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:155
+#: en/git-commit.txt:156
#, no-wrap
msgid "-t <file>"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:156
+#: en/git-commit.txt:157
#, no-wrap
msgid "--template=<file>"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:165
+#: en/git-commit.txt:166
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 "
@@ -16983,31 +16393,21 @@ msgid ""
"by other means, e.g. with the `-m` or `-F` options."
msgstr ""
-#. type: Plain text
-#: en/git-commit.txt:174 en/merge-options.txt:88
-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:413 en/merge-options.txt:115
+#: en/git-commit.txt:170 en/git-rebase.txt:413 en/merge-options.txt:106
#, no-wrap
msgid "--no-verify"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:179
+#: en/git-commit.txt:173
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
+#: en/git-commit.txt:179
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 "
@@ -17016,7 +16416,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:191
+#: en/git-commit.txt:185
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 "
@@ -17024,7 +16424,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:196
+#: en/git-commit.txt:190
msgid ""
"This option determines how the supplied commit message should be cleaned up "
"before committing. The '<mode>' can be `strip`, `whitespace`, `verbatim`, "
@@ -17032,48 +16432,48 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:198
+#: en/git-commit.txt:192
#, no-wrap
msgid "strip"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:201
+#: en/git-commit.txt:195
msgid ""
"Strip leading and trailing empty lines, trailing whitespace, commentary and "
"collapse consecutive empty lines."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:201
+#: en/git-commit.txt:195
#, no-wrap
msgid "whitespace"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:203
+#: en/git-commit.txt:197
msgid "Same as `strip` except #commentary is not removed."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:203
+#: en/git-commit.txt:197
#, no-wrap
msgid "verbatim"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:205
+#: en/git-commit.txt:199
msgid "Do not change the message at all."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:205
+#: en/git-commit.txt:199
#, no-wrap
msgid "scissors"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:209
+#: en/git-commit.txt:203
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 "
@@ -17081,25 +16481,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:211
+#: en/git-commit.txt:205
#, no-wrap
msgid "# ------------------------ >8 ------------------------\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:215
+#: en/git-commit.txt:209
msgid "Same as `strip` if the message is to be edited. Otherwise `whitespace`."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:219
+#: en/git-commit.txt:213
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
+#: en/git-commit.txt:220
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 "
@@ -17108,13 +16508,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:227 en/git-revert.txt:66 en/merge-options.txt:17
+#: en/git-commit.txt:221 en/git-revert.txt:66 en/merge-options.txt:17
#, no-wrap
msgid "--no-edit"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:231
+#: en/git-commit.txt:225
msgid ""
"Use the selected commit message without launching an editor. For example, "
"`git commit --amend --no-edit` amends a commit without changing its commit "
@@ -17122,13 +16522,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:232
+#: en/git-commit.txt:226
#, no-wrap
msgid "--amend"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:242
+#: en/git-commit.txt:236
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 "
@@ -17140,12 +16540,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:245
+#: en/git-commit.txt:239
msgid "It is a rough equivalent for:"
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:249
+#: en/git-commit.txt:243
#, no-wrap
msgid ""
"\t$ git reset --soft HEAD^\n"
@@ -17154,12 +16554,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:252
+#: en/git-commit.txt:246
msgid "but can be used to amend a merge commit."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:257
+#: en/git-commit.txt:251
msgid ""
"You should understand the implications of rewriting history if you amend a "
"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM "
@@ -17167,24 +16567,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:258
+#: en/git-commit.txt:252
#, no-wrap
msgid "--no-post-rewrite"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:260
+#: en/git-commit.txt:254
msgid "Bypass the post-rewrite hook."
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:262
+#: en/git-commit.txt:256
#, no-wrap
msgid "--include"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:267
+#: en/git-commit.txt:261
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 "
@@ -17192,13 +16592,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:269
+#: en/git-commit.txt:263
#, no-wrap
msgid "--only"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:281
+#: en/git-commit.txt:275
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 "
@@ -17212,24 +16612,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:295 en/git-status.txt:58
+#: en/git-commit.txt:289 en/git-status.txt:58
#, no-wrap
msgid "-u[<mode>]"
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:296 en/git-status.txt:59
+#: en/git-commit.txt:290 en/git-status.txt:59
#, no-wrap
msgid "--untracked-files[=<mode>]"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:298 en/git-status.txt:61
+#: en/git-commit.txt:292 en/git-status.txt:61
msgid "Show untracked files."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:303
+#: en/git-commit.txt:297
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 "
@@ -17237,37 +16637,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
+#: en/git-commit.txt:299 en/git-status.txt:68 en/git-status.txt:110
msgid "The possible options are:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:307
+#: en/git-commit.txt:301
#, no-wrap
msgid "'no' - Show no untracked files\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:308
+#: en/git-commit.txt:302
#, no-wrap
msgid "'normal' - Shows untracked files and directories\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:309 en/git-status.txt:72
+#: en/git-commit.txt:303 en/git-status.txt:72
#, no-wrap
msgid "'all' - Also shows individual files in untracked directories.\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:312 en/git-status.txt:85
+#: en/git-commit.txt:306 en/git-status.txt:85
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
+#: en/git-commit.txt:318
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 "
@@ -17278,7 +16678,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:328
+#: en/git-commit.txt:322
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 "
@@ -17286,12 +16686,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:332
+#: en/git-commit.txt:326
msgid "Suppress commit summary message."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:337
+#: en/git-commit.txt:331
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 "
@@ -17299,13 +16699,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:338
+#: en/git-commit.txt:332
#, no-wrap
msgid "--status"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:343
+#: en/git-commit.txt:337
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 "
@@ -17313,20 +16713,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:344
+#: en/git-commit.txt:338
#, no-wrap
msgid "--no-status"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:348
+#: en/git-commit.txt:342
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:366
+#: en/git-commit.txt:360
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 "
@@ -17335,7 +16735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:382
+#: en/git-commit.txt:376
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 "
@@ -17349,7 +16749,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:388
+#: en/git-commit.txt:382
#, no-wrap
msgid ""
"$ edit hello.c\n"
@@ -17359,7 +16759,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:396
+#: en/git-commit.txt:390
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 "
@@ -17369,7 +16769,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:401
+#: en/git-commit.txt:395
#, no-wrap
msgid ""
"$ edit hello.c\n"
@@ -17378,7 +16778,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:406
+#: en/git-commit.txt:400
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 "
@@ -17386,7 +16786,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:411
+#: en/git-commit.txt:405
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, "
@@ -17395,7 +16795,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:417
+#: en/git-commit.txt:411
#, no-wrap
msgid ""
"$ edit hello.c hello.h\n"
@@ -17405,7 +16805,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:424
+#: en/git-commit.txt:418
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 "
@@ -17414,20 +16814,20 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:427 en/git-commit.txt:453
+#: en/git-commit.txt:421 en/git-commit.txt:447
#, no-wrap
msgid "$ git commit\n"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:431
+#: en/git-commit.txt:425
msgid ""
"this second commit would record the changes to `hello.c` and `hello.h` as "
"expected."
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:439
+#: en/git-commit.txt:433
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, "
@@ -17438,7 +16838,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-commit.txt:445
+#: en/git-commit.txt:439
#, no-wrap
msgid ""
"$ git status | grep unmerged\n"
@@ -17448,7 +16848,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:450
+#: en/git-commit.txt:444
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 "
@@ -17456,7 +16856,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:461
+#: en/git-commit.txt:455
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 "
@@ -17466,20 +16866,20 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-commit.txt:463
+#: en/git-commit.txt:457
#, no-wrap
msgid "COMMIT INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:467
+#: en/git-commit.txt:461
msgid ""
"Author and committer information is taken from the following environment "
"variables, if set:"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:474
+#: en/git-commit.txt:468
#, no-wrap
msgid ""
"\tGIT_AUTHOR_NAME\n"
@@ -17491,12 +16891,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:476
+#: en/git-commit.txt:470
msgid "(nb \"<\", \">\" and \"\\n\"s are stripped)"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:482
+#: en/git-commit.txt:476
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 "
@@ -17507,7 +16907,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:489
+#: en/git-commit.txt:483
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 "
@@ -17518,7 +16918,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:493
+#: en/git-commit.txt:487
msgid ""
"The `author.name` and `committer.name` and their corresponding email options "
"override `user.name` and `user.email` if set and are overridden themselves "
@@ -17526,14 +16926,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:496
+#: en/git-commit.txt:490
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:510
+#: en/git-commit.txt:504
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 "
@@ -17545,13 +16945,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-commit.txt:514
+#: en/git-commit.txt:508
#, no-wrap
msgid "ENVIRONMENT AND CONFIGURATION VARIABLES"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:519
+#: en/git-commit.txt:513
msgid ""
"The editor used to edit the commit log message will be chosen from the "
"`GIT_EDITOR` environment variable, the core.editor configuration variable, "
@@ -17560,7 +16960,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:525
+#: en/git-commit.txt:519
msgid ""
"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
@@ -17568,13 +16968,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-commit.txt:529
+#: en/git-commit.txt:523
#, no-wrap
msgid "`$GIT_DIR/COMMIT_EDITMSG`"
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:535
+#: en/git-commit.txt:529
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 "
@@ -17584,7 +16984,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-commit.txt:543
+#: en/git-commit.txt:537
msgid ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], "
"linkgit:git-merge[1], linkgit:git-commit-tree[1]"
@@ -17605,21 +17005,23 @@ msgstr ""
#: en/git-config.txt:27
#, no-wrap
msgid ""
-"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
-"[-z|--null] name [value [value_regex]]\n"
+"'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] "
+"[--show-scope] [-z|--null] name [value [value-pattern]]\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>] [--fixed-value] --replace-all "
+"name value [value-pattern]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
-"[-z|--null] --get name [value_regex]\n"
+"[-z|--null] [--fixed-value] --get name [value-pattern]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
-"[-z|--null] --get-all name [value_regex]\n"
+"[-z|--null] [--fixed-value] --get-all name [value-pattern]\n"
"'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] "
-"[-z|--null] [--name-only] --get-regexp name_regex [value_regex]\n"
+"[-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex "
+"[value-pattern]\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>] [--fixed-value] --unset name [value-pattern]\n"
+"'git config' [<file-option>] [--fixed-value] --unset-all name "
+"[value-pattern]\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] [--show-scope] [-z|--null] "
@@ -17638,18 +17040,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:40
+#: en/git-config.txt:43
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>>)."
+"`value-pattern` (which is an extended regular expression, unless the "
+"`--fixed-value` option is given) needs to be given. Only the existing "
+"values that match the pattern are updated or unset. If you want to handle "
+"the lines that do *not* match the pattern, just prepend a single exclamation "
+"mark in front (see also <<EXAMPLES>>), but note that this only works when "
+"the `--fixed-value` option is not in use."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:45
+#: en/git-config.txt:48
msgid ""
"The `--type=<type>` option instructs 'git config' to ensure that incoming "
"and outgoing values are canonicalize-able under the given <type>. If no "
@@ -17658,7 +17062,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:51
+#: en/git-config.txt:54
msgid ""
"When reading, the values are read from the system, global and repository "
"local configuration files by default, and options `--system`, `--global`, "
@@ -17667,7 +17071,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:57
+#: en/git-config.txt:60
msgid ""
"When writing, the new value is written to the repository local configuration "
"file by default, and options `--system`, `--global`, `--worktree`, `--file "
@@ -17676,86 +17080,86 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:60
+#: en/git-config.txt:63
msgid ""
"This command will fail with non-zero status upon error. Some exit codes "
"are:"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:62
+#: en/git-config.txt:65
msgid "The section or key is invalid (ret=1),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:63
+#: en/git-config.txt:66
msgid "no section or name was provided (ret=2),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:64
+#: en/git-config.txt:67
msgid "the config file is invalid (ret=3),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:65
+#: en/git-config.txt:68
msgid "the config file cannot be written (ret=4),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:66
+#: en/git-config.txt:69
msgid "you try to unset an option which does not exist (ret=5),"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:67
+#: en/git-config.txt:70
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
+#: en/git-config.txt:71
msgid "you try to use an invalid regexp (ret=6)."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:70
+#: en/git-config.txt:73
msgid "On success, the command returns the exit code 0."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:74
+#: en/git-config.txt:77
#, no-wrap
msgid "--replace-all"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:77
+#: en/git-config.txt:80
msgid ""
"Default behavior is to replace at most one line. This replaces all lines "
-"matching the key (and optionally the value_regex)."
+"matching the key (and optionally the `value-pattern`)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:78 en/git-update-index.txt:45
+#: en/git-config.txt:81 en/git-update-index.txt:45
#, no-wrap
msgid "--add"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:82
+#: en/git-config.txt:85
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`."
+"the same as providing '^$' as the `value-pattern` in `--replace-all`."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:83
+#: en/git-config.txt:86
#, no-wrap
msgid "--get"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:87
+#: en/git-config.txt:90
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 "
@@ -17763,24 +17167,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:88
+#: en/git-config.txt:91
#, no-wrap
msgid "--get-all"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:90
+#: en/git-config.txt:93
msgid "Like get, but returns all values for a multi-valued key."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:91
+#: en/git-config.txt:94
#, no-wrap
msgid "--get-regexp"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:97
+#: en/git-config.txt: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 "
@@ -17789,13 +17193,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:98
+#: en/git-config.txt:101
#, no-wrap
msgid "--get-urlmatch name URL"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:105
+#: en/git-config.txt:108
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 "
@@ -17805,13 +17209,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:106
+#: en/git-config.txt:109
#, no-wrap
msgid "--global"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:111
+#: en/git-config.txt:114
msgid ""
"For writing options: write to global `~/.gitconfig` file rather than the "
"repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if "
@@ -17819,60 +17223,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:114
+#: en/git-config.txt:117
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:339
+#: en/git-config.txt:119 en/git-config.txt:129 en/git-config.txt:138 en/git-config.txt:348
msgid "See also <<FILES>>."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:117
+#: en/git-config.txt:120
#, no-wrap
msgid "--system"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:121
+#: en/git-config.txt:124
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
+#: en/git-config.txt:127
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
+#: en/git-config.txt:133
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
+#: en/git-config.txt:136
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:55
+#: en/git-config.txt:139 en/git-restore.txt:59
#, no-wrap
msgid "--worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:140
+#: en/git-config.txt:143
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 "
@@ -17880,30 +17283,30 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:141
+#: en/git-config.txt:144
#, no-wrap
msgid "-f config-file"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:142
+#: en/git-config.txt:145
#, no-wrap
msgid "--file config-file"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:144
+#: en/git-config.txt:147
msgid "Use the given config file instead of the one specified by GIT_CONFIG."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:145
+#: en/git-config.txt:148
#, no-wrap
msgid "--blob blob"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:151
+#: en/git-config.txt:154
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 "
@@ -17913,62 +17316,77 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:152
+#: en/git-config.txt:155
#, no-wrap
msgid "--remove-section"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:154
+#: en/git-config.txt:157
msgid "Remove the given section from the configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:155
+#: en/git-config.txt:158
#, no-wrap
msgid "--rename-section"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:157
+#: en/git-config.txt:160
msgid "Rename the given section to a new name."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:158
+#: en/git-config.txt:161
#, no-wrap
msgid "--unset"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:160
+#: en/git-config.txt:163
msgid "Remove the line matching the key from config file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:161
+#: en/git-config.txt:164
#, no-wrap
msgid "--unset-all"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:163
+#: en/git-config.txt:166
msgid "Remove all lines matching the key from config file."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:167
+#: en/git-config.txt:170
msgid "List all variables set in config file, along with their values."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:168
+#: en/git-config.txt:171
+#, no-wrap
+msgid "--fixed-value"
+msgstr ""
+
+#. type: Plain text
+#: en/git-config.txt:176
+msgid ""
+"When used with the `value-pattern` argument, treat `value-pattern` as an "
+"exact string instead of a regular expression. This will restrict the "
+"name/value pairs that are matched to only those where the value is exactly "
+"equal to the `value-pattern`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-config.txt:177
#, no-wrap
msgid "--type <type>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:172
+#: en/git-config.txt:181
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 "
@@ -17976,17 +17394,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:174
+#: en/git-config.txt:183
msgid "Valid `<type>`'s include:"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:176
+#: en/git-config.txt:185
msgid "'bool': canonicalize values as either \"true\" or \"false\"."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:179
+#: en/git-config.txt:188
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 "
@@ -17994,14 +17412,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:181
+#: en/git-config.txt:190
msgid ""
"'bool-or-int': canonicalize according to either 'bool' or 'int', as "
"described above."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:185
+#: en/git-config.txt:194
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 "
@@ -18010,7 +17428,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:187
+#: en/git-config.txt:196
msgid ""
"'expiry-date': canonicalize by converting from a fixed or relative "
"date-string to a timestamp. This specifier has no effect when setting the "
@@ -18018,7 +17436,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:191
+#: en/git-config.txt:200
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 "
@@ -18027,50 +17445,50 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:193
+#: en/git-config.txt:202
#, no-wrap
msgid "--bool"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:194
+#: en/git-config.txt:203
#, no-wrap
msgid "--int"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:195
+#: en/git-config.txt:204
#, no-wrap
msgid "--bool-or-int"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:196 en/git-hash-object.txt:39
+#: en/git-config.txt:205 en/git-hash-object.txt:39
#, no-wrap
msgid "--path"
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:197
+#: en/git-config.txt:206
#, no-wrap
msgid "--expiry-date"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:200
+#: en/git-config.txt:209
msgid ""
"Historical options for selecting a type specifier. Prefer instead `--type` "
"(see above)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:201
+#: en/git-config.txt:210
#, no-wrap
msgid "--no-type"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:205
+#: en/git-config.txt:214
msgid ""
"Un-sets the previously set type specifier (if one was previously set). This "
"option requests that 'git config' not canonicalize the retrieved variable. "
@@ -18078,7 +17496,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:214
+#: en/git-config.txt:223
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 "
@@ -18087,18 +17505,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:218
+#: en/git-config.txt:227
msgid "Output only the names of config variables for `--list` or `--get-regexp`."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:219
+#: en/git-config.txt:228
#, no-wrap
msgid "--show-origin"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:224
+#: en/git-config.txt:233
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, "
@@ -18106,13 +17524,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:225
+#: en/git-config.txt:234
#, no-wrap
msgid "--show-scope"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:229
+#: en/git-config.txt:238
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, "
@@ -18120,13 +17538,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:230
+#: en/git-config.txt:239
#, no-wrap
msgid "--get-colorbool name [stdout-is-tty]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:240
+#: en/git-config.txt:249
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 "
@@ -18138,13 +17556,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:241
+#: en/git-config.txt:250
#, no-wrap
msgid "--get-color name [default]"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:247
+#: en/git-config.txt:256
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 "
@@ -18153,7 +17571,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:251
+#: en/git-config.txt:260
msgid ""
"`--type=color [--default=<default>]` is preferred over `--get-color` (but "
"note that `--get-color` will omit the trailing newline printed by "
@@ -18161,20 +17579,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:256
+#: en/git-config.txt:265
msgid ""
"Opens an editor to modify the specified config file; either `--system`, "
"`--global`, or repository (default)."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:257
+#: en/git-config.txt:266
#, no-wrap
msgid "--[no-]includes"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:262
+#: en/git-config.txt:271
msgid ""
"Respect `include.*` directives in config files when looking up "
"values. Defaults to `off` when a specific file is given (e.g., using "
@@ -18182,20 +17600,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:263
+#: en/git-config.txt:272
#, no-wrap
msgid "--default <value>"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:266
+#: en/git-config.txt:275
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:272
+#: en/git-config.txt:281
msgid ""
"`pager.config` is only respected when listing configuration, i.e., when "
"using `--list` or any of the `--get-*` which may return multiple results. "
@@ -18203,31 +17621,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:279
+#: en/git-config.txt:288
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:280
+#: en/git-config.txt:289
#, no-wrap
msgid "$(prefix)/etc/gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:282
+#: en/git-config.txt:291
msgid "System-wide configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:283
+#: en/git-config.txt:292
#, no-wrap
msgid "$XDG_CONFIG_HOME/git/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:290
+#: en/git-config.txt:299
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 "
@@ -18237,42 +17655,42 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:291
+#: en/git-config.txt:300
#, no-wrap
msgid "~/.gitconfig"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:294
+#: en/git-config.txt:303
msgid "User-specific configuration file. Also called \"global\" configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:295
+#: en/git-config.txt:304
#, no-wrap
msgid "$GIT_DIR/config"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:297
+#: en/git-config.txt:306
msgid "Repository specific configuration file."
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:298
+#: en/git-config.txt:307
#, no-wrap
msgid "$GIT_DIR/config.worktree"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:301
+#: en/git-config.txt:310
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:307
+#: en/git-config.txt:316
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 "
@@ -18282,7 +17700,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:311
+#: en/git-config.txt:320
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 "
@@ -18290,14 +17708,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:314
+#: en/git-config.txt:323
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:318
+#: en/git-config.txt:327
msgid ""
"All writing options will per default write to the repository specific "
"configuration file. Note that this also affects options like `--replace-all` "
@@ -18305,7 +17723,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:324
+#: en/git-config.txt:333
msgid ""
"You can override these rules either by command-line options or by "
"environment variables. The `--global`, `--system` and `--worktree` options "
@@ -18315,20 +17733,19 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:327 en/git-cvsserver.txt:310 en/git-daemon.txt:332
-#: en/git-http-backend.txt:243 en/git-notes.txt:373
+#: en/git-config.txt:336 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:329
+#: en/git-config.txt:338
#, no-wrap
msgid "GIT_CONFIG"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:333
+#: en/git-config.txt:342
msgid ""
"Take the configuration from the given file instead of .git/config. Using "
"the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" "
@@ -18336,25 +17753,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-config.txt:334
+#: en/git-config.txt:343
#, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:337
+#: en/git-config.txt:346
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:346
+#: en/git-config.txt:355
msgid "Given a .git/config like this:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:353
+#: en/git-config.txt:362
#, no-wrap
msgid ""
"#\n"
@@ -18365,7 +17782,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:358 en/git.txt:331
+#: en/git-config.txt:367 en/git.txt:331
#, no-wrap
msgid ""
"; core variables\n"
@@ -18375,7 +17792,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:363
+#: en/git-config.txt:372
#, no-wrap
msgid ""
"; Our diff algorithm\n"
@@ -18385,7 +17802,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:368
+#: en/git-config.txt:377
#, no-wrap
msgid ""
"; Proxy settings\n"
@@ -18395,7 +17812,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:375
+#: en/git-config.txt:384
#, no-wrap
msgid ""
"; HTTP\n"
@@ -18407,18 +17824,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:378
+#: en/git-config.txt:387
msgid "you can set the filemode to true with"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:381
+#: en/git-config.txt:390
#, no-wrap
msgid "% git config core.filemode true\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:386
+#: en/git-config.txt:395
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 "
@@ -18426,133 +17843,133 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:389
+#: en/git-config.txt:398
#, no-wrap
msgid "% git config core.gitproxy '\"ssh\" for kernel.org' 'for kernel.org$'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:392
+#: en/git-config.txt:401
msgid "This makes sure that only the key/value pair for kernel.org is replaced."
msgstr ""
#. type: Plain text
-#: en/git-config.txt:394
+#: en/git-config.txt:403
msgid "To delete the entry for renames, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:397
+#: en/git-config.txt:406
#, no-wrap
msgid "% git config --unset diff.renames\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:401
+#: en/git-config.txt:410
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:403
+#: en/git-config.txt:412
msgid "To query the value for a given key, do"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:406
+#: en/git-config.txt:415
#, no-wrap
msgid "% git config --get core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:409 en/git-merge-index.txt:66
+#: en/git-config.txt:418 en/git-merge-index.txt:66
msgid "or"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:412
+#: en/git-config.txt:421
#, no-wrap
msgid "% git config core.filemode\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:415
+#: en/git-config.txt:424
msgid "or, to query a multivar:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:418
+#: en/git-config.txt:427
#, no-wrap
msgid "% git config --get core.gitproxy \"for kernel.org$\"\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:421
+#: en/git-config.txt:430
msgid "If you want to know all the values for a multivar, do:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:424
+#: en/git-config.txt:433
#, no-wrap
msgid "% git config --get-all core.gitproxy\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:428
+#: en/git-config.txt:437
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:431
+#: en/git-config.txt:440
#, no-wrap
msgid "% git config --replace-all core.gitproxy ssh\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:435
+#: en/git-config.txt:444
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:438
+#: en/git-config.txt:447
#, no-wrap
msgid "% git config core.gitproxy ssh '! for '\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:441
+#: en/git-config.txt:450
msgid "To actually match only values with an exclamation mark, you have to"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:444
+#: en/git-config.txt:453
#, no-wrap
msgid "% git config section.key value '[!]'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:447
+#: en/git-config.txt:456
msgid "To add a new proxy, without altering any of the existing ones, use"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:450
+#: en/git-config.txt:459
#, no-wrap
msgid "% git config --add core.gitproxy '\"proxy-command\" for example.com'\n"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:454
+#: en/git-config.txt:463
msgid "An example to use customized color from the configuration in your script:"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:460
+#: en/git-config.txt:469
#, no-wrap
msgid ""
"#!/bin/sh\n"
@@ -18562,14 +17979,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:464
+#: en/git-config.txt:473
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:473
+#: en/git-config.txt:482
#, no-wrap
msgid ""
"% git config --type=bool --get-urlmatch http.sslverify "
@@ -18584,16 +18001,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:289
-#: en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241
-#: en/git-rebase.txt:1261 en/git-replace.txt:139 en/git-rm.txt:182
-#: en/git-svn.txt:1065 en/git-worktree.txt:413
+#: en/git-config.txt:487 en/git-describe.txt:198 en/git-fetch.txt:289 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1261 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:414
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/git-config.txt:483
+#: en/git-config.txt:492
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 "
@@ -18602,7 +18016,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:487
+#: en/git-config.txt:496
#, no-wrap
msgid ""
" [section.subsection]\n"
@@ -18610,12 +18024,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-config.txt:490
+#: en/git-config.txt:499
msgid "and running `git config section.Subsection.key value2` will result in"
msgstr ""
#. type: delimited block -
-#: en/git-config.txt:495
+#: en/git-config.txt:504
#, no-wrap
msgid ""
" [section.subsection]\n"
@@ -19656,11 +19070,15 @@ msgstr ""
msgid "-C <target-dir>"
msgstr ""
+#. type: Plain text
+#: en/git-cvsimport.txt:69
+msgid "The Git repository to import to. If the directory doesn't"
+msgstr ""
+
#. type: Plain text
#: en/git-cvsimport.txt:70
-msgid ""
-"The Git repository to import to. If the directory doesn't exist, it will be "
-"created. Default is the current directory."
+#, no-wrap
+msgid "exist, it will be created. Default is the current directory.\n"
msgstr ""
#. type: Labeled list
@@ -21680,7 +21098,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:82 en/git-ls-files.txt:159
+#: en/git-describe.txt:82 en/git-ls-files.txt:160
#, no-wrap
msgid "--debug"
msgstr ""
@@ -21742,7 +21160,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-describe.txt:118 en/git-diff-tree.txt:115 en/git-name-rev.txt:61
+#: en/git-describe.txt:118 en/git-diff-tree.txt:120 en/git-name-rev.txt:61
#, no-wrap
msgid "--always"
msgstr ""
@@ -21929,19 +21347,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:112
+#: en/git-diff-files.txt:25 en/git-diff.txt:120
#, no-wrap
msgid "-1 --base"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:113
+#: en/git-diff-files.txt:26 en/git-diff.txt:121
#, no-wrap
msgid "-2 --ours"
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:114
+#: en/git-diff-files.txt:27 en/git-diff.txt:122
#, no-wrap
msgid "-3 --theirs"
msgstr ""
@@ -21962,7 +21380,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/git-log.txt:137
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:103 en/git-log.txt:124
#, no-wrap
msgid "--cc"
msgstr ""
@@ -21995,8 +21413,8 @@ msgstr ""
#: en/git-diff-index.txt:13
#, no-wrap
msgid ""
-"'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> "
-"[<path>...]\n"
+"'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] "
+"<tree-ish> [<path>...]\n"
msgstr ""
#. type: Plain text
@@ -22015,11 +21433,24 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:31
-msgid "do not consider the on-disk file at all"
+msgid "Do not consider the on-disk file at all."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff-index.txt:32 en/git-diff-tree.txt:46 en/git-show-branch.txt:83
+#, no-wrap
+msgid "--merge-base"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff-index.txt:36
+msgid ""
+"Instead of comparing <tree-ish> directly, use the merge base between "
+"<tree-ish> and HEAD instead. <tree-ish> must be a commit."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:37
+#: en/git-diff-index.txt:42
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 "
@@ -22027,13 +21458,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:41
+#: en/git-diff-index.txt:46
#, no-wrap
msgid "OPERATING MODES"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:46
+#: en/git-diff-index.txt:51
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 "
@@ -22042,18 +21473,18 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:48
+#: en/git-diff-index.txt:53
#, no-wrap
msgid "CACHED MODE"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:50
+#: en/git-diff-index.txt:55
msgid "If `--cached` is specified, it allows you to ask:"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:53
+#: en/git-diff-index.txt:58
#, no-wrap
msgid ""
"\tshow me the differences between HEAD and the current index\n"
@@ -22061,7 +21492,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:58
+#: en/git-diff-index.txt:63
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 "
@@ -22070,13 +21501,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:60
+#: en/git-diff-index.txt:65
#, no-wrap
msgid "\tgit diff-index --cached HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:65
+#: en/git-diff-index.txt:70
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 "
@@ -22085,7 +21516,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:69
+#: en/git-diff-index.txt:74
#, no-wrap
msgid ""
" torvalds@ppc970:~/git> git diff-index --cached HEAD\n"
@@ -22095,12 +21526,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:71
+#: en/git-diff-index.txt:76
msgid "You can see easily that the above is a rename."
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:75
+#: en/git-diff-index.txt:80
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 "
@@ -22108,7 +21539,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:79
+#: en/git-diff-index.txt:84
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 "
@@ -22116,13 +21547,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-diff-index.txt:81
+#: en/git-diff-index.txt:86
#, no-wrap
msgid "NON-CACHED MODE"
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:86
+#: en/git-diff-index.txt:91
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 "
@@ -22131,7 +21562,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:89
+#: en/git-diff-index.txt:94
#, no-wrap
msgid ""
" show me the differences between HEAD and the currently checked out\n"
@@ -22139,7 +21570,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:93
+#: en/git-diff-index.txt:98
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 "
@@ -22147,7 +21578,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:99
+#: en/git-diff-index.txt:104
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 "
@@ -22157,7 +21588,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:102
+#: en/git-diff-index.txt:107
#, no-wrap
msgid ""
" torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD\n"
@@ -22165,7 +21596,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:107
+#: en/git-diff-index.txt:112
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 "
@@ -22174,7 +21605,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:113
+#: en/git-diff-index.txt:118
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 "
@@ -22183,7 +21614,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-index.txt:119
+#: en/git-diff-index.txt:124
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 "
@@ -22373,9 +21804,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82
-#: en/git-show-branch.txt:111 en/git-update-index.txt:128
-#: en/rev-list-options.txt:263
+#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82 en/git-show-branch.txt:111 en/git-update-index.txt:128 en/rev-list-options.txt:263
#, no-wrap
msgid "-g"
msgstr ""
@@ -22547,7 +21976,8 @@ msgstr ""
#, no-wrap
msgid ""
"'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]\n"
-"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]\n"
+"\t [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] "
+"[--merge-base]\n"
"\t [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
msgstr ""
@@ -22574,7 +22004,7 @@ msgid "The id of a tree object."
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:126 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:134 en/git-submodule.txt:437
#, no-wrap
msgid "<path>..."
msgstr ""
@@ -22604,7 +22034,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:52
+#: en/git-diff-tree.txt:50
+msgid ""
+"Instead of comparing the <tree-ish>s directly, use the merge base between "
+"the two <tree-ish>s as the \"before\" side. There must be two <tree-ish>s "
+"given and they must both be commits."
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff-tree.txt:57
msgid ""
"When `--stdin` is specified, the command does not take <tree-ish> arguments "
"from the command line. Instead, it reads lines containing either two "
@@ -22613,7 +22051,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:57
+#: en/git-diff-tree.txt:62
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 "
@@ -22622,7 +22060,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:62
+#: en/git-diff-tree.txt:67
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 "
@@ -22631,14 +22069,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:65
+#: en/git-diff-tree.txt:70
msgid ""
"The following flags further affect the behavior when comparing commits (but "
"not trees)."
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:71
+#: en/git-diff-tree.txt:76
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 "
@@ -22646,7 +22084,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:77
+#: en/git-diff-tree.txt:82
msgid ""
"By default, 'git diff-tree --stdin' shows differences, either in "
"machine-readable form (without `-p`) or in patch form (with `-p`). This "
@@ -22654,27 +22092,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:81
+#: en/git-diff-tree.txt:86
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
+#: en/git-diff-tree.txt:89
#, no-wrap
msgid "--no-commit-id"
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:87
+#: en/git-diff-tree.txt:92
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
+#: en/git-diff-tree.txt:102
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 "
@@ -22685,7 +22123,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:107
+#: en/git-diff-tree.txt:112
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 "
@@ -22697,13 +22135,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-tree.txt:108 en/git-log.txt:143
+#: en/git-diff-tree.txt:113 en/git-log.txt:130
#, no-wrap
msgid "--combined-all-paths"
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:114 en/git-log.txt:149
+#: en/git-diff-tree.txt:119 en/git-log.txt:136
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 "
@@ -22712,7 +22150,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff-tree.txt:118
+#: en/git-diff-tree.txt:123
msgid ""
"Show the commit itself and the commit log message even if the diff itself is "
"empty."
@@ -22734,8 +22172,9 @@ msgstr ""
#, no-wrap
msgid ""
"'git diff' [<options>] [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+"'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] "
+"[<path>...]\n"
"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
"'git diff' [<options>] <blob> <blob>\n"
"'git diff' [<options>] --no-index [--] <path> <path>\n"
@@ -22784,7 +22223,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff.txt:43
#, no-wrap
-msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
+msgid "'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -22797,14 +22236,22 @@ msgid ""
"staged changes. --staged is a synonym of --cached."
msgstr ""
+#. type: Plain text
+#: en/git-diff.txt:56
+msgid ""
+"If --merge-base is given, instead of using <commit>, use the merge base of "
+"<commit> and HEAD. `git diff --merge-base A` is equivalent to `git diff "
+"$(git merge-base A HEAD)`."
+msgstr ""
+
#. type: Labeled list
-#: en/git-diff.txt:53
+#: en/git-diff.txt:57
#, no-wrap
msgid "'git diff' [<options>] <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:60
+#: en/git-diff.txt:64
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, "
@@ -22812,95 +22259,103 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:61
+#: en/git-diff.txt:65
#, no-wrap
-msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
+msgid "'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:65
+#: en/git-diff.txt:69
msgid "This is to view the changes between two arbitrary <commit>."
msgstr ""
+#. type: Plain text
+#: en/git-diff.txt:73
+msgid ""
+"If --merge-base is given, use the merge base of the two commits for the "
+"\"before\" side. `git diff --merge-base A B` is equivalent to `git diff "
+"$(git merge-base A B) B`."
+msgstr ""
+
#. type: Labeled list
-#: en/git-diff.txt:66
+#: en/git-diff.txt:74
#, no-wrap
msgid "'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:74
+#: en/git-diff.txt:82
msgid ""
"This form is to view the results of a merge commit. The first listed "
"<commit> must be the merge itself; the remaining two or more commits should "
"be its parents. A convenient way to produce the desired set of revisions is "
-"to use the {caret}@ suffix. For instance, if `master` names a merge commit, "
+"to use the `^@` suffix. For instance, if `master` names a merge commit, "
"`git diff master master^@` gives the same combined diff as `git show "
"master`."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:75
+#: en/git-diff.txt:83
#, no-wrap
msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:81
+#: en/git-diff.txt:89
msgid ""
-"This is synonymous to the earlier form (without the \"..\") for viewing the "
+"This is synonymous to the earlier form (without the `..`) for viewing the "
"changes between two arbitrary <commit>. If <commit> on one side is omitted, "
"it will have the same effect as using HEAD instead."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:82
+#: en/git-diff.txt:90
#, no-wrap
msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:97
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."
+"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:94
+#: en/git-diff.txt:102
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>."
+"the <commit> in the above description, except in the `--merge-base` case and "
+"in the last two forms that use `..` notations, can be any <tree>."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:101
+#: en/git-diff.txt:109
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]."
+"(`<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:102
+#: en/git-diff.txt:110
#, no-wrap
msgid "'git diff' [<options>] <blob> <blob>"
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:106
+#: en/git-diff.txt:114
msgid ""
"This form is to view the differences between the raw contents of two blob "
"objects."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:120
+#: en/git-diff.txt:128
msgid ""
"Compare the working tree with the \"base\" version (stage #1), \"our "
"branch\" (stage #2) or \"their branch\" (stage #3). The index contains "
@@ -22909,27 +22364,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:125
+#: en/git-diff.txt:133
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:130
+#: en/git-diff.txt:138
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:137
+#: en/git-diff.txt:145
#, no-wrap
msgid "Various ways to check your working tree"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:143
+#: en/git-diff.txt:151
#, no-wrap
msgid ""
"$ git diff <1>\n"
@@ -22938,32 +22393,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:146
+#: en/git-diff.txt:154
msgid "Changes in the working tree not yet staged for the next commit."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:148
+#: en/git-diff.txt:156
msgid ""
"Changes between the index and your last commit; what you would be committing "
-"if you run \"git commit\" without \"-a\" option."
+"if you run `git commit` without `-a` option."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:150
+#: en/git-diff.txt:158
msgid ""
"Changes in the working tree since your last commit; what you would be "
-"committing if you run \"git commit -a\""
+"committing if you run `git commit -a`"
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:151
+#: en/git-diff.txt:159
#, no-wrap
msgid "Comparing with arbitrary commits"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:157
+#: en/git-diff.txt:165
#, no-wrap
msgid ""
"$ git diff test <1>\n"
@@ -22972,32 +22427,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:161
+#: en/git-diff.txt:169
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:164
+#: en/git-diff.txt:172
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:165
+#: en/git-diff.txt:173
msgid "Compare the version before the last commit and the last commit."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:166
+#: en/git-diff.txt:174
#, no-wrap
msgid "Comparing branches"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:172
+#: en/git-diff.txt:180
#, no-wrap
msgid ""
"$ git diff topic master <1>\n"
@@ -23006,31 +22461,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:175
+#: en/git-diff.txt:183
msgid "Changes between the tips of the topic and the master branches."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:176 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52
-#: en/git-web--browse.txt:52
+#: en/git-diff.txt:184 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
msgid "Same as above."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:178
+#: en/git-diff.txt:186
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:179
+#: en/git-diff.txt:187
#, no-wrap
msgid "Limiting the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:185
+#: en/git-diff.txt:193
#, no-wrap
msgid ""
"$ git diff --diff-filter=MRC <1>\n"
@@ -23039,28 +22493,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:189
+#: en/git-diff.txt:197
msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:199
msgid "Show only names and the nature of change, but not actual diff output."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:192
+#: en/git-diff.txt:200
msgid "Limit diff output to named subtrees."
msgstr ""
#. type: Labeled list
-#: en/git-diff.txt:193
+#: en/git-diff.txt:201
#, no-wrap
msgid "Munging the diff output"
msgstr ""
#. type: delimited block -
-#: en/git-diff.txt:198
+#: en/git-diff.txt:206
#, no-wrap
msgid ""
"$ git diff --find-copies-harder -B -C <1>\n"
@@ -23068,19 +22522,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:202
+#: en/git-diff.txt:210
msgid ""
"Spend extra cycles to find renames, copies and complete rewrites (very "
"expensive)."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:203
+#: en/git-diff.txt:211
msgid "Output diff in reverse."
msgstr ""
#. type: Plain text
-#: en/git-diff.txt:213
+#: en/git-diff.txt:221
msgid ""
"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], "
@@ -23297,7 +22751,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-fast-export.txt:111 en/git-ls-tree.txt:72
+#: en/git-fast-export.txt:111 en/git-ls-tree.txt:73
#, no-wrap
msgid "--full-tree"
msgstr ""
@@ -23825,10 +23279,14 @@ msgstr ""
msgid "--rewrite-submodules-to=<name>:<file>"
msgstr ""
+#. type: Plain text
+#: en/git-fast-import.txt:131
+msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
+msgstr ""
+
#. type: Plain text
#: en/git-fast-import.txt:134
msgid ""
-"Rewrite the object IDs for the submodule specified by <name> from the values "
"used in the from <file> to those used in the to <file>. The from marks "
"should have been created by `git fast-export`, and the to marks should have "
"been created by `git fast-import` when importing that same submodule."
@@ -23886,8 +23344,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85
-#: en/git-pack-objects.txt:89 en/git-repack.txt:90
+#: en/git-fast-import.txt:158 en/git-fetch-pack.txt:85 en/git-pack-objects.txt:89 en/git-repack.txt:90
#, no-wrap
msgid "--depth=<n>"
msgstr ""
@@ -25549,8 +25006,7 @@ msgid "\t'get-mark' SP ':' <idnum> LF\n"
msgstr ""
#. type: Plain text
-#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079
-#: en/git-fast-import.txt:1132
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
msgid ""
"See ``Responses To Commands'' below for details about how to read this "
"output safely."
@@ -26044,12 +25500,17 @@ msgid "M 777 inline bob\n"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1321
+#: en/git-fast-import.txt:1320
#, no-wrap
msgid ""
"Active Branch LRU\n"
"-----------------\n"
-"active_branches = 1 cur, 5 max\n"
+msgstr ""
+
+#. type: delimited block =
+#: en/git-fast-import.txt:1321
+#, no-wrap
+msgid "active_branches = 1 cur, 5 max\n"
msgstr ""
#. type: delimited block =
@@ -26063,12 +25524,18 @@ msgid "0 refs/heads/master"
msgstr ""
#. type: delimited block =
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1329
#, no-wrap
msgid ""
"Inactive Branches\n"
"-----------------\n"
"refs/heads/master:\n"
+msgstr ""
+
+#. type: delimited block =
+#: en/git-fast-import.txt:1335
+#, no-wrap
+msgid ""
"status : active loaded dirty\n"
"tip commit : 0000000000000000000000000000000000000000\n"
"old tree : 0000000000000000000000000000000000000000\n"
@@ -26674,7 +26141,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch-pack.txt:113 en/git-push.txt:370 en/git-send-pack.txt:63
+#: en/git-fetch-pack.txt:113 en/git-push.txt:394 en/git-send-pack.txt:63
msgid "Run verbosely."
msgstr ""
@@ -27033,18 +26500,18 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:215 en/git-push.txt:431
+#: en/git-fetch.txt:215 en/git-push.txt:455
#, no-wrap
msgid "flag"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:217 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:457
msgid "A single character indicating the status of the ref:"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:217 en/git-push.txt:433
+#: en/git-fetch.txt:217 en/git-push.txt:457
#, no-wrap
msgid "(space)"
msgstr ""
@@ -27055,18 +26522,18 @@ msgid "for a successfully fetched fast-forward;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:218 en/git-push.txt:434
+#: en/git-fetch.txt:218 en/git-push.txt:458
#, no-wrap
msgid "`+`"
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:219 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:459
msgid "for a successful forced update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:219 en/git-push.txt:435
+#: en/git-fetch.txt:219 en/git-push.txt:459
#, no-wrap
msgid "`-`"
msgstr ""
@@ -27088,7 +26555,7 @@ msgid "for a successful tag update;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:221 en/git-push.txt:436
+#: en/git-fetch.txt:221 en/git-push.txt:460
#, no-wrap
msgid "`*`"
msgstr ""
@@ -27099,7 +26566,7 @@ msgid "for a successfully fetched new ref;"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:222 en/git-push.txt:437
+#: en/git-fetch.txt:222 en/git-push.txt:461
#, no-wrap
msgid "`!`"
msgstr ""
@@ -27110,7 +26577,7 @@ msgid "for a ref that was rejected or failed to update; and"
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:223 en/git-push.txt:438
+#: en/git-fetch.txt:223 en/git-push.txt:462
#, no-wrap
msgid "`=`"
msgstr ""
@@ -27121,7 +26588,7 @@ msgid "for a ref that was up to date and did not need fetching."
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:225 en/git-push.txt:440
+#: en/git-fetch.txt:225 en/git-push.txt:464
#, no-wrap
msgid "summary"
msgstr ""
@@ -27136,7 +26603,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:231 en/git-push.txt:468
+#: en/git-fetch.txt:231 en/git-push.txt:492
#, no-wrap
msgid "from"
msgstr ""
@@ -27149,7 +26616,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-fetch.txt:236 en/git-push.txt:473 en/git-rebase.txt:1273
+#: en/git-fetch.txt:236 en/git-push.txt:497 en/git-rebase.txt:1273
#, no-wrap
msgid "to"
msgstr ""
@@ -27160,7 +26627,7 @@ msgid "The name of the local ref being updated, minus its `refs/<type>/` prefix.
msgstr ""
#. type: Labeled list
-#: en/git-fetch.txt:240 en/git-push.txt:477
+#: en/git-fetch.txt:240 en/git-push.txt:501
#, no-wrap
msgid "reason"
msgstr ""
@@ -28162,7 +27629,7 @@ 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' "
+"with existing tooling which relies upon git-filter-branch, 'git filter-repo' "
"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 "
@@ -28606,8 +28073,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197
-#: en/pretty-options.txt:2
+#: en/git-for-each-ref.txt:47 en/git-replace.txt:106 en/git-tag.txt:197 en/pretty-options.txt:2
#, no-wrap
msgid "--format=<format>"
msgstr ""
@@ -29135,8 +28601,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317
-#: en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
+#: en/git-for-each-ref.txt:301 en/git-for-each-ref.txt:317 en/git-for-each-ref.txt:331 en/git-bisect-lk2009.txt:933
#, no-wrap
msgid "#!/bin/sh\n"
msgstr ""
@@ -29303,7 +28768,7 @@ msgid "git-format-patch - Prepare patches for e-mail submission"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:34
+#: en/git-format-patch.txt:35
#, no-wrap
msgid ""
"'git format-patch' [-k] [(-o|--output-directory) <dir> | --stdout]\n"
@@ -29325,13 +28790,14 @@ msgid ""
"\t\t [--no-notes | --notes[=<ref>]]\n"
"\t\t [--interdiff=<previous>]\n"
"\t\t [--range-diff=<previous> [--creation-factor=<percent>]]\n"
+"\t\t [--filename-max-length=<n>]\n"
"\t\t [--progress]\n"
"\t\t [<common diff options>]\n"
"\t\t [ <since> | <revision range> ]\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:42
+#: en/git-format-patch.txt:43
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 "
@@ -29339,12 +28805,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:44
+#: en/git-format-patch.txt:45
msgid "There are two ways to specify which commits to operate on."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:48
+#: en/git-format-patch.txt:49
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 "
@@ -29352,14 +28818,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:52
+#: en/git-format-patch.txt:53
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:58
+#: en/git-format-patch.txt:59
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 "
@@ -29369,7 +28835,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:65
+#: en/git-format-patch.txt:66
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 "
@@ -29380,7 +28846,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:73
+#: en/git-format-patch.txt:74
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 "
@@ -29391,7 +28857,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:77
+#: en/git-format-patch.txt:78
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 "
@@ -29399,7 +28865,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:81
+#: en/git-format-patch.txt:82
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`. "
@@ -29407,7 +28873,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:86
+#: en/git-format-patch.txt:87
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 "
@@ -29416,121 +28882,113 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:92
+#: en/git-format-patch.txt:93
#, no-wrap
msgid "-<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:94
+#: en/git-format-patch.txt:95
msgid "Prepare patches from the topmost <n> commits."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:95
+#: en/git-format-patch.txt:96
#, no-wrap
msgid "-o <dir>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:96
+#: en/git-format-patch.txt:97
#, no-wrap
msgid "--output-directory <dir>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:99
+#: en/git-format-patch.txt:100
msgid ""
"Use <dir> to store the resulting files, instead of the current working "
"directory."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:101 en/git-shortlog.txt:30
+#: en/git-format-patch.txt:102 en/git-shortlog.txt:30
#, no-wrap
msgid "--numbered"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:103
+#: en/git-format-patch.txt:104
msgid "Name output in '[PATCH n/m]' format, even with a single patch."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:105
+#: en/git-format-patch.txt:106
#, no-wrap
msgid "--no-numbered"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:107
+#: en/git-format-patch.txt:108
msgid "Name output in '[PATCH]' format."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:108
+#: en/git-format-patch.txt:109
#, no-wrap
msgid "--start-number <n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:110
+#: en/git-format-patch.txt:111
msgid "Start numbering the patches at <n> instead of 1."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:111
+#: en/git-format-patch.txt:112
#, no-wrap
msgid "--numbered-files"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:114
+#: en/git-format-patch.txt:115
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:116
+#: en/git-format-patch.txt:117
#, no-wrap
msgid "--keep-subject"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:119
+#: en/git-format-patch.txt:120
msgid "Do not strip/add '[PATCH]' from the first line of the commit log message."
msgstr ""
-#. type: Plain text
-#: en/git-format-patch.txt:125
-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:126 en/git-pack-objects.txt:59
+#: en/git-format-patch.txt:127 en/git-pack-objects.txt:59
#, no-wrap
msgid "--stdout"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:129
+#: en/git-format-patch.txt:130
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:130
+#: en/git-format-patch.txt:131
#, no-wrap
msgid "--attach[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:134
+#: en/git-format-patch.txt:135
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: "
@@ -29538,24 +28996,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:135
+#: en/git-format-patch.txt:136
#, no-wrap
msgid "--no-attach"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:138
+#: en/git-format-patch.txt:139
msgid "Disable the creation of an attachment, overriding the configuration setting."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:139
+#: en/git-format-patch.txt:140
#, no-wrap
msgid "--inline[=<boundary>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:143
+#: en/git-format-patch.txt:144
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: "
@@ -29563,19 +29021,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:144
+#: en/git-format-patch.txt:145
#, no-wrap
msgid "--thread[=<style>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:145
+#: en/git-format-patch.txt:146
#, no-wrap
msgid "--no-thread"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:150
+#: en/git-format-patch.txt:151
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 "
@@ -29583,7 +29041,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:156
+#: en/git-format-patch.txt:157
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 "
@@ -29593,7 +29051,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:160
+#: en/git-format-patch.txt:161
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 "
@@ -29601,7 +29059,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:164
+#: en/git-format-patch.txt:165
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 "
@@ -29609,13 +29067,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:165
+#: en/git-format-patch.txt:166
#, no-wrap
msgid "--in-reply-to=<message id>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:169
+#: en/git-format-patch.txt:170
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 "
@@ -29623,13 +29081,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:170
+#: en/git-format-patch.txt:171
#, no-wrap
msgid "--ignore-if-in-upstream"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:176
+#: en/git-format-patch.txt:177
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 "
@@ -29638,20 +29096,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:177
+#: en/git-format-patch.txt:178
#, no-wrap
msgid "--cover-from-description=<mode>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:180
+#: en/git-format-patch.txt:181
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:185
+#: en/git-format-patch.txt:186
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 "
@@ -29660,7 +29118,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:189
+#: en/git-format-patch.txt:190
msgid ""
"If `<mode>` is `subject`, the first paragraph of the branch description will "
"populate the cover letter subject. The remainder of the description will "
@@ -29668,7 +29126,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:193
+#: en/git-format-patch.txt:194
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` "
@@ -29676,20 +29134,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:196
+#: en/git-format-patch.txt:197
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:197
+#: en/git-format-patch.txt:198
#, no-wrap
msgid "--subject-prefix=<subject prefix>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:202
+#: en/git-format-patch.txt:203
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 "
@@ -29697,13 +29155,28 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:203
+#: en/git-format-patch.txt:204
+#, no-wrap
+msgid "--filename-max-length=<n>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-format-patch.txt:210
+msgid ""
+"Instead of the standard 64 bytes, chomp the generated output filenames at "
+"around '<n>' bytes (too short a value will be silently raised to a "
+"reasonable length). Defaults to the value of the `format.filenameMaxLength` "
+"configuration variable, or 64 if unconfigured."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-format-patch.txt:211
#, no-wrap
msgid "--rfc"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:207
+#: en/git-format-patch.txt:215
msgid ""
"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For "
"Comments\"; use this when sending an experimental patch for discussion "
@@ -29711,19 +29184,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:208
+#: en/git-format-patch.txt:216
#, no-wrap
msgid "-v <n>"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:209
+#: en/git-format-patch.txt:217
#, no-wrap
msgid "--reroll-count=<n>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:216
+#: en/git-format-patch.txt:224
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, "
@@ -29733,13 +29206,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:217
+#: en/git-format-patch.txt:225
#, no-wrap
msgid "--to=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:222
+#: en/git-format-patch.txt:230
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 "
@@ -29748,13 +29221,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:223
+#: en/git-format-patch.txt:231
#, no-wrap
msgid "--cc=<email>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:228
+#: en/git-format-patch.txt:236
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 "
@@ -29763,19 +29236,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:229
+#: en/git-format-patch.txt:237
#, no-wrap
msgid "--from"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:230
+#: en/git-format-patch.txt:238
#, no-wrap
msgid "--from=<ident>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:236
+#: en/git-format-patch.txt:244
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 "
@@ -29784,7 +29257,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:243
+#: en/git-format-patch.txt:251
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 "
@@ -29794,13 +29267,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:244
+#: en/git-format-patch.txt:252
#, no-wrap
msgid "--add-header=<header>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:251
+#: en/git-format-patch.txt:259
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, "
@@ -29810,13 +29283,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:252
+#: en/git-format-patch.txt:260
#, no-wrap
msgid "--[no-]cover-letter"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:256
+#: en/git-format-patch.txt:264
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 "
@@ -29824,19 +29297,19 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:257
+#: en/git-format-patch.txt:265
#, no-wrap
msgid "--encode-email-headers"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:258
+#: en/git-format-patch.txt:266
#, no-wrap
msgid "--no-encode-email-headers"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:263
+#: en/git-format-patch.txt:271
msgid ""
"Encode email headers that have non-ASCII characters with \"Q-encoding\" "
"(described in RFC 2047), instead of outputting the headers "
@@ -29845,13 +29318,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:264
+#: en/git-format-patch.txt:272
#, no-wrap
msgid "--interdiff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:272
+#: en/git-format-patch.txt:280
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 "
@@ -29863,13 +29336,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:273
+#: en/git-format-patch.txt:281
#, no-wrap
msgid "--range-diff=<previous>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:284
+#: en/git-format-patch.txt:292
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, "
@@ -29883,7 +29356,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:289
+#: en/git-format-patch.txt:297
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 "
@@ -29892,13 +29365,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:290
+#: en/git-format-patch.txt:298
#, no-wrap
msgid "--creation-factor=<percent>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:295
+#: en/git-format-patch.txt:303
msgid ""
"Used with `--range-diff`, tweak the heuristic which matches up commits "
"between the previous and current series of patches by adjusting the "
@@ -29907,26 +29380,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:296 en/pretty-options.txt:60
+#: en/git-format-patch.txt:304 en/pretty-options.txt:60
#, no-wrap
msgid "--notes[=<ref>]"
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:297 en/pretty-options.txt:81
+#: en/git-format-patch.txt:305 en/pretty-options.txt:81
#, no-wrap
msgid "--no-notes"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:300
+#: en/git-format-patch.txt:308
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:308
+#: en/git-format-patch.txt:316
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 "
@@ -29938,18 +29411,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:311
+#: en/git-format-patch.txt:319
msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:312
+#: en/git-format-patch.txt:320
#, no-wrap
msgid "--[no-]signature=<signature>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:317
+#: en/git-format-patch.txt:325
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 "
@@ -29957,24 +29430,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:318
+#: en/git-format-patch.txt:326
#, no-wrap
msgid "--signature-file=<file>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:320
+#: en/git-format-patch.txt:328
msgid "Works just like --signature except the signature is read from a file."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:321
+#: en/git-format-patch.txt:329
#, no-wrap
msgid "--suffix=.<sfx>"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:326
+#: en/git-format-patch.txt:334
msgid ""
"Instead of using `.patch` as the suffix for generated filenames, use "
"specified suffix. A common alternative is `--suffix=.txt`. Leaving this "
@@ -29982,25 +29455,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:329
+#: en/git-format-patch.txt:337
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:333
+#: en/git-format-patch.txt:341
msgid "Do not print the names of the generated files to standard output."
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:334
+#: en/git-format-patch.txt:342
#, no-wrap
msgid "--no-binary"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:339
+#: en/git-format-patch.txt:347
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 "
@@ -30008,26 +29481,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-format-patch.txt:340
+#: en/git-format-patch.txt:348
#, no-wrap
msgid "--zero-commit"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:343
+#: en/git-format-patch.txt:351
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:344
+#: en/git-format-patch.txt:352
#, no-wrap
msgid "--[no-]base[=<commit>]"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:350
+#: en/git-format-patch.txt:358
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 "
@@ -30036,7 +29509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:357
+#: en/git-format-patch.txt:365
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 "
@@ -30045,12 +29518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:360
+#: en/git-format-patch.txt:368
msgid "Show progress reports on stderr as patches are generated."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:368
+#: en/git-format-patch.txt:376
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 "
@@ -30060,7 +29533,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:382
+#: en/git-format-patch.txt:390
#, no-wrap
msgid ""
"[format]\n"
@@ -30078,7 +29551,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:391
+#: en/git-format-patch.txt:399
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 "
@@ -30086,7 +29559,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:401
+#: en/git-format-patch.txt:409
#, no-wrap
msgid ""
"From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001\n"
@@ -30101,7 +29574,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:404
+#: en/git-format-patch.txt:412
#, no-wrap
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -30109,7 +29582,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:407
+#: en/git-format-patch.txt:415
#, no-wrap
msgid ""
"Do the same for ia64 so we can have sleek & trim looking\n"
@@ -30117,7 +29590,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:415
+#: en/git-format-patch.txt:423
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 "
@@ -30127,7 +29600,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:421
+#: en/git-format-patch.txt:429
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' "
@@ -30137,7 +29610,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:425
+#: en/git-format-patch.txt:433
#, no-wrap
msgid ""
"...\n"
@@ -30145,21 +29618,21 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:427
+#: en/git-format-patch.txt:435
#, no-wrap
msgid "Makes sense to me. How about this patch?\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:430
+#: en/git-format-patch.txt:438
#, no-wrap
msgid ""
"-- >8 --\n"
-"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
+"Subject: [IA64] Put ia64 config files on the Uwe Kleine-König diet\n"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:433
+#: en/git-format-patch.txt:441
#, no-wrap
msgid ""
"arch/arm config files were slimmed down using a python script\n"
@@ -30167,7 +29640,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:441
+#: en/git-format-patch.txt:449
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 "
@@ -30178,52 +29651,52 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:443
+#: en/git-format-patch.txt:451
#, no-wrap
msgid "Checking for patch corruption"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:446
+#: en/git-format-patch.txt:454
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:448
+#: en/git-format-patch.txt:456
msgid "Empty context lines that do not have _any_ whitespace."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:451
+#: en/git-format-patch.txt:459
msgid "Non-empty context lines that have one extra whitespace at the beginning."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:453
+#: en/git-format-patch.txt:461
msgid "One way to test if your MUA is set up correctly is:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:457
+#: en/git-format-patch.txt:465
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:460
+#: en/git-format-patch.txt:468
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:462
+#: en/git-format-patch.txt:470
msgid "Apply it:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:467
+#: en/git-format-patch.txt:475
#, no-wrap
msgid ""
"$ git fetch <project> master:test-apply\n"
@@ -30233,12 +29706,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:469
+#: en/git-format-patch.txt:477
msgid "If it does not apply correctly, there can be various reasons."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:474
+#: en/git-format-patch.txt:482
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 "
@@ -30246,7 +29719,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:479
+#: en/git-format-patch.txt:487
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' "
@@ -30254,7 +29727,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:487
+#: en/git-format-patch.txt:495
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 "
@@ -30265,26 +29738,26 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-format-patch.txt:489
+#: en/git-format-patch.txt:497
#, no-wrap
msgid "MUA-SPECIFIC HINTS"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:492
+#: en/git-format-patch.txt:500
msgid ""
"Here are some hints on how to successfully submit patches inline using "
"various mailers."
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:494
+#: en/git-format-patch.txt:502
#, no-wrap
msgid "GMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:500
+#: en/git-format-patch.txt:508
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 "
@@ -30294,27 +29767,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:503
+#: en/git-format-patch.txt:511
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:506
+#: en/git-format-patch.txt:514
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:508
+#: en/git-format-patch.txt:516
#, no-wrap
msgid "Thunderbird"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:512
+#: en/git-format-patch.txt:520
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 "
@@ -30322,7 +29795,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:516
+#: en/git-format-patch.txt:524
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 "
@@ -30330,13 +29803,13 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:518
+#: en/git-format-patch.txt:526
#, no-wrap
msgid "Approach #1 (add-on)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:526
+#: en/git-format-patch.txt:534
msgid ""
"Install the Toggle Word Wrap add-on that is available from "
"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a "
@@ -30347,37 +29820,37 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:528
+#: en/git-format-patch.txt:536
#, no-wrap
msgid "Approach #2 (configuration)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:530
+#: en/git-format-patch.txt:538
msgid "Three steps:"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:534
+#: en/git-format-patch.txt:542
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:536
+#: en/git-format-patch.txt:544
msgid "Configure your general composition window to not wrap."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:539
+#: en/git-format-patch.txt:547
msgid ""
"In Thunderbird 2: Edit..Preferences..Composition, wrap plain text messages "
"at 0"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:545
+#: en/git-format-patch.txt:553
msgid ""
"In Thunderbird 3: Edit..Preferences..Advanced..Config Editor. Search for "
"\"mail.wrap_long_lines\". Toggle it to make sure it is set to "
@@ -30385,7 +29858,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:550
+#: en/git-format-patch.txt:558
msgid ""
"Disable the use of format=flowed: Edit..Preferences..Advanced..Config "
"Editor. Search for \"mailnews.send_plaintext_flowed\". Toggle it to make "
@@ -30393,7 +29866,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:554
+#: en/git-format-patch.txt:562
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 "
@@ -30401,13 +29874,13 @@ msgid ""
msgstr ""
#. type: Title ^
-#: en/git-format-patch.txt:556
+#: en/git-format-patch.txt:564
#, no-wrap
msgid "Approach #3 (external editor)"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:561
+#: en/git-format-patch.txt:569
msgid ""
"The following Thunderbird extensions are needed: AboutConfig from "
"http://aboutconfig.mozdev.org/ and External Editor from "
@@ -30415,12 +29888,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:563
+#: en/git-format-patch.txt:571
msgid "Prepare the patch as a text file using your method of choice."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:568
+#: en/git-format-patch.txt:576
msgid ""
"Before opening a compose window, use Edit->Account Settings to uncheck the "
"\"Compose messages in HTML format\" setting in the \"Composition & "
@@ -30428,14 +29901,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:572
+#: en/git-format-patch.txt:580
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:576
+#: en/git-format-patch.txt:584
#, no-wrap
msgid ""
"\tmailnews.send_plaintext_flowed => false\n"
@@ -30443,26 +29916,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:579
+#: en/git-format-patch.txt:587
msgid "Open a compose window and click the external editor icon."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:582
+#: en/git-format-patch.txt:590
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:585
+#: en/git-format-patch.txt:593
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:590
+#: en/git-format-patch.txt:598
#, no-wrap
msgid ""
"\tmail.html_compose => false\n"
@@ -30471,7 +29944,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:595
+#: en/git-format-patch.txt:603
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 "
@@ -30479,53 +29952,53 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-format-patch.txt:597
+#: en/git-format-patch.txt:605
#, no-wrap
msgid "KMail"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:599
+#: en/git-format-patch.txt:607
msgid "This should help you to submit patches inline using KMail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:601
+#: en/git-format-patch.txt:609
msgid "Prepare the patch as a text file."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:603
+#: en/git-format-patch.txt:611
msgid "Click on New Mail."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:606
+#: en/git-format-patch.txt:614
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:608
+#: en/git-format-patch.txt:616
msgid "Use Message -> Insert file... and insert the patch."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:611
+#: en/git-format-patch.txt:619
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:613
+#: en/git-format-patch.txt:621
#, no-wrap
msgid "BASE TREE INFORMATION"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:622
+#: en/git-format-patch.txt:630
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 "
@@ -30537,7 +30010,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:628
+#: en/git-format-patch.txt:636
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 "
@@ -30546,7 +30019,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:632
+#: en/git-format-patch.txt:640
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, "
@@ -30554,13 +30027,13 @@ msgid ""
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:635
+#: en/git-format-patch.txt:643
#, no-wrap
msgid "---P---X---Y---Z---A---B---C\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:642
+#: en/git-format-patch.txt:650
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), "
@@ -30569,7 +30042,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:648
+#: en/git-format-patch.txt:656
#, no-wrap
msgid ""
"base-commit: P\n"
@@ -30579,12 +30052,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:651
+#: en/git-format-patch.txt:659
msgid "For non-linear topology, such as"
msgstr ""
#. type: delimited block .
-#: en/git-format-patch.txt:656
+#: en/git-format-patch.txt:664
#, no-wrap
msgid ""
"---P---X---A---M---C\n"
@@ -30593,7 +30066,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:661
+#: en/git-format-patch.txt:669
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 "
@@ -30601,7 +30074,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:667
+#: en/git-format-patch.txt:675
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 "
@@ -30611,62 +30084,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:673
+#: en/git-format-patch.txt:681
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:676
+#: en/git-format-patch.txt:684
#, no-wrap
msgid "$ git format-patch -k --stdout R1..R2 | git am -3 -k\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:680
+#: en/git-format-patch.txt:688
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:683
+#: en/git-format-patch.txt:691
#, no-wrap
msgid "$ git format-patch origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:686
+#: en/git-format-patch.txt:694
msgid "For each commit a separate file is created in the current directory."
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:689
+#: en/git-format-patch.txt:697
msgid ""
"Extract all commits that lead to 'origin' since the inception of the "
"project:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:692
+#: en/git-format-patch.txt:700
#, no-wrap
msgid "$ git format-patch --root origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:695
+#: en/git-format-patch.txt:703
msgid "The same as the previous one:"
msgstr ""
#. type: delimited block -
-#: en/git-format-patch.txt:698
+#: en/git-format-patch.txt:706
#, no-wrap
msgid "$ git format-patch -M -B origin\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:705
+#: en/git-format-patch.txt:713
msgid ""
"Additionally, it detects and handles renames and complete rewrites "
"intelligently to produce a renaming patch. A renaming patch reduces the "
@@ -30676,20 +30149,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:708
+#: en/git-format-patch.txt:716
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:711
+#: en/git-format-patch.txt:719
#, no-wrap
msgid "$ git format-patch -3\n"
msgstr ""
#. type: Plain text
-#: en/git-format-patch.txt:716
+#: en/git-format-patch.txt:724
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr ""
@@ -31660,7 +31133,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:153 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:69
#, no-wrap
msgid "--full-name"
msgstr ""
@@ -31895,7 +31368,7 @@ msgstr ""
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 "
+"same way as `git diff` works out patch hunk headers (see 'Defining a custom "
"hunk-header' in linkgit:gitattributes[5])."
msgstr ""
@@ -31963,46 +31436,48 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:270
+#: en/git-grep.txt:272
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."
+"function in which the match was found. The function names are determined in "
+"the same way as `git diff` works out patch hunk headers (see 'Defining a "
+"custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:271
+#: en/git-grep.txt:273
#, no-wrap
msgid "--threads <num>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:274
+#: en/git-grep.txt:276
msgid ""
"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
"for more information."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:275
+#: en/git-grep.txt:277
#, no-wrap
msgid "-f <file>"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:277
+#: en/git-grep.txt:279
msgid "Read patterns from <file>, one per line."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:280
+#: en/git-grep.txt:282
msgid ""
"Passing the pattern via <file> allows for providing a search pattern "
"containing a \\0."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:285
+#: en/git-grep.txt:287
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` "
@@ -32011,7 +31486,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:290
+#: en/git-grep.txt:292
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 "
@@ -32020,7 +31495,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:294
+#: en/git-grep.txt:296
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 "
@@ -32028,7 +31503,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:300
+#: en/git-grep.txt:302
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. "
@@ -32036,31 +31511,31 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:301
+#: en/git-grep.txt:303
#, no-wrap
msgid "--and"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:302
+#: en/git-grep.txt:304
#, no-wrap
msgid "--or"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:303 en/git-rev-parse.txt:135 en/rev-list-options.txt:133
+#: en/git-grep.txt:305 en/git-rev-parse.txt:139 en/rev-list-options.txt:133
#, no-wrap
msgid "--not"
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:304
+#: en/git-grep.txt:306
#, no-wrap
msgid "( ... )"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:309
+#: en/git-grep.txt:311
msgid ""
"Specify how multiple patterns are combined using Boolean expressions. "
"`--or` is the default operator. `--and` has higher precedence than `--or`. "
@@ -32068,115 +31543,115 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:310 en/rev-list-options.txt:65
+#: en/git-grep.txt:312 en/rev-list-options.txt:65
#, no-wrap
msgid "--all-match"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:314
+#: en/git-grep.txt:316
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:319
+#: en/git-grep.txt:321
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:320
+#: en/git-grep.txt:322
#, no-wrap
msgid "<tree>..."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:323
+#: en/git-grep.txt:325
msgid ""
"Instead of searching tracked files in the working tree, search blobs in the "
"given trees."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:327
+#: en/git-grep.txt:329
msgid ""
"Signals the end of options; the rest of the parameters are <pathspec> "
"limiters."
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:331
+#: en/git-grep.txt:333
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:338
+#: en/git-grep.txt:340
#, no-wrap
msgid "`git grep 'time_t' -- '*.[ch]'`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:341
+#: en/git-grep.txt:343
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:342
+#: en/git-grep.txt:344
#, no-wrap
msgid "`git grep -e '#define' --and \\( -e MAX_PATH -e PATH_MAX \\)`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:345
+#: en/git-grep.txt:347
msgid "Looks for a line that has `#define` and either `MAX_PATH` or `PATH_MAX`."
msgstr ""
#. type: Labeled list
-#: en/git-grep.txt:346
+#: en/git-grep.txt:348
#, no-wrap
msgid "`git grep --all-match -e NODE -e Unexpected`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:349
+#: en/git-grep.txt:351
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:350
+#: en/git-grep.txt:352
#, no-wrap
msgid "`git grep solution -- :^Documentation`"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:352
+#: en/git-grep.txt:354
msgid "Looks for `solution`, excluding files in `Documentation`."
msgstr ""
#. type: Title -
-#: en/git-grep.txt:354
+#: en/git-grep.txt:356
#, no-wrap
msgid "NOTES ON THREADS"
msgstr ""
#. type: Plain text
-#: en/git-grep.txt:358
+#: en/git-grep.txt:360
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:363
+#: en/git-grep.txt:365
msgid ""
"When grepping the object store (with `--cached` or giving tree objects), "
"running with multiple threads might perform slower than single threaded if "
@@ -32229,9 +31704,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-stash.txt:48 en/git-submodule.txt:33
-#: en/git-svn.txt:29 en/git-worktree.txt:60
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:60
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -32714,8 +32187,7 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:556
-#: en/git-web--browse.txt:59
+#: en/git-help.txt:91 en/git-interpret-trailers.txt:135 en/git-p4.txt:556 en/git-web--browse.txt:59
#, no-wrap
msgid "CONFIGURATION VARIABLES"
msgstr ""
@@ -35204,8 +34676,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283
-#: en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
+#: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354
#, no-wrap
msgid "message\n"
msgstr ""
@@ -35558,39 +35029,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:80
-#, no-wrap
-msgid "-L <start>,<end>:<file>"
-msgstr ""
-
-#. type: Labeled list
-#: en/git-log.txt:81
-#, no-wrap
-msgid "-L :<funcname>:<file>"
-msgstr ""
-
-#. type: Plain text
-#: en/git-log.txt:92
-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:95 en/git-shortlog.txt:92
+#: en/git-log.txt:82 en/git-shortlog.txt:92
#, no-wrap
msgid "<revision range>"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:103
+#: en/git-log.txt:90
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 "
@@ -35601,13 +35046,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:104 en/git-shortlog.txt:101
+#: en/git-log.txt:91 en/git-shortlog.txt:101
#, no-wrap
msgid "[--] <path>..."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:109
+#: en/git-log.txt:96
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 "
@@ -35615,27 +35060,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:112 en/git-shortlog.txt:107
+#: en/git-log.txt:99 en/git-shortlog.txt:107
msgid ""
"Paths may need to be prefixed with `--` to separate them from options or the "
"revision range, when confusion arises."
msgstr ""
#. type: Title -
-#: en/git-log.txt:118
+#: en/git-log.txt:105
#, no-wrap
msgid "DIFF FORMATTING"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:122
+#: en/git-log.txt:109
msgid ""
"By default, `git log` does not generate any diff output. The options below "
"can be used to show the changes made by each commit."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:129
+#: en/git-log.txt:116
msgid ""
"Note that unless one of `-c`, `--cc`, or `-m` is given, merge commits will "
"never show a diff, even if a diff format like `--patch` is selected, nor "
@@ -35646,7 +35091,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:136
+#: en/git-log.txt:123
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 "
@@ -35655,7 +35100,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:142
+#: en/git-log.txt:129
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 "
@@ -35663,7 +35108,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:157
+#: en/git-log.txt:144
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 "
@@ -35673,121 +35118,121 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:158
+#: en/git-log.txt:145
#, no-wrap
msgid "--diff-merges=off"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:159
+#: en/git-log.txt:146
#, no-wrap
msgid "--no-diff-merges"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:162
+#: en/git-log.txt:149
msgid ""
"Disable output of diffs for merge commits (default). Useful to override "
"`-m`, `-c`, or `--cc`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:170
+#: en/git-log.txt:157
#, no-wrap
msgid "`git log --no-merges`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:173
+#: en/git-log.txt:160
msgid "Show the whole commit history, but skip any merges"
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:174
+#: en/git-log.txt:161
#, no-wrap
msgid "`git log v2.6.12.. include/scsi drivers/scsi`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:178
+#: en/git-log.txt:165
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:179
+#: en/git-log.txt:166
#, no-wrap
msgid "`git log --since=\"2 weeks ago\" -- gitk`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:184
+#: en/git-log.txt:171
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:185
+#: en/git-log.txt:172
#, no-wrap
msgid "`git log --name-status release..test`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:190
+#: en/git-log.txt:177
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:191
+#: en/git-log.txt:178
#, no-wrap
msgid "`git log --follow builtin/rev-list.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:196
+#: en/git-log.txt:183
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:197
+#: en/git-log.txt:184
#, no-wrap
msgid "`git log --branches --not --remotes=origin`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:202
+#: en/git-log.txt:189
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:203
+#: en/git-log.txt:190
#, no-wrap
msgid "`git log master --not --remotes=*/master`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:207
+#: en/git-log.txt:194
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:208
+#: en/git-log.txt:195
#, no-wrap
msgid "`git log -p -m --first-parent`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:215
+#: en/git-log.txt:202
msgid ""
"Shows the history including change diffs, but only from the ``main branch'' "
"perspective, skipping commits that come from merged branches, and showing "
@@ -35797,68 +35242,68 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:216
+#: en/git-log.txt:203
#, no-wrap
msgid "`git log -L '/int main/',/^}/:main.c`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:220
+#: en/git-log.txt:207
msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:221
+#: en/git-log.txt:208
#, no-wrap
msgid "`git log -3`"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:224
+#: en/git-log.txt:211
msgid "Limits the number of commits to show to 3."
msgstr ""
#. type: Plain text
-#: en/git-log.txt:235
+#: en/git-log.txt:222
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:236
+#: en/git-log.txt:223
#, no-wrap
msgid "format.pretty"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:239
+#: en/git-log.txt:226
msgid ""
"Default for the `--format` option. (See 'Pretty Formats' above.) Defaults "
"to `medium`."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:240
+#: en/git-log.txt:227
#, no-wrap
msgid "i18n.logOutputEncoding"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:244
+#: en/git-log.txt:231
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:245
+#: en/git-log.txt:232
#, no-wrap
msgid "log.date"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:249
+#: en/git-log.txt:236
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 "
@@ -35866,20 +35311,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:253
+#: en/git-log.txt:240
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:254
+#: en/git-log.txt:241
#, no-wrap
msgid "log.follow"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:259
+#: en/git-log.txt:246
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`, "
@@ -35888,13 +35333,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:260
+#: en/git-log.txt:247
#, no-wrap
msgid "log.showRoot"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:265
+#: en/git-log.txt:252
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 "
@@ -35902,37 +35347,37 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:266
+#: en/git-log.txt:253
#, no-wrap
msgid "log.showSignature"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:269
+#: en/git-log.txt:256
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:270
+#: en/git-log.txt:257
#, no-wrap
msgid "mailmap.*"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:272
+#: en/git-log.txt:259
msgid "See linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
-#: en/git-log.txt:273 en/git-notes.txt:333
+#: en/git-log.txt:260 en/git-notes.txt:333
#, no-wrap
msgid "notes.displayRef"
msgstr ""
#. type: Plain text
-#: en/git-log.txt:278
+#: en/git-log.txt:265
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 "
@@ -35940,7 +35385,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:282
+#: en/git-log.txt:269
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 "
@@ -35948,7 +35393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-log.txt:286
+#: en/git-log.txt:273
msgid ""
"This setting can be disabled by the `--no-notes` option, overridden by the "
"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
@@ -35982,7 +35427,7 @@ msgid ""
"\t\t[--exclude-standard]\n"
"\t\t[--error-unmatch] [--with-tree=<tree-ish>]\n"
"\t\t[--full-name] [--recurse-submodules]\n"
-"\t\t[--abbrev] [--] [<file>...]\n"
+"\t\t[--abbrev[=<n>]] [--] [<file>...]\n"
msgstr ""
#. type: Plain text
@@ -36312,15 +35757,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:158 en/git-ls-tree.txt:67
+#: en/git-ls-files.txt:159 en/git-ls-tree.txt:68
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 "
+"Instead of showing the full 40-byte hexadecimal object lines, show the "
+"shortest prefix that is at least '<n>' hexdigits long that uniquely refers "
+"the object. Non default number of digits can be specified with "
"--abbrev=<n>."
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:164
+#: en/git-ls-files.txt:165
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 "
@@ -36328,13 +35774,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:165
+#: en/git-ls-files.txt:166
#, no-wrap
msgid "--eol"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:170
+#: en/git-ls-files.txt:171
msgid ""
"Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content "
"identification used by Git when the \"text\" attribute is \"auto\" (or not "
@@ -36343,14 +35789,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:173
+#: en/git-ls-files.txt:174
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
+#: en/git-ls-files.txt:178
msgid ""
"<eolattr> is the attribute that is used when checking out or committing, it "
"is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text "
@@ -36359,7 +35805,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:181
+#: en/git-ls-files.txt:182
msgid ""
"Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree "
"(\"w/<eolinfo>\") are shown for regular files, followed by the "
@@ -36367,33 +35813,33 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-ls-files.txt:185 en/git.txt:374 en/git-update-index.txt:230
+#: en/git-ls-files.txt:186 en/git.txt:374 en/git-update-index.txt:230
#, no-wrap
msgid "<file>"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:188
+#: en/git-ls-files.txt:189
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
+#: en/git-ls-files.txt:194
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
+#: en/git-ls-files.txt:196
#, no-wrap
msgid " [<tag> ]<mode> <object> <stage> <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:198
+#: en/git-ls-files.txt:199
#, no-wrap
msgid ""
"'git ls-files --eol' will show\n"
@@ -36401,14 +35847,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:201
+#: en/git-ls-files.txt:202
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
+#: en/git-ls-files.txt:208
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 "
@@ -36418,13 +35864,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-ls-files.txt:215
+#: en/git-ls-files.txt:216
#, no-wrap
msgid "EXCLUDE PATTERNS"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:221
+#: en/git-ls-files.txt:222
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 "
@@ -36433,19 +35879,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:223
+#: en/git-ls-files.txt:224
msgid "These exclude patterns come from these places, in order:"
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:227
+#: en/git-ls-files.txt:228
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
+#: en/git-ls-files.txt:232
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 "
@@ -36453,7 +35899,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:237
+#: en/git-ls-files.txt:238
msgid ""
"The command-line flag --exclude-per-directory=<name> specifies a name of the "
"file in each directory 'git ls-files' examines, normally `.gitignore`. "
@@ -36462,7 +35908,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:243
+#: en/git-ls-files.txt:244
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. "
@@ -36471,7 +35917,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-ls-files.txt:247
+#: en/git-ls-files.txt:248
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr ""
@@ -36739,27 +36185,27 @@ msgid "List only filenames (instead of the \"long\" output), one per line."
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:71
+#: en/git-ls-tree.txt:72
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
+#: en/git-ls-tree.txt:76
msgid ""
"Do not limit the listing to the current working directory. Implies "
"--full-name."
msgstr ""
#. type: Labeled list
-#: en/git-ls-tree.txt:76
+#: en/git-ls-tree.txt:77
#, no-wrap
msgid "[<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:80
+#: en/git-ls-tree.txt:81
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 "
@@ -36767,37 +36213,37 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-ls-tree.txt:83
+#: en/git-ls-tree.txt:84
#, no-wrap
msgid "Output Format"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:85
+#: en/git-ls-tree.txt:86
#, no-wrap
msgid " <mode> SP <type> SP <object> TAB <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:88
+#: en/git-ls-tree.txt:89
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
+#: en/git-ls-tree.txt:91
msgid "When the `-l` option is used, format changes to"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:92
+#: en/git-ls-tree.txt:93
#, no-wrap
msgid " <mode> SP <type> SP <object> SP <object size> TAB <file>\n"
msgstr ""
#. type: Plain text
-#: en/git-ls-tree.txt:96
+#: en/git-ls-tree.txt:97
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 "
@@ -39238,7 +38684,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:112 en/git-worktree.txt:122
+#: en/git-notes.txt:112 en/git-worktree.txt:123
#, no-wrap
msgid "remove"
msgstr ""
@@ -39252,7 +38698,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:118 en/git-worktree.txt:118
+#: en/git-notes.txt:118 en/git-worktree.txt:119
#, no-wrap
msgid "prune"
msgstr ""
@@ -39382,7 +38828,7 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:119
+#: en/git-notes.txt:183 en/git-rebase.txt:361 en/merge-options.txt:110
#, no-wrap
msgid "-s <strategy>"
msgstr ""
@@ -40636,7 +40082,7 @@ msgstr ""
#: en/git-p4.txt:423
msgid ""
"The `p4-post-changelist` hook is invoked after the submit has successfully "
-"occured in P4. It takes no parameters and is meant primarily for "
+"occurred in P4. It takes no parameters and is meant primarily for "
"notification and cannot affect the outcome of the git p4 submit action."
msgstr ""
@@ -42532,7 +41978,7 @@ msgid "Show progress."
msgstr ""
#. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:229
+#: en/git-prune.txt:48 en/git-worktree.txt:230
#, no-wrap
msgid "--expire <time>"
msgstr ""
@@ -42992,7 +42438,7 @@ msgid ""
"--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"
+"\t [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]\n"
"\t [--no-verify] [<repository> [<refspec>...]]\n"
msgstr ""
@@ -43532,6 +42978,17 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:331
msgid ""
+"Alternatively, specifying `--force-if-includes` as an ancillary option along "
+"with `--force-with-lease[=<refname>]` (i.e., without saying what exact "
+"commit the ref on the remote side must be pointing at, or which refs on the "
+"remote side are being protected) at the time of \"push\" will verify if "
+"updates from the remote-tracking refs that may have been implicitly updated "
+"in the background are integrated locally before allowing a forced update."
+msgstr ""
+
+#. type: Plain text
+#: en/git-push.txt:339
+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 "
@@ -43539,14 +42996,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:334
+#: en/git-push.txt:342
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
+#: en/git-push.txt:351
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 "
@@ -43558,20 +43015,56 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:344
+#: en/git-push.txt:352
+#, no-wrap
+msgid "--[no-]force-if-includes"
+msgstr ""
+
+#. type: Plain text
+#: en/git-push.txt:355
+msgid ""
+"Force an update only if the tip of the remote-tracking ref has been "
+"integrated locally."
+msgstr ""
+
+#. type: Plain text
+#: en/git-push.txt:361
+msgid ""
+"This option enables a check that verifies if the tip of the remote-tracking "
+"ref is reachable from one of the \"reflog\" entries of the local branch "
+"based in it for a rewrite. The check ensures that any updates from the "
+"remote have been incorporated locally by rejecting the forced update if that "
+"is not the case."
+msgstr ""
+
+#. type: Plain text
+#: en/git-push.txt:365
+msgid ""
+"If the option is passed without specifying `--force-with-lease`, or "
+"specified along with `--force-with-lease=<refname>:<expect>`, it is a "
+"\"no-op\"."
+msgstr ""
+
+#. type: Plain text
+#: en/git-push.txt:367
+msgid "Specifying `--no-force-if-includes` disables this behavior."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-push.txt:368
#, no-wrap
msgid "--repo=<repository>"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:347
+#: en/git-push.txt:371
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
+#: en/git-push.txt:378
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 "
@@ -43580,13 +43073,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:355
+#: en/git-push.txt:379
#, no-wrap
msgid "--[no-]thin"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:360
+#: en/git-push.txt:384
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 "
@@ -43594,20 +43087,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:366
+#: en/git-push.txt:390
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
+#: en/git-push.txt:402
#, no-wrap
msgid "--recurse-submodules=check|on-demand|only|no"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:392
+#: en/git-push.txt:416
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 "
@@ -43624,13 +43117,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:393
+#: en/git-push.txt:417
#, no-wrap
msgid "--[no-]verify"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:397
+#: en/git-push.txt:421
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, "
@@ -43638,7 +43131,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:414
+#: en/git-push.txt:438
msgid ""
"The output of \"git push\" depends on the transport method used; this "
"section describes the output when pushing over the Git protocol (either "
@@ -43646,63 +43139,63 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:417
+#: en/git-push.txt:441
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
+#: en/git-push.txt:444
#, no-wrap
msgid " <flag> <summary> <from> -> <to> (<reason>)\n"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:423
+#: en/git-push.txt:447
msgid "If --porcelain is used, then each line of the output is of the form:"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:426
+#: en/git-push.txt:450
#, no-wrap
msgid " <flag> \\t <from>:<to> \\t <summary> (<reason>)\n"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:430
+#: en/git-push.txt:454
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
+#: en/git-push.txt:458
msgid "for a successfully pushed fast-forward;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:436
+#: en/git-push.txt:460
msgid "for a successfully deleted ref;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:437
+#: en/git-push.txt:461
msgid "for a successfully pushed new ref;"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:438
+#: en/git-push.txt:462
msgid "for a ref that was rejected or failed to push; and"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:439
+#: en/git-push.txt:463
msgid "for a ref that was up to date and did not need pushing."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:445
+#: en/git-push.txt:469
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 "
@@ -43711,31 +43204,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:447
+#: en/git-push.txt:471
msgid "For a failed update, more details are given:"
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:449
+#: en/git-push.txt:473
#, no-wrap
msgid "rejected"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:452
+#: en/git-push.txt:476
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
+#: en/git-push.txt:477
#, no-wrap
msgid "remote rejected"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:461
+#: en/git-push.txt:485
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 "
@@ -43746,13 +43239,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:462
+#: en/git-push.txt:486
#, no-wrap
msgid "remote failure"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:466
+#: en/git-push.txt:490
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 "
@@ -43760,19 +43253,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:472
+#: en/git-push.txt:496
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
+#: en/git-push.txt:500
msgid "The name of the remote ref being updated, minus its `refs/<type>/` prefix."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:481
+#: en/git-push.txt:505
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 "
@@ -43780,13 +43273,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-push.txt:483
+#: en/git-push.txt:507
#, no-wrap
msgid "NOTE ABOUT FAST-FORWARDS"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:488
+#: en/git-push.txt:512
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 "
@@ -43794,7 +43287,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:492
+#: en/git-push.txt:516
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 "
@@ -43802,7 +43295,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:497
+#: en/git-push.txt:521
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 "
@@ -43811,7 +43304,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:503
+#: en/git-push.txt:527
#, no-wrap
msgid ""
" B\n"
@@ -43820,7 +43313,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:509
+#: en/git-push.txt:533
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 "
@@ -43828,14 +43321,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:512
+#: en/git-push.txt:536
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
+#: en/git-push.txt:541
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, "
@@ -43844,14 +43337,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:520
+#: en/git-push.txt:544
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
+#: en/git-push.txt:549
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 "
@@ -43860,7 +43353,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:529
+#: en/git-push.txt:553
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 "
@@ -43868,7 +43361,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:535
+#: en/git-push.txt:559
#, no-wrap
msgid ""
" B---C\n"
@@ -43877,14 +43370,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:540
+#: en/git-push.txt:564
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
+#: en/git-push.txt:569
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 "
@@ -43892,7 +43385,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:551
+#: en/git-push.txt:575
#, no-wrap
msgid ""
" B D\n"
@@ -43901,14 +43394,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:556
+#: en/git-push.txt:580
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
+#: en/git-push.txt:591
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 "
@@ -43923,26 +43416,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:572
+#: en/git-push.txt:596
#, no-wrap
msgid "`git push`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:576
+#: en/git-push.txt:600
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
+#: en/git-push.txt:601
#, no-wrap
msgid "`git push origin`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:582
+#: en/git-push.txt:606
msgid ""
"Without additional configuration, pushes the current branch to the "
"configured upstream (`remote.origin.merge` configuration variable) if it has "
@@ -43951,7 +43444,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:586
+#: en/git-push.txt:610
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` "
@@ -43959,7 +43452,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:591
+#: en/git-push.txt:615
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 "
@@ -43967,13 +43460,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:592
+#: en/git-push.txt:616
#, no-wrap
msgid "`git push origin :`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:596
+#: en/git-push.txt:620
msgid ""
"Push \"matching\" branches to `origin`. See <refspec> in the "
"<<OPTIONS,OPTIONS>> section above for a description of \"matching\" "
@@ -43981,13 +43474,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:597
+#: en/git-push.txt:621
#, no-wrap
msgid "`git push origin master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:603
+#: en/git-push.txt:627
msgid ""
"Find a ref that matches `master` in the source repository (most likely, it "
"would find `refs/heads/master`), and update the same ref "
@@ -43996,24 +43489,24 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:604
+#: en/git-push.txt:628
#, no-wrap
msgid "`git push origin HEAD`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:607
+#: en/git-push.txt:631
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
+#: en/git-push.txt:632
#, no-wrap
msgid "`git push mothership master:satellite/master dev:satellite/dev`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:613
+#: en/git-push.txt:637
msgid ""
"Use the source ref that matches `master` (e.g. `refs/heads/master`) to "
"update the ref that matches `satellite/master` (most probably "
@@ -44022,14 +43515,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:616
+#: en/git-push.txt:640
msgid ""
"See the section describing `<refspec>...` above for a discussion of the "
"matching semantics."
msgstr ""
#. type: Plain text
-#: en/git-push.txt:623
+#: en/git-push.txt:647
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 "
@@ -44040,7 +43533,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:628
+#: en/git-push.txt:652
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 "
@@ -44048,13 +43541,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:629
+#: en/git-push.txt:653
#, no-wrap
msgid "`git push origin HEAD:master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:633
+#: en/git-push.txt:657
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 "
@@ -44062,13 +43555,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:634
+#: en/git-push.txt:658
#, no-wrap
msgid "`git push origin master:refs/heads/experimental`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:640
+#: en/git-push.txt:664
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 "
@@ -44077,26 +43570,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-push.txt:641
+#: en/git-push.txt:665
#, no-wrap
msgid "`git push origin :experimental`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:644
+#: en/git-push.txt:668
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
+#: en/git-push.txt:669
#, no-wrap
msgid "`git push origin +dev:master`"
msgstr ""
#. type: Plain text
-#: en/git-push.txt:650
+#: en/git-push.txt:674
msgid ""
"Update the origin repository's master branch with the dev branch, allowing "
"non-fast-forward updates. *This can leave unreferenced commits dangling in "
@@ -44105,7 +43598,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:655
+#: en/git-push.txt:679
#, no-wrap
msgid ""
"\t o---o---o---A---B origin/master\n"
@@ -44114,12 +43607,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:658
+#: en/git-push.txt:682
msgid "The above command would change the origin repository to"
msgstr ""
#. type: delimited block -
-#: en/git-push.txt:663
+#: en/git-push.txt:687
#, no-wrap
msgid ""
"\t\t A---B (unnamed branch)\n"
@@ -44128,7 +43621,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-push.txt:668
+#: en/git-push.txt:692
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 "
@@ -45401,13 +44894,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288
-#: en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335
-#: en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382
-#: en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484
-#: en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516
-#: en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593
-#: en/git-rebase.txt:612
+#: en/git-rebase.txt:238 en/git-rebase.txt:269 en/git-rebase.txt:288 en/git-rebase.txt:309 en/git-rebase.txt:327 en/git-rebase.txt:335 en/git-rebase.txt:360 en/git-rebase.txt:373 en/git-rebase.txt:382 en/git-rebase.txt:427 en/git-rebase.txt:461 en/git-rebase.txt:484 en/git-rebase.txt:497 en/git-rebase.txt:504 en/git-rebase.txt:516 en/git-rebase.txt:556 en/git-rebase.txt:581 en/git-rebase.txt:593 en/git-rebase.txt:612
msgid "See also INCOMPATIBLE OPTIONS below."
msgstr ""
@@ -45673,8 +45160,7 @@ msgid "This option bypasses the pre-rebase hook. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59
-#: en/git-tag.txt:88
+#: en/git-rebase.txt:416 en/git-rev-parse.txt:98 en/git-show-ref.txt:59 en/git-tag.txt:88
#, no-wrap
msgid "--verify"
msgstr ""
@@ -45820,7 +45306,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:502
msgid ""
-"Add a Signed-off-by: trailer to all the rebased commits. Note that if "
+"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 ""
@@ -46018,13 +45504,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:613 en/merge-options.txt:163
+#: en/git-rebase.txt:613 en/merge-options.txt:154
#, no-wrap
msgid "--autostash"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:614 en/merge-options.txt:164
+#: en/git-rebase.txt:614 en/merge-options.txt:155
#, no-wrap
msgid "--no-autostash"
msgstr ""
@@ -46169,231 +45655,282 @@ msgstr ""
msgid "--fork-point and --root"
msgstr ""
-#. type: Title -
+#. type: Plain text
#: en/git-rebase.txt:666
-#, no-wrap
msgid "BEHAVIORAL DIFFERENCES"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:675
+#, no-wrap
msgid ""
-"git rebase has two primary backends: apply and merge. (The apply backend "
-"used to be known as the 'am' backend, but the name led to confusion as it "
-"looks like a verb instead of a noun. Also, the merge backend used to be "
-"known as the interactive backend, but it is now used for non-interactive "
-"cases as well. Both were renamed based on lower-level functionality that "
-"underpinned each.) There are some subtle differences in how these two "
-"backends behave:"
+"git rebase has two primary backends: apply and merge. (The apply\n"
+"backend used to be known as the 'am' backend, but the name led to\n"
+"confusion as it looks like a verb instead of a noun. Also, the merge\n"
+"backend used to be known as the interactive backend, but it is now\n"
+"used for non-interactive cases as well. Both were renamed based on\n"
+"lower-level functionality that underpinned each.) There are some\n"
+"subtle differences in how these two backends behave:\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:677
+#. type: delimited block -
+#: en/git-rebase.txt:678
#, no-wrap
-msgid "Empty commits"
+msgid ""
+"Empty commits\n"
+"~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:683
+#, no-wrap
msgid ""
-"The apply backend unfortunately drops intentionally empty commits, i.e. "
-"commits that started empty, though these are rare in practice. It also "
-"drops commits that become empty and has no option for controlling this "
-"behavior."
+"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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:687
+#, no-wrap
msgid ""
-"The merge backend keeps intentionally empty commits by default (though with "
-"-i they are marked as empty in the todo list editor, or they can be dropped "
-"automatically with --no-keep-empty)."
+"The merge backend keeps intentionally empty commits by default (though\n"
+"with -i they are marked as empty in the todo list editor, or they can\n"
+"be dropped automatically with --no-keep-empty).\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:693
+#, no-wrap
msgid ""
-"Similar to the apply backend, by default the merge backend drops commits "
-"that become empty unless -i/--interactive is specified (in which case it "
-"stops and asks the user what to do). The merge backend also has an "
-"--empty={drop,keep,ask} option for changing the behavior of handling commits "
-"that become empty."
+"Similar to the apply backend, by default the merge backend drops\n"
+"commits that become empty unless -i/--interactive is specified (in\n"
+"which case it stops and asks the user what to do). The merge backend\n"
+"also has an --empty={drop,keep,ask} option for changing the behavior\n"
+"of handling commits that become empty.\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:695
+#. type: delimited block -
+#: en/git-rebase.txt:696
#, no-wrap
-msgid "Directory rename detection"
+msgid ""
+"Directory rename detection\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:705
+#, no-wrap
msgid ""
-"Due to the lack of accurate tree information (arising from constructing fake "
-"ancestors with the limited information available in patches), directory "
-"rename detection is disabled in the apply backend. Disabled directory "
-"rename detection means that if one side of history renames a directory and "
-"the other adds new files to the old directory, then the new files will be "
-"left behind in the old directory without any warning at the time of rebasing "
-"that you may want to move these files into the new directory."
+"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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:708
+#, no-wrap
msgid ""
-"Directory rename detection works with the merge backend to provide you "
-"warnings in such cases."
+"Directory rename detection works with the merge backend to provide you\n"
+"warnings in such cases.\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:710
+#. type: delimited block -
+#: en/git-rebase.txt:711
#, no-wrap
-msgid "Context"
+msgid ""
+"Context\n"
+"~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:726
+#, no-wrap
msgid ""
-"The apply backend works by creating a sequence of patches (by calling "
-"`format-patch` internally), and then applying the patches in sequence "
-"(calling `am` internally). Patches are composed of multiple hunks, each "
-"with line numbers, a context region, and the actual changes. The line "
-"numbers have to be taken with some fuzz, since the other side will likely "
-"have inserted or deleted lines earlier in the file. The context region is "
-"meant to help find how to adjust the line numbers in order to apply the "
-"changes to the right lines. However, if multiple areas of the code have the "
-"same surrounding lines of context, the wrong one can be picked. There are "
-"real-world cases where this has caused commits to be reapplied incorrectly "
-"with no conflicts reported. Setting diff.context to a larger value may "
-"prevent such types of problems, but increases the chance of spurious "
-"conflicts (since it will require more lines of matching context to apply)."
+"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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:729
+#, no-wrap
msgid ""
-"The merge backend works with a full copy of each relevant file, insulating "
-"it from these types of problems."
+"The merge backend works with a full copy of each relevant file,\n"
+"insulating it from these types of problems.\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:731
+#. type: delimited block -
+#: en/git-rebase.txt:732
#, no-wrap
-msgid "Labelling of conflicts markers"
+msgid ""
+"Labelling of conflicts markers\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:743
+#, no-wrap
msgid ""
-"When there are content conflicts, the merge machinery tries to annotate each "
-"side's conflict markers with the commits where the content came from. Since "
-"the apply backend drops the original information about the rebased commits "
-"and their parents (and instead generates new fake commits based off limited "
-"information in the generated patches), those commits cannot be identified; "
-"instead it has to fall back to a commit summary. Also, when "
-"merge.conflictStyle is set to diff3, the apply backend will use "
-"\"constructed merge base\" to label the content from the merge base, and "
-"thus provide no information about the merge base commit whatsoever."
+"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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:746
+#, no-wrap
msgid ""
-"The merge backend works with the full commits on both sides of history and "
-"thus has no such limitations."
+"The merge backend works with the full commits on both sides of history\n"
+"and thus has no such limitations.\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:748
+#. type: delimited block -
+#: en/git-rebase.txt:749
#, no-wrap
-msgid "Hooks"
+msgid ""
+"Hooks\n"
+"~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:762
+#, no-wrap
msgid ""
-"The apply backend has not traditionally called the post-commit hook, while "
-"the merge backend has. Both have called the post-checkout hook, though the "
-"merge backend has squelched its output. Further, both backends only call "
-"the post-checkout hook with the starting point commit of the rebase, not the "
-"intermediate commits nor the final commit. In each case, the calling of "
-"these hooks was by accident of implementation rather than by design (both "
-"backends were originally implemented as shell scripts and happened to invoke "
-"other commands like 'git checkout' or 'git commit' that would call the "
-"hooks). Both backends should have the same behavior, though it is not "
-"entirely clear which, if any, is correct. We will likely make rebase stop "
-"calling either of these hooks in the future."
+"The apply backend has not traditionally called the post-commit hook,\n"
+"while the merge backend has. Both have called the post-checkout hook,\n"
+"though the merge backend has squelched its output. Further, both\n"
+"backends only call the post-checkout hook with the starting point\n"
+"commit of the rebase, not the intermediate commits nor the final\n"
+"commit. In each case, the calling of these hooks was by accident of\n"
+"implementation rather than by design (both backends were originally\n"
+"implemented as shell scripts and happened to invoke other commands\n"
+"like 'git checkout' or 'git commit' that would call the hooks). Both\n"
+"backends should have the same behavior, though it is not entirely\n"
+"clear which, if any, is correct. We will likely make rebase stop\n"
+"calling either of these hooks in the future.\n"
msgstr ""
-#. type: Title ~
-#: en/git-rebase.txt:764
+#. type: delimited block -
+#: en/git-rebase.txt:765
#, no-wrap
-msgid "Interruptability"
+msgid ""
+"Interruptability\n"
+"~~~~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:773
+#, no-wrap
msgid ""
-"The apply backend has safety problems with an ill-timed interrupt; if the "
-"user presses Ctrl-C at the wrong time to try to abort the rebase, the rebase "
-"can enter a state where it cannot be aborted with a subsequent `git rebase "
-"--abort`. The merge backend does not appear to suffer from the same "
-"shortcoming. (See "
-"https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.)"
+"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: Title ~
-#: en/git-rebase.txt:775
+#. type: delimited block -
+#: en/git-rebase.txt:776
#, no-wrap
-msgid "Commit Rewording"
+msgid ""
+"Commit Rewording\n"
+"~~~~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:783
+#, no-wrap
msgid ""
-"When a conflict occurs while rebasing, rebase stops and asks the user to "
-"resolve. Since the user may need to make notable changes while resolving "
-"conflicts, after conflicts are resolved and the user has run `git rebase "
-"--continue`, the rebase should open an editor and ask the user to update the "
-"commit message. The merge backend does this, while the apply backend "
-"blindly applies the original commit message."
+"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: Title ~
-#: en/git-rebase.txt:785
+#. type: delimited block -
+#: en/git-rebase.txt:786
#, no-wrap
-msgid "Miscellaneous differences"
+msgid ""
+"Miscellaneous differences\n"
+"~~~~~~~~~~~~~~~~~~~~~~~~~\n"
msgstr ""
-#. type: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:790
+#, no-wrap
msgid ""
-"There are a few more behavioral differences that most folks would probably "
-"consider inconsequential but which are mentioned for completeness:"
+"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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:794
+#, no-wrap
msgid ""
-"Reflog: The two backends will use different wording when describing the "
-"changes made in the reflog, though both will make use of the word "
-"\"rebase\"."
+"* 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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:800
+#, no-wrap
msgid ""
-"Progress, informational, and error messages: The two backends provide "
-"slightly different progress and informational messages. Also, the apply "
-"backend writes error messages (such as \"Your files would be "
-"overwritten...\") to stdout, while the merge backend writes them to stderr."
+"* 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: Plain text
+#. type: delimited block -
#: en/git-rebase.txt:803
+#, no-wrap
msgid ""
-"State directories: The two backends keep their state in different "
-"directories under .git/"
+"* State directories: The two backends keep their state in different\n"
+" directories under .git/\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:805
+#, no-wrap
+msgid "include::merge-strategies.txt[]\n"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-rebase.txt:807
+#, no-wrap
+msgid "NOTES\n"
msgstr ""
#. type: Plain text
@@ -46466,7 +46003,7 @@ msgid "finish something worthy of a commit"
msgstr ""
#. type: Labeled list
-#: en/git-rebase.txt:840 en/git-update-ref.txt:135
+#: en/git-rebase.txt:840 en/git-update-ref.txt:136
#, no-wrap
msgid "commit"
msgstr ""
@@ -48718,11 +48255,29 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:210
+msgid "On success, the exit status is `0`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-remote.txt:214
+msgid ""
+"When subcommands such as 'add', 'rename', and 'remove' can't find the remote "
+"in question, the exit status is `2`. When the remote already exists, the "
+"exit status is `3`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-remote.txt:216
+msgid "On any other error, the exit status may be any other non-zero value."
+msgstr ""
+
+#. type: Plain text
+#: en/git-remote.txt:221
msgid "Add a new remote, fetch, and check out a branch from it"
msgstr ""
#. type: delimited block -
-#: en/git-remote.txt:235
+#: en/git-remote.txt:246
#, no-wrap
msgid ""
"$ git remote\n"
@@ -48751,12 +48306,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-remote.txt:238
+#: en/git-remote.txt:249
msgid "Imitate 'git clone' but track only selected branches"
msgstr ""
#. type: delimited block -
-#: en/git-remote.txt:245
+#: en/git-remote.txt:256
#, no-wrap
msgid ""
"$ mkdir project.git\n"
@@ -48767,7 +48322,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-remote.txt:253
+#: en/git-remote.txt:264
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgstr ""
@@ -50751,7 +50306,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:50
+#: en/git-restore.txt:54
msgid ""
"Interactively select hunks in the difference between the restore source and "
"the restore location. See the ``Interactive Mode'' section of "
@@ -50759,26 +50314,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:53
+#: en/git-restore.txt:57
msgid ""
"Note that `--patch` can accept no pathspec and will prompt to restore all "
"modified paths."
msgstr ""
#. type: Labeled list
-#: en/git-restore.txt:56
+#: en/git-restore.txt:60
#, no-wrap
msgid "-S"
msgstr ""
#. type: Labeled list
-#: en/git-restore.txt:57
+#: en/git-restore.txt:61
#, no-wrap
msgid "--staged"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:61
+#: en/git-restore.txt:65
msgid ""
"Specify the restore location. If neither option is specified, by default the "
"working tree is restored. Specifying `--staged` will only restore the "
@@ -50786,19 +50341,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:65
+#: en/git-restore.txt:69
msgid "Quiet, suppress feedback messages. Implies `--no-progress`."
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:77
+#: en/git-restore.txt:81
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:81
+#: en/git-restore.txt:85
msgid ""
"Note that during `git rebase` and `git pull --rebase`, 'ours' and 'theirs' "
"may appear swapped. See the explanation of the same options in "
@@ -50806,20 +50361,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:86
+#: en/git-restore.txt:90
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:94
+#: en/git-restore.txt:98
#, no-wrap
msgid "--ignore-unmerged"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:99
+#: en/git-restore.txt:103
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`, "
@@ -50828,7 +50383,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:106
+#: en/git-restore.txt:110
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 "
@@ -50837,7 +50392,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:117
+#: en/git-restore.txt:121
msgid ""
"If `<pathspec>` names an active submodule and the restore location includes "
"the working tree, the submodule will only be updated if this option is "
@@ -50849,7 +50404,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:124
+#: en/git-restore.txt:128
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 "
@@ -50858,7 +50413,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:152
+#: en/git-restore.txt:156
msgid ""
"The following sequence switches to the `master` branch, reverts the "
"`Makefile` to two revisions back, deletes hello.c by mistake, and gets it "
@@ -50866,7 +50421,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:158
+#: en/git-restore.txt:162
#, no-wrap
msgid ""
"$ git switch master\n"
@@ -50876,25 +50431,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:162
+#: en/git-restore.txt:166
msgid "restore hello.c from the index"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:165
+#: en/git-restore.txt:169
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:168
+#: en/git-restore.txt:172
#, no-wrap
msgid "$ git restore '*.c'\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:174
+#: en/git-restore.txt:178
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 "
@@ -50903,68 +50458,68 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:176
+#: en/git-restore.txt:180
msgid "To restore all files in the current directory"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:179
+#: en/git-restore.txt:183
#, no-wrap
msgid "$ git restore .\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:183
+#: en/git-restore.txt:187
msgid ""
"or to restore all working tree files with 'top' pathspec magic (see "
"linkgit:gitglossary[7])"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:186
+#: en/git-restore.txt:190
#, no-wrap
msgid "$ git restore :/\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:190
+#: en/git-restore.txt:194
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:193
+#: en/git-restore.txt:197
#, no-wrap
msgid "$ git restore --staged hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:197
+#: en/git-restore.txt:201
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:200
+#: en/git-restore.txt:204
#, no-wrap
msgid "$ git restore --source=HEAD --staged --worktree hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:203
+#: en/git-restore.txt:207
msgid "or the short form which is more practical but less readable:"
msgstr ""
#. type: delimited block -
-#: en/git-restore.txt:206
+#: en/git-restore.txt:210
#, no-wrap
msgid "$ git restore -s@ -SW hello.c\n"
msgstr ""
#. type: Plain text
-#: en/git-restore.txt:212
+#: en/git-restore.txt:216
msgid "linkgit:git-checkout[1], linkgit:git-reset[1]"
msgstr ""
@@ -51358,7 +50913,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:119
+#: en/git-rev-parse.txt:116
+msgid ""
+"Note that if you are verifying a name from an untrusted source, it is wise "
+"to use `--end-of-options` so that the name argument is not mistaken for "
+"another option."
+msgstr ""
+
+#. type: Plain text
+#: en/git-rev-parse.txt:123
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 "
@@ -51366,13 +50929,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:120
+#: en/git-rev-parse.txt:124
#, no-wrap
msgid "--sq"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:128
+#: en/git-rev-parse.txt:132
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. "
@@ -51382,13 +50945,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:129
+#: en/git-rev-parse.txt:133
#, no-wrap
msgid "--short[=length]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:134
+#: en/git-rev-parse.txt:138
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 "
@@ -51397,33 +50960,33 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:139
+#: en/git-rev-parse.txt:143
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
+#: en/git-rev-parse.txt:144
#, no-wrap
msgid "--abbrev-ref[=(strict|loose)]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:144
+#: en/git-rev-parse.txt:148
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
+#: en/git-rev-parse.txt:149
#, no-wrap
msgid "--symbolic"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:149
+#: en/git-rev-parse.txt:153
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 "
@@ -51431,13 +50994,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:150
+#: en/git-rev-parse.txt:154
#, no-wrap
msgid "--symbolic-full-name"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:157
+#: en/git-rev-parse.txt:161
msgid ""
"This is similar to --symbolic, but it omits input that are not refs "
"(i.e. branch or tag names; or more explicitly disambiguating "
@@ -51447,43 +51010,43 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:159
+#: en/git-rev-parse.txt:163
#, no-wrap
msgid "Options for Objects"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:163
+#: en/git-rev-parse.txt:167
msgid "Show all refs found in `refs/`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:164
+#: en/git-rev-parse.txt:168
#, no-wrap
msgid "--branches[=pattern]"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:165
+#: en/git-rev-parse.txt:169
#, no-wrap
msgid "--tags[=pattern]"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:166
+#: en/git-rev-parse.txt:170
#, no-wrap
msgid "--remotes[=pattern]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:170
+#: en/git-rev-parse.txt:174
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
+#: en/git-rev-parse.txt:178
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 "
@@ -51491,13 +51054,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:175
+#: en/git-rev-parse.txt:179
#, no-wrap
msgid "--glob=pattern"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:181
+#: en/git-rev-parse.txt:185
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 "
@@ -51506,13 +51069,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:182 en/rev-list-options.txt:165
+#: en/git-rev-parse.txt:186 en/rev-list-options.txt:165
#, no-wrap
msgid "--exclude=<glob-pattern>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:189 en/rev-list-options.txt:173
+#: en/git-rev-parse.txt:193 en/rev-list-options.txt:173
msgid ""
"Do not include refs matching '<glob-pattern>' that the next `--all`, "
"`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise "
@@ -51522,7 +51085,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:195 en/rev-list-options.txt:179
+#: en/git-rev-parse.txt:199 en/rev-list-options.txt:179
msgid ""
"The patterns given should not begin with `refs/heads`, `refs/tags`, or "
"`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
@@ -51532,13 +51095,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:196
+#: en/git-rev-parse.txt:200
#, no-wrap
msgid "--disambiguate=<prefix>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:201
+#: en/git-rev-parse.txt:205
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 "
@@ -51546,19 +51109,19 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:203
+#: en/git-rev-parse.txt:207
#, no-wrap
msgid "Options for Files"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:205
+#: en/git-rev-parse.txt:209
#, no-wrap
msgid "--local-env-vars"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:210
+#: en/git-rev-parse.txt:214
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 "
@@ -51566,13 +51129,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:211
+#: en/git-rev-parse.txt:215
#, no-wrap
msgid "--git-dir"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:215
+#: en/git-rev-parse.txt:219
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 "
@@ -51580,7 +51143,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:219
+#: en/git-rev-parse.txt:223
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 "
@@ -51588,83 +51151,83 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:220
+#: en/git-rev-parse.txt:224
#, no-wrap
msgid "--absolute-git-dir"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:223
+#: en/git-rev-parse.txt:227
msgid "Like `--git-dir`, but its output is always the canonicalized absolute path."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:224
+#: en/git-rev-parse.txt:228
#, no-wrap
msgid "--git-common-dir"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:226
+#: en/git-rev-parse.txt:230
msgid "Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:227
+#: en/git-rev-parse.txt:231
#, no-wrap
msgid "--is-inside-git-dir"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:230
+#: en/git-rev-parse.txt:234
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
+#: en/git-rev-parse.txt:235
#, no-wrap
msgid "--is-inside-work-tree"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:234
+#: en/git-rev-parse.txt:238
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
+#: en/git-rev-parse.txt:239
#, no-wrap
msgid "--is-bare-repository"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:237
+#: en/git-rev-parse.txt:241
msgid "When the repository is bare print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:238
+#: en/git-rev-parse.txt:242
#, no-wrap
msgid "--is-shallow-repository"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:240
+#: en/git-rev-parse.txt:244
msgid "When the repository is shallow print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:241
+#: en/git-rev-parse.txt:245
#, no-wrap
msgid "--resolve-git-dir <path>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:246
+#: en/git-rev-parse.txt:250
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 "
@@ -51672,13 +51235,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:247
+#: en/git-rev-parse.txt:251
#, no-wrap
msgid "--git-path <path>"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:253
+#: en/git-rev-parse.txt:257
msgid ""
"Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such "
"as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if "
@@ -51687,13 +51250,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:254
+#: en/git-rev-parse.txt:258
#, no-wrap
msgid "--show-cdup"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:258
+#: en/git-rev-parse.txt:262
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 "
@@ -51701,39 +51264,39 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:259
+#: en/git-rev-parse.txt:263
#, no-wrap
msgid "--show-prefix"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:263
+#: en/git-rev-parse.txt:267
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
+#: en/git-rev-parse.txt:268
#, no-wrap
msgid "--show-toplevel"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:267
+#: en/git-rev-parse.txt:271
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
+#: en/git-rev-parse.txt:272
#, no-wrap
msgid "--show-superproject-working-tree"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:273
+#: en/git-rev-parse.txt:277
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 "
@@ -51741,26 +51304,26 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:274
+#: en/git-rev-parse.txt:278
#, no-wrap
msgid "--shared-index-path"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:277
+#: en/git-rev-parse.txt:281
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
+#: en/git-rev-parse.txt:282
#, no-wrap
msgid "--show-object-format[=(storage|input|output)]"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:283
+#: en/git-rev-parse.txt:287
msgid ""
"Show the object format (hash algorithm) used for the repository for storage "
"inside the `.git` directory, input, or output. For input, multiple "
@@ -51769,68 +51332,68 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:286
+#: en/git-rev-parse.txt:290
#, no-wrap
msgid "Other Options"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:288
+#: en/git-rev-parse.txt:292
#, no-wrap
msgid "--since=datestring"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:289
+#: en/git-rev-parse.txt:293
#, no-wrap
msgid "--after=datestring"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:292
+#: en/git-rev-parse.txt:296
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
+#: en/git-rev-parse.txt:297
#, no-wrap
msgid "--until=datestring"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:294
+#: en/git-rev-parse.txt:298
#, no-wrap
msgid "--before=datestring"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:297
+#: en/git-rev-parse.txt:301
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
+#: en/git-rev-parse.txt:302
#, no-wrap
msgid "<args>..."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:300
+#: en/git-rev-parse.txt:304
msgid "Flags and parameters to be parsed."
msgstr ""
#. type: Title -
-#: en/git-rev-parse.txt:305
+#: en/git-rev-parse.txt:309
#, no-wrap
msgid "PARSEOPT"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:310
+#: en/git-rev-parse.txt:314
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 "
@@ -51839,7 +51402,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:315
+#: en/git-rev-parse.txt:319
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)` "
@@ -51848,20 +51411,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:318
+#: en/git-rev-parse.txt:322
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
+#: en/git-rev-parse.txt:324
#, no-wrap
msgid "Input Format"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:326
+#: en/git-rev-parse.txt:330
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 "
@@ -51870,24 +51433,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:328
+#: en/git-rev-parse.txt:332
msgid "Each line of options has this format:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:331
+#: en/git-rev-parse.txt:335
#, no-wrap
msgid "<opt-spec><flags>*<arg-hint>? SP+ help LF\n"
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:333
+#: en/git-rev-parse.txt:337
#, no-wrap
msgid "`<opt-spec>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:338
+#: en/git-rev-parse.txt:342
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 "
@@ -51896,23 +51459,23 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:339
+#: en/git-rev-parse.txt:343
#, no-wrap
msgid "`<flags>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:341
+#: en/git-rev-parse.txt:345
msgid "`<flags>` are of `*`, `=`, `?` or `!`."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:342
+#: en/git-rev-parse.txt:346
msgid "Use `=` if the option takes an argument."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:346
+#: en/git-rev-parse.txt:350
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 "
@@ -51920,7 +51483,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:350
+#: en/git-rev-parse.txt:354
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 "
@@ -51928,18 +51491,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:352
+#: en/git-rev-parse.txt:356
msgid "Use `!` to not make the corresponding negated long option available."
msgstr ""
#. type: Labeled list
-#: en/git-rev-parse.txt:353
+#: en/git-rev-parse.txt:357
#, no-wrap
msgid "`<arg-hint>`"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:358
+#: en/git-rev-parse.txt:362
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 "
@@ -51948,14 +51511,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:361
+#: en/git-rev-parse.txt:365
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
+#: en/git-rev-parse.txt:369
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 "
@@ -51963,7 +51526,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:372
+#: en/git-rev-parse.txt:376
#, no-wrap
msgid ""
"OPTS_SPEC=\"\\\n"
@@ -51971,7 +51534,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:374
+#: en/git-rev-parse.txt:378
#, no-wrap
msgid ""
"some-command does foo and bar!\n"
@@ -51979,13 +51542,13 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:376
+#: en/git-rev-parse.txt:380
#, no-wrap
msgid "h,help show the help\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:381
+#: en/git-rev-parse.txt:385
#, no-wrap
msgid ""
"foo some nifty option --foo\n"
@@ -51995,7 +51558,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:384
+#: en/git-rev-parse.txt:388
#, no-wrap
msgid ""
" An option group Header\n"
@@ -52003,7 +51566,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:386
+#: en/git-rev-parse.txt:390
#, no-wrap
msgid ""
"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
@@ -52011,32 +51574,32 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-rev-parse.txt:390
+#: en/git-rev-parse.txt:394
#, no-wrap
msgid "Usage text"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:394
+#: en/git-rev-parse.txt:398
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
+#: en/git-rev-parse.txt:401
#, no-wrap
msgid "usage: some-command [<options>] <args>...\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:399
+#: en/git-rev-parse.txt:403
#, no-wrap
msgid " some-command does foo and bar!\n"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:405
+#: en/git-rev-parse.txt:409
#, no-wrap
msgid ""
" -h, --help show the help\n"
@@ -52048,7 +51611,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:408
+#: en/git-rev-parse.txt:412
#, no-wrap
msgid ""
"An option group Header\n"
@@ -52056,13 +51619,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-rev-parse.txt:411
+#: en/git-rev-parse.txt:415
#, no-wrap
msgid "SQ-QUOTE"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:417
+#: en/git-rev-parse.txt:421
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 "
@@ -52071,14 +51634,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:421
+#: en/git-rev-parse.txt:425
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
+#: en/git-rev-parse.txt:437
#, no-wrap
msgid ""
"$ cat >your-git-script.sh <<\\EOF\n"
@@ -52092,51 +51655,51 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:435
+#: en/git-rev-parse.txt:439
#, no-wrap
msgid "$ sh your-git-script.sh \"a b'c\"\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:441
+#: en/git-rev-parse.txt:445
msgid "Print the object name of the current commit:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:444
+#: en/git-rev-parse.txt:448
#, no-wrap
msgid "$ git rev-parse --verify HEAD\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:447
+#: en/git-rev-parse.txt:451
msgid "Print the commit object name from the revision in the $REV shell variable:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:450
+#: en/git-rev-parse.txt:454
#, no-wrap
-msgid "$ git rev-parse --verify $REV^{commit}\n"
+msgid "$ git rev-parse --verify --end-of-options $REV^{commit}\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:453
+#: en/git-rev-parse.txt:457
msgid "This will error out if $REV is empty or not a valid revision."
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:455
+#: en/git-rev-parse.txt:459
msgid "Similar to above:"
msgstr ""
#. type: delimited block -
-#: en/git-rev-parse.txt:458
+#: en/git-rev-parse.txt:462
#, no-wrap
-msgid "$ git rev-parse --default master --verify $REV\n"
+msgid "$ git rev-parse --default master --verify --end-of-options $REV\n"
msgstr ""
#. type: Plain text
-#: en/git-rev-parse.txt:461
+#: en/git-rev-parse.txt:465
msgid "but if $REV is empty, the commit object name from master will be printed."
msgstr ""
@@ -53111,9 +52674,9 @@ msgstr ""
#. 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."
+"If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines "
+"to the cc list. Default is the value of `sendemail.signedoffbycc` "
+"configuration value; if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
@@ -53184,8 +52747,8 @@ 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)."
+"'sob' will avoid including anyone mentioned in the Signed-off-by trailers "
+"except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
@@ -54354,12 +53917,6 @@ msgstr ""
msgid "Synonym to `--more=-1`"
msgstr ""
-#. type: Labeled list
-#: en/git-show-branch.txt:83
-#, no-wrap
-msgid "--merge-base"
-msgstr ""
-
#. type: Plain text
#: en/git-show-branch.txt:89
msgid ""
@@ -55552,8 +55109,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180
-#: en/git-stash.txt:186
+#: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
msgid "This option is only valid for `push` and `save` commands."
msgstr ""
@@ -55625,8 +55181,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224
-#: en/git-stash.txt:229
+#: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
msgid "This option is only valid for `push` command."
msgstr ""
@@ -56978,11 +56533,15 @@ msgstr ""
msgid "checkout"
msgstr ""
+#. type: Plain text
+#: en/git-submodule.txt:150
+msgid "the commit recorded in the superproject will be"
+msgstr ""
+
#. type: Plain text
#: en/git-submodule.txt:151
-msgid ""
-"the commit recorded in the superproject will be checked out in the submodule "
-"on a detached HEAD."
+#, no-wrap
+msgid "checked out in the submodule on a detached HEAD.\n"
msgstr ""
#. type: Plain text
@@ -57000,18 +56559,26 @@ msgstr ""
msgid "rebase"
msgstr ""
+#. type: Plain text
+#: en/git-submodule.txt:158
+msgid "the current branch of the submodule will be rebased"
+msgstr ""
+
#. type: Plain text
#: en/git-submodule.txt:159
-msgid ""
-"the current branch of the submodule will be rebased onto the commit recorded "
-"in the superproject."
+#, no-wrap
+msgid "onto the commit recorded in the superproject.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-submodule.txt:161
+msgid "the commit recorded in the superproject will be merged"
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:162
-msgid ""
-"the commit recorded in the superproject will be merged into the current "
-"branch in the submodule."
+#, no-wrap
+msgid "into the current branch in the submodule.\n"
msgstr ""
#. type: Plain text
@@ -57027,13 +56594,19 @@ msgstr ""
msgid "custom command"
msgstr ""
+#. type: Plain text
+#: en/git-submodule.txt:167
+msgid "arbitrary shell command that takes a single"
+msgstr ""
+
#. type: Plain text
#: en/git-submodule.txt:171
+#, no-wrap
msgid ""
-"arbitrary shell command that takes a single argument (the sha1 of the commit "
-"recorded in the superproject) is executed. When `submodule.<name>.update` is "
-"set to '!command', the remainder after the exclamation mark is the custom "
-"command."
+"argument (the sha1 of the commit recorded in the\n"
+"superproject) is executed. When `submodule.<name>.update`\n"
+"is set to '!command', the remainder after the exclamation mark\n"
+"is the custom command.\n"
msgstr ""
#. type: Plain text
@@ -59053,8 +58626,8 @@ msgstr ""
#: 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."
+"'dcommit' operations), look for the first `From:` line or `Signed-off-by` "
+"trailer in the log message and use that as the author string."
msgstr ""
#. type: Plain text
@@ -59074,7 +58647,7 @@ msgstr ""
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 "
+"`Signed-off-by` trailer, 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 ""
@@ -60002,23 +59575,18 @@ msgid "$ git switch -c <branch> --track <remote>/<branch>\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:106
-msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
-msgstr ""
-
-#. type: Plain text
-#: en/git-switch.txt:110
+#: en/git-switch.txt:113
msgid "An alias for `--discard-changes`."
msgstr ""
#. type: Labeled list
-#: en/git-switch.txt:111
+#: en/git-switch.txt:114
#, no-wrap
msgid "--discard-changes"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:117
+#: en/git-switch.txt:120
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 "
@@ -60027,7 +59595,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:127
+#: en/git-switch.txt:130
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 "
@@ -60038,14 +59606,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:156
+#: en/git-switch.txt:159
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
+#: en/git-switch.txt:169
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 "
@@ -60058,20 +59626,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-switch.txt:171
+#: en/git-switch.txt:174
#, no-wrap
msgid "--orphan <new-branch>"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:174
+#: en/git-switch.txt:177
msgid ""
"Create a new 'orphan' branch, named `<new-branch>`. All tracked files are "
"removed."
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:180
+#: en/git-switch.txt:183
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 "
@@ -60079,7 +59647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:189
+#: en/git-switch.txt:192
msgid ""
"Using `--recurse-submodules` will update the content of all active "
"submodules according to the commit recorded in the superproject. If nothing "
@@ -60089,24 +59657,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:194
+#: en/git-switch.txt:197
msgid "The following command switches to the \"master\" branch:"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:197
+#: en/git-switch.txt:200
#, no-wrap
msgid "$ git switch master\n"
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:204
+#: en/git-switch.txt:207
#, no-wrap
msgid "$ git switch mytopic\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:209
+#: en/git-switch.txt:212
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 "
@@ -60114,7 +59682,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:213
+#: en/git-switch.txt:216
#, no-wrap
msgid ""
"$ git switch mytopic\n"
@@ -60122,7 +59690,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-switch.txt:221
+#: en/git-switch.txt:224
#, no-wrap
msgid ""
"$ git switch -m mytopic\n"
@@ -60130,27 +59698,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:229
+#: en/git-switch.txt:232
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
+#: en/git-switch.txt:235
#, no-wrap
msgid "$ git switch -\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:236
+#: en/git-switch.txt:239
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
+#: en/git-switch.txt:243
#, no-wrap
msgid ""
"$ git switch -c fixup HEAD~3\n"
@@ -60158,12 +59726,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:244
+#: en/git-switch.txt:247
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
+#: en/git-switch.txt:252
#, no-wrap
msgid ""
"$ git switch new-topic\n"
@@ -60172,14 +59740,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:253
+#: en/git-switch.txt:256
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
+#: en/git-switch.txt:260
#, no-wrap
msgid ""
"$ git switch --detach HEAD~3\n"
@@ -60187,20 +59755,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:261
+#: en/git-switch.txt:264
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
+#: en/git-switch.txt:267
#, no-wrap
msgid "$ git switch -c good-surprises\n"
msgstr ""
#. type: Plain text
-#: en/git-switch.txt:270
+#: en/git-switch.txt:273
msgid "linkgit:git-checkout[1], linkgit:git-branch[1]"
msgstr ""
@@ -62049,9 +61617,15 @@ msgstr ""
msgid "<old|new>-file"
msgstr ""
+#. type: Plain text
+#: en/git.txt:564
+msgid "are files GIT_EXTERNAL_DIFF can use to read the"
+msgstr ""
+
#. type: Plain text
#: en/git.txt:565
-msgid "are files GIT_EXTERNAL_DIFF can use to read the contents of <old|new>,"
+#, no-wrap
+msgid "contents of <old|new>,\n"
msgstr ""
#. type: Labeled list
@@ -63054,9 +62628,14 @@ msgid ""
"existing ones."
msgstr ""
+#. type: Plain text
+#: en/git-unpack-objects.txt:32
+msgid "Dry run. Check the pack file without actually unpacking"
+msgstr ""
+
#. type: Plain text
#: en/git-unpack-objects.txt:33
-msgid "Dry run. Check the pack file without actually unpacking the objects."
+msgid "the objects."
msgstr ""
#. type: Plain text
@@ -63161,11 +62740,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-index.txt:63
+#: 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 'git update-index' continue "
-"anyway."
+"behavior is to error out. This option makes"
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:63
+msgid "'git update-index' continue anyway."
msgstr ""
#. type: Labeled list
@@ -63181,11 +62764,20 @@ msgid ""
"before --refresh."
msgstr ""
+#. type: Plain text
+#: en/git-update-index.txt:70
+msgid "If --refresh finds unmerged changes in the index, the default"
+msgstr ""
+
+#. type: Plain text
+#: en/git-update-index.txt:71
+msgid "behavior is to error out. This option makes 'git update-index'"
+msgstr ""
+
#. type: Plain text
#: en/git-update-index.txt:72
-msgid ""
-"If --refresh finds unmerged changes in the index, the default behavior is to "
-"error out. This option makes 'git update-index' continue anyway."
+#, no-wrap
+msgid "continue anyway.\n"
msgstr ""
#. type: Plain text
@@ -64351,21 +63943,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:129
+#: en/git-update-ref.txt:130
msgid ""
"Start a transaction. In contrast to a non-transactional session, a "
"transaction will automatically abort if the session ends without an explicit "
-"commit."
+"commit. This command may create a new empty transaction when the current one "
+"has been committed or aborted already."
msgstr ""
#. type: Labeled list
-#: en/git-update-ref.txt:130
+#: en/git-update-ref.txt:131
#, no-wrap
msgid "prepare"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:134
+#: en/git-update-ref.txt:135
msgid ""
"Prepare to commit the transaction. This will create lock files for all "
"queued reference updates. If one reference could not be locked, the "
@@ -64373,27 +63966,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:138
+#: en/git-update-ref.txt:139
msgid ""
"Commit all reference updates queued for the transaction, ending the "
"transaction."
msgstr ""
#. type: Labeled list
-#: en/git-update-ref.txt:139
+#: en/git-update-ref.txt:140
#, no-wrap
msgid "abort"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:142
+#: en/git-update-ref.txt:143
msgid ""
"Abort the transaction, releasing all locks if the transaction is in prepared "
"state."
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:148
+#: en/git-update-ref.txt:149
msgid ""
"If all <ref>s can be locked with matching <oldvalue>s simultaneously, all "
"modifications are performed. Otherwise, no modifications are performed. "
@@ -64402,13 +63995,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-update-ref.txt:150
+#: en/git-update-ref.txt:151
#, no-wrap
msgid "LOGGING UPDATES"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:158
+#: en/git-update-ref.txt:159
msgid ""
"If config parameter \"core.logAllRefUpdates\" is true and the ref is one "
"under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or a pseudoref "
@@ -64419,13 +64012,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:160
+#: en/git-update-ref.txt:161
#, no-wrap
msgid " oldsha1 SP newsha1 SP committer LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:165
+#: en/git-update-ref.txt:166
msgid ""
"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in "
"<ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
@@ -64434,25 +64027,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:167
+#: en/git-update-ref.txt:168
msgid "Optionally with -m:"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:169
+#: en/git-update-ref.txt:170
#, no-wrap
msgid " oldsha1 SP newsha1 SP committer TAB message LF\n"
msgstr ""
#. type: Plain text
-#: en/git-update-ref.txt:172
+#: en/git-update-ref.txt:173
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:176
+#: en/git-update-ref.txt:177
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 "
@@ -65437,22 +65030,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:101
+#: en/git-worktree.txt:102
msgid ""
"List details of each working tree. The main working tree is listed first, "
"followed by each of the linked working trees. The output details include "
-"whether the working tree is bare, the revision currently checked out, and "
-"the branch currently checked out (or \"detached HEAD\" if none)."
+"whether the working tree is bare, the revision currently checked out, the "
+"branch currently checked out (or \"detached HEAD\" if none), and \"locked\" "
+"if the worktree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:102
+#: en/git-worktree.txt:103
#, no-wrap
msgid "lock"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:109
+#: en/git-worktree.txt:110
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 "
@@ -65461,13 +65055,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:110
+#: en/git-worktree.txt:111
#, no-wrap
msgid "move"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:117
+#: en/git-worktree.txt:118
msgid ""
"Move a working tree to a new location. Note that the main working tree or "
"linked working trees containing submodules cannot be moved with this "
@@ -65477,12 +65071,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:121
+#: en/git-worktree.txt:122
msgid "Prune working tree information in `$GIT_DIR/worktrees`."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:128
+#: en/git-worktree.txt:129
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 "
@@ -65491,20 +65085,20 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:129
+#: en/git-worktree.txt:130
#, no-wrap
msgid "repair [<path>...]"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:134
msgid ""
"Repair working tree administrative files, if possible, if they have become "
"corrupted or outdated due to external factors."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:138
+#: en/git-worktree.txt:139
msgid ""
"For instance, if the main working tree (or bare repository) is moved, linked "
"working trees will be unable to locate it. Running `repair` in the main "
@@ -65513,7 +65107,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:145
+#: en/git-worktree.txt:146
msgid ""
"Similarly, if a linked working tree is moved without using `git worktree "
"move`, the main working tree (or bare repository) will be unable to locate "
@@ -65524,18 +65118,18 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:147
#, no-wrap
msgid "unlock"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:149
+#: en/git-worktree.txt:150
msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:161
+#: en/git-worktree.txt:162
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 "
@@ -65546,7 +65140,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:166
+#: en/git-worktree.txt:167
msgid ""
"`move` refuses to move a locked working tree unless `--force` is specified "
"twice. If the destination is already assigned to some other working tree but "
@@ -65556,26 +65150,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:170
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:170
+#: en/git-worktree.txt:171
#, no-wrap
msgid "-b <new-branch>"
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:171
+#: en/git-worktree.txt:172
#, no-wrap
msgid "-B <new-branch>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:179
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 "
@@ -65585,20 +65179,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:184
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:184
+#: en/git-worktree.txt:185
#, no-wrap
msgid "--[no-]checkout"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:189
+#: en/git-worktree.txt:190
msgid ""
"By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be "
"used to suppress checkout in order to make customizations, such as "
@@ -65607,13 +65201,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:190
+#: en/git-worktree.txt:191
#, no-wrap
msgid "--[no-]guess-remote"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:196
+#: en/git-worktree.txt:197
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 "
@@ -65623,20 +65217,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:199
+#: en/git-worktree.txt:200
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:200
+#: en/git-worktree.txt:201
#, no-wrap
msgid "--[no-]track"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:205
+#: en/git-worktree.txt:206
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 "
@@ -65645,25 +65239,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:207
#, no-wrap
msgid "--lock"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:210
+#: en/git-worktree.txt:211
msgid ""
"Keep the working tree locked after creation. This is the equivalent of `git "
"worktree lock` after `git worktree add`, but without a race condition."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:215
+#: en/git-worktree.txt:216
msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:220
+#: en/git-worktree.txt:221
msgid ""
"With `list`, output in an easy-to-parse format for scripts. This format "
"will remain stable across Git versions and regardless of user "
@@ -65671,44 +65265,44 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:225
msgid "With `add`, suppress feedback messages."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:228
+#: en/git-worktree.txt:229
msgid "With `prune`, report all removals."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:232
msgid "With `prune`, only expire unused working trees older than `<time>`."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:232
+#: en/git-worktree.txt:233
#, no-wrap
msgid "--reason <string>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:234
+#: en/git-worktree.txt:235
msgid "With `lock`, an explanation why the working tree is locked."
msgstr ""
#. type: Labeled list
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:236
#, no-wrap
msgid "<worktree>"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:238
+#: en/git-worktree.txt:239
msgid "Working trees can be identified by path, either relative or absolute."
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:243
+#: en/git-worktree.txt:244
msgid ""
"If the last path components in the working tree's path is unique among "
"working trees, it can be used to identify a working tree. For example if you "
@@ -65717,13 +65311,13 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:246
#, no-wrap
msgid "REFS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:250
+#: en/git-worktree.txt:251
msgid ""
"In multiple working trees, some refs may be shared between all working trees "
"and some refs are local. One example is `HEAD` which is different for each "
@@ -65732,7 +65326,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:256
+#: en/git-worktree.txt:257
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 "
@@ -65741,7 +65335,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:261
+#: en/git-worktree.txt:262
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 "
@@ -65750,7 +65344,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:268
+#: en/git-worktree.txt:269
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 "
@@ -65761,7 +65355,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:272
+#: en/git-worktree.txt:273
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] "
@@ -65769,7 +65363,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:279
+#: en/git-worktree.txt:280
msgid ""
"By default, the repository `config` file is shared across all working "
"trees. If the config variables `core.bare` or `core.worktree` are already "
@@ -65778,20 +65372,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:283
msgid ""
"In order to have configuration specific to working trees, you can turn on "
"the `worktreeConfig` extension, e.g.:"
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:285
+#: en/git-worktree.txt:286
#, no-wrap
msgid "$ git config extensions.worktreeConfig true\n"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:291
+#: en/git-worktree.txt:292
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 "
@@ -65800,7 +65394,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:298
msgid ""
"Note that in this file, the exception for `core.bare` and `core.worktree` is "
"gone. If they exist in `$GIT_DIR/config`, you must move them to the "
@@ -65810,25 +65404,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:299
+#: en/git-worktree.txt:300
msgid "`core.worktree` and `core.bare` should never be shared"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:302
+#: en/git-worktree.txt:303
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:304
+#: en/git-worktree.txt:305
#, no-wrap
msgid "DETAILS"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:313
+#: en/git-worktree.txt:314
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 "
@@ -65841,7 +65435,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:319
+#: en/git-worktree.txt:320
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 "
@@ -65851,7 +65445,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:330
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 "
@@ -65864,7 +65458,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:334
+#: en/git-worktree.txt:335
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 "
@@ -65873,7 +65467,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:342
+#: en/git-worktree.txt:343
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 "
@@ -65885,7 +65479,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:353
+#: en/git-worktree.txt:354
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 "
@@ -65898,27 +65492,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:356
+#: en/git-worktree.txt:357
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:358
+#: en/git-worktree.txt:359
#, no-wrap
msgid "LIST OUTPUT FORMAT"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:361
+#: en/git-worktree.txt:362
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:367
+#: en/git-worktree.txt:368
#, no-wrap
msgid ""
"$ git worktree list\n"
@@ -65928,13 +65522,13 @@ msgid ""
msgstr ""
#. type: Title ~
-#: en/git-worktree.txt:370
+#: en/git-worktree.txt:371
#, no-wrap
msgid "Porcelain Format"
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:376
+#: en/git-worktree.txt:377
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 "
@@ -65944,7 +65538,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:381
+#: en/git-worktree.txt:382
#, no-wrap
msgid ""
"$ git worktree list --porcelain\n"
@@ -65953,7 +65547,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:385
+#: en/git-worktree.txt:386
#, no-wrap
msgid ""
"worktree /path/to/linked-worktree\n"
@@ -65962,7 +65556,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:389
+#: en/git-worktree.txt:390
#, no-wrap
msgid ""
"worktree /path/to/other-linked-worktree\n"
@@ -65971,7 +65565,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:402
+#: en/git-worktree.txt:403
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 "
@@ -65984,7 +65578,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-worktree.txt:410
+#: en/git-worktree.txt:411
#, no-wrap
msgid ""
"$ git worktree add -b emergency-fix ../temp master\n"
@@ -65996,7 +65590,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/git-worktree.txt:417
+#: en/git-worktree.txt:418
msgid ""
"Multiple checkout in general is still experimental, and the support for "
"submodules is incomplete. It is NOT recommended to make multiple checkouts "
@@ -66140,7 +65734,7 @@ msgstr ""
#. type: Plain text
#: en/glossary-content.txt:30
msgid ""
-"A \"branch\" is an active line of development. The most recent "
+"A \"branch\" is a 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 "
@@ -67698,7 +67292,7 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:2
-msgid "<start> and <end> can take one of these forms:"
+msgid "'<start>' and '<end>' can take one of these forms:"
msgstr ""
#. type: Plain text
@@ -67709,23 +67303,23 @@ 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)."
+"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
-msgid "/regex/"
+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>."
+"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
@@ -67736,18 +67330,20 @@ 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>."
+"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
+#: en/line-range-format.txt:32
msgid ""
-"If ``:<funcname>'' is given in place of <start> and <end>, it is a regular "
+"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 "
+"'<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."
+"file. `^:<funcname>` searches from the start of file. The function names are "
+"determined in the same way as `git diff` works out patch hunk headers (see "
+"'Defining a custom hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Plain text
@@ -68018,43 +67614,32 @@ msgid ""
"being merged."
msgstr ""
-#. type: Labeled list
-#: en/merge-options.txt:81
-#, no-wrap
-msgid "--no-signoff"
-msgstr ""
-
-#. type: Plain text
-#: en/merge-options.txt:90
-msgid "With --no-signoff do not add a Signed-off-by line."
-msgstr ""
-
#. type: Plain text
-#: en/merge-options.txt:96
+#: en/merge-options.txt:87
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:99
+#: en/merge-options.txt:90
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:100
+#: en/merge-options.txt:91
#, no-wrap
msgid "--squash"
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:101
+#: en/merge-options.txt:92
#, no-wrap
msgid "--no-squash"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:109
+#: en/merge-options.txt:100
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 "
@@ -68065,26 +67650,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:112
+#: en/merge-options.txt:103
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:114
+#: en/merge-options.txt:105
msgid "With --squash, --commit is not allowed, and will fail."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:118
+#: en/merge-options.txt:109
msgid ""
"This option bypasses the pre-merge and commit-msg hooks. See also "
"linkgit:githooks[5]."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:126
+#: en/merge-options.txt:117
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 "
@@ -68093,30 +67678,30 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:127
+#: en/merge-options.txt:118
#, no-wrap
msgid "-X <option>"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:131
+#: en/merge-options.txt:122
msgid "Pass merge strategy specific option through to the merge strategy."
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:132
+#: en/merge-options.txt:123
#, no-wrap
msgid "--verify-signatures"
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:133
+#: en/merge-options.txt:124
#, no-wrap
msgid "--no-verify-signatures"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:139
+#: en/merge-options.txt:130
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 "
@@ -68125,25 +67710,25 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:141
+#: en/merge-options.txt:132
#, no-wrap
msgid "--no-summary"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:144
+#: en/merge-options.txt:135
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:149
+#: en/merge-options.txt:140
msgid "Operate quietly. Implies --no-progress."
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:160
+#: en/merge-options.txt:151
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 "
@@ -68151,7 +67736,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:170
+#: en/merge-options.txt:161
msgid ""
"Automatically create a temporary stash entry before the operation begins, "
"and apply it after the operation ends. This means that you can run the "
@@ -68160,13 +67745,13 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/merge-options.txt:171
+#: en/merge-options.txt:162
#, no-wrap
msgid "--allow-unrelated-histories"
msgstr ""
#. type: Plain text
-#: en/merge-options.txt:177
+#: en/merge-options.txt:168
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 "
@@ -68666,8 +68251,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51
-#: en/pretty-formats.txt:63
+#: en/pretty-formats.txt:33 en/pretty-formats.txt:41 en/pretty-formats.txt:51 en/pretty-formats.txt:63
#, no-wrap
msgid "<title line>\n"
msgstr ""
@@ -68687,8 +68271,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65
-#: en/pretty-formats.txt:85
+#: en/pretty-formats.txt:43 en/pretty-formats.txt:53 en/pretty-formats.txt:65 en/pretty-formats.txt:85
msgid "<full commit message>"
msgstr ""
@@ -68910,14 +68493,18 @@ msgstr ""
msgid "'%C(...)'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:133
+msgid "color specification, as described under Values in the"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:146
msgid ""
-"color specification, as described under Values in the \"CONFIGURATION FILE\" "
-"section of linkgit:git-config[1]. By default, colors are shown only when "
-"enabled for log output (by `color.diff`, `color.ui`, or `--color`, and "
-"respecting the `auto` settings of the former if we are going to a "
-"terminal). `%C(auto,...)` is accepted as a historical synonym for the "
+"\"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 "
@@ -68943,9 +68530,14 @@ msgstr ""
msgid "'%w([<w>[,<i1>[,<i2>]]])'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:148
+msgid "switch line wrapping, like the -w option of"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:149
-msgid "switch line wrapping, like the -w option of linkgit:git-shortlog[1]."
+msgid "linkgit:git-shortlog[1]."
msgstr ""
#. type: Labeled list
@@ -68954,13 +68546,18 @@ msgstr ""
msgid "'%<(<N>[,trunc|ltrunc|mtrunc])'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:150
+msgid "make the next placeholder take at"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:157
msgid ""
-"make the next placeholder take at least N columns, padding spaces on the "
-"right if necessary. Optionally truncate at the beginning (ltrunc), the "
-"middle (mtrunc) or the end (trunc) if the output is longer than N columns. "
-"Note that truncating only works correctly with N >= 2."
+"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
@@ -68969,11 +68566,14 @@ msgstr ""
msgid "'%<|(<N>)'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:158
+msgid "make the next placeholder take at least until Nth"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:159
-msgid ""
-"make the next placeholder take at least until Nth columns, padding spaces on "
-"the right if necessary"
+msgid "columns, padding spaces on the right if necessary"
msgstr ""
#. type: Labeled list
@@ -68982,11 +68582,14 @@ msgstr ""
msgid "'%>(<N>)', '%>|(<N>)'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:160
+msgid "similar to '%<(<N>)', '%<|(<N>)' respectively,"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:161
-msgid ""
-"similar to '%<(<N>)', '%<|(<N>)' respectively, but padding spaces on the "
-"left"
+msgid "but padding spaces on the left"
msgstr ""
#. type: Labeled list
@@ -68995,12 +68598,16 @@ msgstr ""
msgid "'%>>(<N>)', '%>>|(<N>)'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:162
+msgid "similar to '%>(<N>)', '%>|(<N>)'"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:166
msgid ""
-"similar to '%>(<N>)', '%>|(<N>)' respectively, except that if the next "
-"placeholder takes more spaces than given and there are spaces on its left, "
-"use those spaces"
+"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
@@ -69009,11 +68616,14 @@ msgstr ""
msgid "'%><(<N>)', '%><|(<N>)'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:167
+msgid "similar to '%<(<N>)', '%<|(<N>)'"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:169
-msgid ""
-"similar to '%<(<N>)', '%<|(<N>)' respectively, but padding both sides "
-"(i.e. the text is centered)"
+msgid "respectively, but padding both sides (i.e. the text is centered)"
msgstr ""
#. type: Plain text
@@ -69105,10 +68715,13 @@ msgid "'%aN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:180
-msgid ""
-"author name (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:179
+msgid "author name (respecting .mailmap, see linkgit:git-shortlog[1]"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:180 en/pretty-formats.txt:183
+msgid "or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -69129,10 +68742,8 @@ msgid "'%aE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:183
-msgid ""
-"author email (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:182
+msgid "author email (respecting .mailmap, see linkgit:git-shortlog[1]"
msgstr ""
#. type: Labeled list
@@ -69153,10 +68764,13 @@ msgid "'%aL'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:186
-msgid ""
-"author local-part (see '%al') respecting .mailmap, see "
-"linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:185
+msgid "author local-part (see '%al') respecting .mailmap, see"
+msgstr ""
+
+#. type: Plain text
+#: en/pretty-formats.txt:186 en/pretty-formats.txt:196 en/pretty-formats.txt:199 en/pretty-formats.txt:202 en/pretty-formats.txt:247 en/pretty-formats.txt:250
+msgid "linkgit:git-shortlog[1] or linkgit:git-blame[1])"
msgstr ""
#. type: Labeled list
@@ -69254,10 +68868,8 @@ msgid "'%cN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:196
-msgid ""
-"committer name (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:195
+msgid "committer name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
@@ -69278,10 +68890,8 @@ msgid "'%cE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:199
-msgid ""
-"committer email (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:198
+msgid "committer email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
@@ -69302,10 +68912,8 @@ msgid "'%cL'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:202
-msgid ""
-"committer local-part (see '%cl') respecting .mailmap, see "
-"linkgit:git-shortlog[1] or linkgit:git-blame[1])"
+#: en/pretty-formats.txt:201
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
msgstr ""
#. type: Labeled list
@@ -69407,11 +69015,14 @@ msgstr ""
msgid "ref names without the \" (\", \")\" wrapping."
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:212
+msgid "ref name given on the command line by which the commit was reached"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:213
-msgid ""
-"ref name given on the command line by which the commit was reached (like "
-"`git log --source`), only works with `git log`"
+msgid "(like `git log --source`), only works with `git log`"
msgstr ""
#. type: Labeled list
@@ -69491,14 +69102,19 @@ msgstr ""
msgid "'%G?'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:223
+msgid "show \"G\" for a good (valid) signature,"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:230
msgid ""
-"show \"G\" for a good (valid) signature, \"B\" for a bad signature, \"U\" "
-"for a good signature with unknown validity, \"X\" for a good signature that "
-"has expired, \"Y\" for a good signature made by an expired key, \"R\" for a "
-"good signature made by a revoked key, \"E\" if the signature cannot be "
-"checked (e.g. missing key) and \"N\" for no signature"
+"\"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
@@ -69540,11 +69156,14 @@ msgstr ""
msgid "'%GP'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:234
+msgid "show the fingerprint of the primary key whose subkey was used"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:235
-msgid ""
-"show the fingerprint of the primary key whose subkey was used to sign a "
-"signed commit"
+msgid "to sign a signed commit"
msgstr ""
#. type: Labeled list
@@ -69564,13 +69183,18 @@ msgstr ""
msgid "'%gD'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:237
+msgid "reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:241
msgid ""
-"reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2 minutes ago}`; the "
-"format follows the rules described for the `-g` option. The portion before "
-"the `@` is the refname as given on the command line (so `git log -g "
-"refs/heads/master` would yield `refs/heads/master@{0}`)."
+"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
@@ -69579,12 +69203,16 @@ msgstr ""
msgid "'%gd'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:242
+msgid "shortened reflog selector; same as `%gD`, but the refname"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:244
msgid ""
-"shortened reflog selector; same as `%gD`, but the refname portion is "
-"shortened for human readability (so `refs/heads/master` becomes just "
-"`master`)."
+"portion is shortened for human readability (so `refs/heads/master` becomes "
+"just `master`)."
msgstr ""
#. type: Labeled list
@@ -69605,10 +69233,8 @@ msgid "'%gN'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:247
-msgid ""
-"reflog identity name (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:246
+msgid "reflog identity name (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
@@ -69629,10 +69255,8 @@ msgid "'%gE'"
msgstr ""
#. type: Plain text
-#: en/pretty-formats.txt:250
-msgid ""
-"reflog identity email (respecting .mailmap, see linkgit:git-shortlog[1] or "
-"linkgit:git-blame[1])"
+#: en/pretty-formats.txt:249
+msgid "reflog identity email (respecting .mailmap, see"
msgstr ""
#. type: Labeled list
@@ -69652,12 +69276,16 @@ msgstr ""
msgid "'%(trailers[:options])'"
msgstr ""
+#. type: Plain text
+#: en/pretty-formats.txt:252
+msgid "display the trailers of the body as"
+msgstr ""
+
#. type: Plain text
#: en/pretty-formats.txt:256
msgid ""
-"display the trailers of the body as interpreted by "
-"linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by "
-"a colon and zero or more comma-separated options:"
+"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
@@ -69834,9 +69462,10 @@ msgstr ""
#. 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)."
+"Instead of showing the full 40-byte hexadecimal commit object name, show a "
+"prefix that names the object uniquely. \"--abbrev=<n>\" (which also "
+"modifies diff output, if it is displayed) option can be used to specify the "
+"minimum length of the prefix."
msgstr ""
#. type: Plain text
@@ -73916,8 +73545,7 @@ msgid ""
msgstr ""
#. type: delimited block -
-#: en/git-bisect-lk2009.txt:259 en/git-bisect-lk2009.txt:273
-#: en/git-bisect-lk2009.txt:333
+#: en/git-bisect-lk2009.txt:259 en/git-bisect-lk2009.txt:273 en/git-bisect-lk2009.txt:333
#, no-wrap
msgid " Linux 2.6.26-rc1\n"
msgstr ""