diff --git a/GIT-VERSION-FILE b/GIT-VERSION-FILE
index 4d8332e4495261564febc9d3e747aaccb1ada240..52a3826825044d3ce0b1d0258a98056035ccf929 100644
--- a/GIT-VERSION-FILE
+++ b/GIT-VERSION-FILE
@@ -1 +1 @@
-GIT_VERSION = 2.27.0
+GIT_VERSION = 2.28.0
diff --git a/en/diff-options.txt b/en/diff-options.txt
index bb31f0c42b3f8a7b26f6eb01e7e1ad7c0b0fa008..7987d72b0212e1247ff5ea14b553d4a322c1f5f5 100644
--- a/en/diff-options.txt
+++ b/en/diff-options.txt
@@ -643,15 +643,18 @@ ifndef::git-format-patch[]
 -R::
 	Swap two inputs; that is, show differences from index or
 	on-disk file to tree contents.
+endif::git-format-patch[]
 
 --relative[=<path>]::
+--no-relative::
 	When run from a subdirectory of the project, it can be
 	told to exclude changes outside the directory and show
 	pathnames relative to it with this option.  When you are
 	not in a subdirectory (e.g. in a bare repository), you
 	can name which subdirectory to make the output relative
 	to by giving a <path> as an argument.
-endif::git-format-patch[]
+	`--no-relative` can be used to countermand both `diff.relative` config
+	option and previous `--relative`.
 
 -a::
 --text::
diff --git a/en/git-branch.txt b/en/git-branch.txt
index 135206ff4aba651f9f40f307fdabaec91ae86555..03c0824d528a0132b1d1eb2d7ac3eb7ddc461d21 100644
--- a/en/git-branch.txt
+++ b/en/git-branch.txt
@@ -12,7 +12,7 @@ SYNOPSIS
 	[-v [--abbrev=<length> | --no-abbrev]]
 	[--column[=<options>] | --no-column] [--sort=<key>]
 	[(--merged | --no-merged) [<commit>]]
-	[--contains [<commit]] [--no-contains [<commit>]]
+	[--contains [<commit>]] [--no-contains [<commit>]]
 	[--points-at <object>] [--format=<format>]
 	[(-r | --remotes) | (-a | --all)]
 	[--list] [<pattern>...]
diff --git a/en/git-bugreport.txt b/en/git-bugreport.txt
index 9edad66a63145b848bb72f5cd05343e8cc98687a..66e88c2e312b10afeb44d3f4a861ed92c21e925e 100644
--- a/en/git-bugreport.txt
+++ b/en/git-bugreport.txt
@@ -29,6 +29,7 @@ The following information is captured automatically:
  - uname sysname, release, version, and machine strings
  - Compiler-specific info string
  - A list of enabled hooks
+ - $SHELL
 
 This tool is invoked via the typical Git setup process, which means that in some
 cases, it might not be able to launch - for example, if a relevant config file
diff --git a/en/git-cat-file.txt b/en/git-cat-file.txt
index 8eca671b8278cfe02692605b80a9121bc5717567..8e192d87db4c6f8114d591e99f48c8783336d83d 100644
--- a/en/git-cat-file.txt
+++ b/en/git-cat-file.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>
-'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]
+'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]
 
 DESCRIPTION
 -----------
diff --git a/en/git-clone.txt b/en/git-clone.txt
index 08d6045c4a835dd5032c594dfc112b4adf4c6d5e..c898310099895f92e884b7852af28786c6564c8b 100644
--- a/en/git-clone.txt
+++ b/en/git-clone.txt
@@ -259,7 +259,7 @@ maintain a branch with no references other than a single cloned
 branch. This is useful e.g. to maintain minimal clones of the default
 branch of some repository for search indexing.
 
---recurse-submodules[=<pathspec]::
+--recurse-submodules[=<pathspec>]::
 	After the clone is created, initialize and clone submodules
 	within based on the provided pathspec.  If no pathspec is
 	provided, all submodules are initialized and cloned.
diff --git a/en/git-diff.txt b/en/git-diff.txt
index 37781cf175547c05b8ec3ec97aa2e700196c6471..1018110ddc2e21d2a458da6d97f9ff1f519d15b6 100644
--- a/en/git-diff.txt
+++ b/en/git-diff.txt
@@ -11,15 +11,17 @@ SYNOPSIS
 [verse]
 'git diff' [<options>] [<commit>] [--] [<path>...]
 'git diff' [<options>] --cached [<commit>] [--] [<path>...]
-'git diff' [<options>] <commit> <commit> [--] [<path>...]
+'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]
+'git diff' [<options>] <commit>...<commit> [--] [<path>...]
 'git diff' [<options>] <blob> <blob>
 'git diff' [<options>] --no-index [--] <path> <path>
 
 DESCRIPTION
 -----------
 Show changes between the working tree and the index or a tree, changes
-between the index and a tree, changes between two trees, changes between
-two blob objects, or changes between two files on disk.
+between the index and a tree, changes between two trees, changes resulting
+from a merge, changes between two blob objects, or changes between two
+files on disk.
 
 'git diff' [<options>] [--] [<path>...]::
 
@@ -67,6 +69,15 @@ two blob objects, or changes between two files on disk.
 	one side is omitted, it will have the same effect as
 	using HEAD instead.
 
+'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.
+	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 form is to view the changes on the branch containing
@@ -196,7 +207,8 @@ linkgit:git-difftool[1],
 linkgit:git-log[1],
 linkgit:gitdiffcore[7],
 linkgit:git-format-patch[1],
-linkgit:git-apply[1]
+linkgit:git-apply[1],
+linkgit:git-show[1]
 
 GIT
 ---
diff --git a/en/git-fast-export.txt b/en/git-fast-export.txt
index e8950de3ba40b9b2ff6587150a7fd4b3309752d3..1978dbdc6add12c87fd73673816219968f29dedf 100644
--- a/en/git-fast-export.txt
+++ b/en/git-fast-export.txt
@@ -119,6 +119,11 @@ by keeping the marks the same across runs.
 	the shape of the history and stored tree.  See the section on
 	`ANONYMIZING` below.
 
+--anonymize-map=<from>[:<to>]::
+	Convert token `<from>` to `<to>` in the anonymized output. If
+	`<to>` is omitted, map `<from>` to itself (i.e., do not
+	anonymize it). See the section on `ANONYMIZING` below.
+
 --reference-excluded-parents::
 	By default, running a command such as `git fast-export
 	master~5..master` will not include the commit master{tilde}5
@@ -238,6 +243,30 @@ collapse "User 0", "User 1", etc into "User X"). This produces a much
 smaller output, and it is usually easy to quickly confirm that there is
 no private data in the stream.
 
+Reproducing some bugs may require referencing particular commits or
+paths, which becomes challenging after refnames and paths have been
+anonymized. You can ask for a particular token to be left as-is or
+mapped to a new value. For example, if you have a bug which reproduces
+with `git rev-list sensitive -- secret.c`, you can run:
+
+---------------------------------------------------
+$ git fast-export --anonymize --all \
+      --anonymize-map=sensitive:foo \
+      --anonymize-map=secret.c:bar.c \
+      >stream
+---------------------------------------------------
+
+After importing the stream, you can then run `git rev-list foo -- bar.c`
+in the anonymized repository.
+
+Note that paths and refnames are split into tokens at slash boundaries.
+The command above would anonymize `subdir/secret.c` as something like
+`path123/bar.c`; you could then search for `bar.c` in the anonymized
+repository to determine the final pathname.
+
+To make referencing the final pathname simpler, you can map each path
+component; so if you also anonymize `subdir` to `publicdir`, then the
+final pathname would be `publicdir/bar.c`.
 
 LIMITATIONS
 -----------
diff --git a/en/git-fast-import.txt b/en/git-fast-import.txt
index 77c6b3d0019de2d37be64f03b6f49fa93c3ce4ad..7d9aad2a7e1b33399b611b68e995ee2d368cd02d 100644
--- a/en/git-fast-import.txt
+++ b/en/git-fast-import.txt
@@ -293,7 +293,14 @@ by users who are located in the same location and time zone.  In this
 case a reasonable offset from UTC could be assumed.
 +
 Unlike the `rfc2822` format, this format is very strict.  Any
-variation in formatting will cause fast-import to reject the value.
+variation in formatting will cause fast-import to reject the value,
+and some sanity checks on the numeric values may also be performed.
+
+`raw-permissive`::
+	This is the same as `raw` except that no sanity checks on
+	the numeric epoch and local offset are performed.  This can
+	be useful when trying to filter or import an existing history
+	with e.g. bogus timezone values.
 
 `rfc2822`::
 	This is the standard email format as described by RFC 2822.
diff --git a/en/git-fetch.txt b/en/git-fetch.txt
index 5b1909fdf4ffcf00d52997eb1a1c2b42385689a7..45b6d8e633ccf20675349b1a23072b90c0a46709 100644
--- a/en/git-fetch.txt
+++ b/en/git-fetch.txt
@@ -255,14 +255,14 @@ refspec.
 * Using refspecs explicitly:
 +
 ------------------------------------------------
-$ git fetch origin +pu:pu maint:tmp
+$ git fetch origin +seen:seen maint:tmp
 ------------------------------------------------
 +
-This updates (or creates, as necessary) branches `pu` and `tmp` in
+This updates (or creates, as necessary) branches `seen` and `tmp` in
 the local repository by fetching from the branches (respectively)
-`pu` and `maint` from the remote repository.
+`seen` and `maint` from the remote repository.
 +
-The `pu` branch will be updated even if it does not fast-forward,
+The `seen` branch will be updated even if it does not fast-forward,
 because it is prefixed with a plus sign; `tmp` will not be.
 
 * Peek at a remote's branch, without configuring the remote in your local
diff --git a/en/git-grep.txt b/en/git-grep.txt
index 6077ff01a4fce65a8f12c2ede83dce562bf0e1c3..518c61fc7331829442cc51a0a8ad8995ae92282d 100644
--- a/en/git-grep.txt
+++ b/en/git-grep.txt
@@ -209,7 +209,7 @@ providing this option will cause it to die.
 	Use \0 as the delimiter for pathnames in the output, and print
 	them verbatim. Without this option, pathnames with "unusual"
 	characters are quoted as explained for the configuration
-	variable core.quotePath (see linkgit:git-config[1]).
+	variable core.quotePath (see glinkgit:it-config[1]).
 
 -o::
 --only-matching::
diff --git a/en/git-http-fetch.txt b/en/git-http-fetch.txt
index 666b042679f405fd1759b42a8d86aafb083e817c..4deb4893f517c3a0bc1e01228f0a28818c05daea 100644
--- a/en/git-http-fetch.txt
+++ b/en/git-http-fetch.txt
@@ -9,7 +9,7 @@ git-http-fetch - Download from a remote Git repository via HTTP
 SYNOPSIS
 --------
 [verse]
-'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
 
 DESCRIPTION
 -----------
@@ -40,6 +40,13 @@ commit-id::
 
 		<commit-id>['\t'<filename-as-in--w>]
 
+--packfile=<hash>::
+	Instead of a commit id on the command line (which is not expected in
+	this case), 'git http-fetch' fetches the packfile directly at the given
+	URL and uses index-pack to generate corresponding .idx and .keep files.
+	The hash is used to determine the name of the temporary file and is
+	arbitrary. The output of index-pack is printed to stdout.
+
 --recover::
 	Verify that everything reachable from target is fetched.  Used after
 	an earlier fetch is interrupted.
diff --git a/en/git-index-pack.txt b/en/git-index-pack.txt
index d5b7560bfe2d51370c313ee006a9f0ed4388eda4..9316d9a80b0d7bb5f83f80400585fe7cb22dc723 100644
--- a/en/git-index-pack.txt
+++ b/en/git-index-pack.txt
@@ -93,6 +93,14 @@ OPTIONS
 --max-input-size=<size>::
 	Die, if the pack is larger than <size>.
 
+--object-format=<hash-algorithm>::
+	Specify the given object format (hash algorithm) for the pack.  The valid
+	values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for
+	the current repository (set by `extensions.objectFormat`), or 'sha1' if no
+	value is set or outside a repository.
++
+This option cannot be used with --stdin.
+
 NOTES
 -----
 
diff --git a/en/git-init.txt b/en/git-init.txt
index f9467cc6a4c791ac3b445f5b0172144f7a1bac15..ddfe265da5b6524f30d972bfea990bb2a89b5611 100644
--- a/en/git-init.txt
+++ b/en/git-init.txt
@@ -11,6 +11,7 @@ SYNOPSIS
 [verse]
 'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
 	  [--separate-git-dir <git dir>] [--object-format=<format>]
+	  [-b <branch-name> | --initial-branch=<branch-name>]
 	  [--shared[=<permissions>]] [directory]
 
 
@@ -67,6 +68,12 @@ repository.
 +
 If this is reinitialization, the repository will be moved to the specified path.
 
+-b <branch-name::
+--initial-branch=<branch-name>::
+
+Use the specified name for the initial branch in the newly created repository.
+If not specified, fall back to the default name: `master`.
+
 --shared[=(false|true|umask|group|all|world|everybody|0xxx)]::
 
 Specify that the Git repository is to be shared amongst several users.  This
diff --git a/en/git-ls-remote.txt b/en/git-ls-remote.txt
index 0a5c8b7d493efd0162774790b4ba1cab67e4c7db..492e573856f24f6444fefb842e8ee733fa95be25 100644
--- a/en/git-ls-remote.txt
+++ b/en/git-ls-remote.txt
@@ -101,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
 c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
 0918385dbd9656cab0d1d81ba7453d49bbc16250	refs/tags/junio-gpg-pub
-$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
+$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
 5fe978a5381f1fbad26a80e682ddd2a401966740	refs/heads/master
-c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/pu
+c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/seen
 $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
 $ git ls-remote --tags korg v\*
 d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
diff --git a/en/git-rebase.txt b/en/git-rebase.txt
index 4624cfd28838054f814d07366810110732e5a3bb..374d2486f71c6659d48ea6105e877d89b9fe8d28 100644
--- a/en/git-rebase.txt
+++ b/en/git-rebase.txt
@@ -259,7 +259,7 @@ See also INCOMPATIBLE OPTIONS below.
 	unchanged as a result. If a temporary stash entry was created
 	using --autostash, it will be saved to the stash list.
 
---apply:
+--apply::
 	Use applying strategies to rebase (calling `git-am`
 	internally).  This option may become a no-op in the future
 	once the merge backend handles everything the apply one does.
diff --git a/en/git-remote.txt b/en/git-remote.txt
index 32b6e79c31e09ed1ade299b3daacf7249594f6a8..9659abbf8e08e19076b6ac18e0c9ea75489fd68d 100644
--- a/en/git-remote.txt
+++ b/en/git-remote.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git remote' [-v | --verbose]
-'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
+'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
 'git remote rename' <old> <new>
 'git remote remove' <name>
 'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
@@ -35,7 +35,7 @@ OPTIONS
 -v::
 --verbose::
 	Be a little more verbose and show remote url after name.
-	NOTE: This must be placed between `remote` and subcommand.
+	NOTE: This must be placed between `remote` and `subcommand`.
 
 
 COMMANDS
@@ -46,7 +46,7 @@ subcommands are available to perform operations on the remotes.
 
 'add'::
 
-Add a remote named <name> for the repository at
+Adds a remote named <name> for the repository at
 <url>.  The command `git fetch <name>` can then be used to create and
 update remote-tracking branches <name>/<branch>.
 +
@@ -109,13 +109,13 @@ With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
 +
 With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
 symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
-`HEAD` is pointed at `next`, `git remote set-head origin -a` will set
+`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
 the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
 only work if `refs/remotes/origin/next` already exists; if not it must be
 fetched first.
 +
-Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git
-remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to
+Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., "git
+remote set-head origin master" will set the symbolic-ref `refs/remotes/origin/HEAD` to
 `refs/remotes/origin/master`. This will only work if
 `refs/remotes/origin/master` already exists; if not it must be fetched first.
 +
@@ -127,7 +127,7 @@ This can be used to track a subset of the available remote branches
 after the initial setup for a remote.
 +
 The named branches will be interpreted as if specified with the
-`-t` option on the `git remote add` command line.
+`-t` option on the 'git remote add' command line.
 +
 With `--add`, instead of replacing the list of currently tracked
 branches, adds to that list.
@@ -181,13 +181,13 @@ fetch --prune <name>`, except that no new references will be fetched.
 See the PRUNING section of linkgit:git-fetch[1] for what it'll prune
 depending on various configuration.
 +
-With `--dry-run` option, report what branches would be pruned, but do not
+With `--dry-run` option, report what branches will be pruned, but do not
 actually prune them.
 
 'update'::
 
 Fetch updates for remotes or remote groups in the repository as defined by
-`remotes.<group>`. If neither group nor remote is specified on the command line,
+remotes.<group>.  If neither group nor remote is specified on the command line,
 the configuration parameter remotes.default will be used; if
 remotes.default is not defined, all remotes which do not have the
 configuration parameter remote.<name>.skipDefaultUpdate set to true will
diff --git a/en/git-show-index.txt b/en/git-show-index.txt
index 424e4ba84cf9b0444a41f0a163de0a58a6ac378a..39b1d8eaa1456f60af07de2e30f0653f9d5efd64 100644
--- a/en/git-show-index.txt
+++ b/en/git-show-index.txt
@@ -9,7 +9,7 @@ git-show-index - Show packed archive index
 SYNOPSIS
 --------
 [verse]
-'git show-index'
+'git show-index' [--object-format=<hash-algorithm>]
 
 
 DESCRIPTION
@@ -36,6 +36,15 @@ Note that you can get more information on a packfile by calling
 linkgit:git-verify-pack[1]. However, as this command considers only the
 index file itself, it's both faster and more flexible.
 
+OPTIONS
+-------
+
+--object-format=<hash-algorithm>::
+	Specify the given object format (hash algorithm) for the index file.  The
+	valid values are 'sha1' and (if enabled) 'sha256'.  The default is the
+	algorithm for the current repository (set by `extensions.objectFormat`), or
+	'sha1' if no value is set or outside a repository..
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/en/git-submodule.txt b/en/git-submodule.txt
index c9ed2bf3d5c5681e26cd408125f489f358294a7c..7e5f995f77e48cdc8e9c1b6b58dec8f2896b32cf 100644
--- a/en/git-submodule.txt
+++ b/en/git-submodule.txt
@@ -183,7 +183,7 @@ set-branch (-d|--default) [--] <path>::
 	Sets the default remote tracking branch for the submodule. The
 	`--branch` option allows the remote branch to be specified. The
 	`--default` option removes the submodule.<name>.branch configuration
-	key, which causes the tracking branch to default to 'master'.
+	key, which causes the tracking branch to default to the remote 'HEAD'.
 
 set-url [--] <path> <newurl>::
 	Sets the URL of the specified submodule to <newurl>. Then, it will
@@ -284,7 +284,7 @@ OPTIONS
 	`.gitmodules` for `update --remote`.  A special value of `.` is used to
 	indicate that the name of the branch in the submodule should be the
 	same name as the current branch in the current repository.  If the
-	option is not specified, it defaults to 'master'.
+	option is not specified, it defaults to the remote 'HEAD'.
 
 -f::
 --force::
@@ -322,10 +322,10 @@ OPTIONS
 	the superproject's recorded SHA-1 to update the submodule, use the
 	status of the submodule's remote-tracking branch.  The remote used
 	is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
-	The remote branch used defaults to `master`, but the branch name may
-	be overridden by setting the `submodule.<name>.branch` option in
-	either `.gitmodules` or `.git/config` (with `.git/config` taking
-	precedence).
+	The remote branch used defaults to the remote `HEAD`, but the branch
+	name may be overridden by setting the `submodule.<name>.branch`
+	option in either `.gitmodules` or `.git/config` (with `.git/config`
+	taking precedence).
 +
 This works for any of the supported update procedures (`--checkout`,
 `--rebase`, etc.).  The only change is the source of the target SHA-1.
diff --git a/en/git-worktree.txt b/en/git-worktree.txt
index 85d92c9761da226010d1fffe20bbbfc404680c66..4796c3c05ef7e55d883f6db03767d9953c97e6da 100644
--- a/en/git-worktree.txt
+++ b/en/git-worktree.txt
@@ -126,7 +126,9 @@ OPTIONS
 	locked working tree path, specify `--force` twice.
 +
 `move` refuses to move a locked working tree unless `--force` is specified
-twice.
+twice. If the destination is already assigned to some other working tree but is
+missing (for instance, if `<new-path>` was deleted manually), then `--force`
+allows the move to proceed; use --force twice if the destination is locked.
 +
 `remove` refuses to remove an unclean working tree unless `--force` is used.
 To remove a locked working tree, specify `--force` twice.
diff --git a/en/git.txt b/en/git.txt
index 12890841c45cb38b1cae0f1149635b9f7cc385a0..3e50065198891b8f889d7905d8e0573ca791f02f 100644
--- a/en/git.txt
+++ b/en/git.txt
@@ -721,8 +721,6 @@ of clones and fetches.
 	Enables a curl full trace dump of all incoming and outgoing data,
 	including descriptive information, of the git transport protocol.
 	This is similar to doing curl `--trace-ascii` on the command line.
-	This option overrides setting the `GIT_CURL_VERBOSE` environment
-	variable.
 	See `GIT_TRACE` for available trace output options.
 
 `GIT_TRACE_CURL_NO_DATA`::
@@ -777,11 +775,10 @@ for full details.
 	See `GIT_TRACE2` for available trace output options and
 	link:technical/api-trace2.html[Trace2 documentation] for full details.
 
-`GIT_REDACT_COOKIES`::
-	This can be set to a comma-separated list of strings. When a curl trace
-	is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header
-	sent by the client is dumped, values of cookies whose key is in that
-	list (case-sensitive) are redacted.
+`GIT_TRACE_REDACT`::
+	By default, when tracing is activated, Git redacts the values of
+	cookies, the "Authorization:" header, and the "Proxy-Authorization:"
+	header. Set this variable to `0` to prevent this redaction.
 
 `GIT_LITERAL_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
diff --git a/en/pretty-formats.txt b/en/pretty-formats.txt
index 547a55246302f91d6673db79228e08c6de95a286..84bbc7439a601b2e18a7ea48af9cfcdd62353e64 100644
--- a/en/pretty-formats.txt
+++ b/en/pretty-formats.txt
@@ -196,8 +196,8 @@ The placeholders are:
 '%ce':: committer email
 '%cE':: committer email (respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%cl':: author email local-part (the part before the '@' sign)
-'%cL':: author local-part (see '%cl') respecting .mailmap, see
+'%cl':: committer email local-part (the part before the '@' sign)
+'%cL':: committer local-part (see '%cl') respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%cd':: committer date (format respects --date= option)
 '%cD':: committer date, RFC2822 style
diff --git a/po/documentation.de.po b/po/documentation.de.po
index 450c9f996a2a7c8915317edb3dd80bc16e602dad..4c80166940614d22d7c2afae4f2cd199a3f9dacd 100644
--- a/po/documentation.de.po
+++ b/po/documentation.de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-06-06 10:46+0000\n"
 "Last-Translator: Dieter Ziller <max123kl@ziller.de>\n"
 "Language-Team: Matthias Aßhauer <mha1993@live.de>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Generator: Weblate 4.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -136,7 +136,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -484,7 +484,7 @@ msgid "Get and set repository or global options."
 msgstr "Repositoryweite oder globale Optionen lesen und setzen."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -496,7 +496,7 @@ msgid "Git data exporter."
 msgstr "Export-Tool für Git-Daten."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2044,7 +2044,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren."
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr "KONFIGURATIONSDATEI"
@@ -4345,7 +4345,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Änderungen der Leerzeichen am Zeilenende (EOL) ignorieren."
@@ -4357,7 +4357,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "Veränderungen in der Anzahl der Leerzeichen ignorieren.  Dadurch werden Leerzeichen am Zeilenende ignoriert und alle anderen Zeilenfolgen mit einem oder mehreren Leerzeichen als gleichwertig betrachtet."
@@ -4912,259 +4912,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<Pfad>]"
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<wenn>]"
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<Präfix>"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<Präfix>"
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<Präfix>"
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5302,7 +5308,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr "Siehe auch die Konfigurationsvariable `fetch.negotiationAlgorithm`, die in linkgit:git-config[1] dokumentiert ist."
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5442,7 +5448,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5598,7 +5604,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr "Wird diese Option angegeben und das anzufordernde Repository mit 'git fetch-pack' gehandhabt wird, wird dem Befehl `--exec=<upload-pack>` übergeben, um den auf der entfernten Seite auszuführenden Befehl anzugeben."
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5610,13 +5616,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5758,7 +5764,7 @@ msgstr ""
 "\t  [--] [<Pfadspezifikation>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "BESCHREIBUNG"
@@ -5800,7 +5806,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Bitte lesen Sie linkgit:git-commit[1] für Alternativen zum Hinzufügen von Inhalt zu einem Commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPTIONEN"
@@ -6082,7 +6088,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Diese Option kann dazu verwendet werden, Befehlszeilenoptionen von der Liste von Dateien zu trennen. Dies ist sinnvoll, wenn Dateinamen mit Befehlszeilenoptionen verwechselt werden könnten."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "BEISPIELE"
@@ -6460,7 +6466,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "Ändern des Inhalts von Kontextzeilen oder entfernen von Zeilen"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "SIEHE AUCH"
@@ -6472,13 +6478,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Teil der linkgit:git[1] Suite"
@@ -7235,7 +7241,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7824,7 +7830,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9204,7 +9210,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9817,7 +9823,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9943,47 +9949,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "-/ <path>"
 msgid "-o <path>"
 msgstr "-/ <Pfad>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--output-directory <dir>"
 msgid "--output-directory <path>"
 msgstr "--output-directory <Verzeichnis>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--date <format>"
 msgid "-s <format>"
 msgstr "--date <Format>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--format <format>"
 msgid "--suffix <format>"
 msgstr "--format <Format>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10344,7 +10356,7 @@ msgstr "git-cat-file - Inhalt oder Informationen zu Typ und Größe für Reposit
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11929,7 +11941,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -12472,10 +12484,10 @@ msgstr "$ git checkout mytopic\n"
 msgid "However, your \"wrong\" branch and correct `mytopic` branch may differ in files that you have modified locally, in which case the above checkout would fail like this:"
 msgstr "Der \"falsche\" Branch und der korrekte Branch \"mytopic\" können sich in lokal geänderten Dateien unterscheiden, was daz führt, dass der obige Checkout folgendermaßen fehlschlägt:"
 
+#. type: delimited block -
 # git-checkout.txt is not up to date. The fuzzy msgid is the message prior to 142183d0 2010-07-09 "checkout: accord documentation to what git does", the msgid is the message in the documentation afterwards.
 # At that time there weren't even po files in the git tree. This message does not exist since 23cbf11b 2010-08-11 "merge-recursive: porcelain messages for checkout".
 # The current message is "Your local changes to the following files would be overwritten by merge:\n%%s" as of 2e3926b9 2016-05-13 "i18n: unpack-trees: avoid substituting only a verb in sentences"
-#. type: delimited block -
 #: en/git-checkout.txt:561
 #, fuzzy, no-wrap, priority:240
 #| msgid ""
@@ -13788,7 +13800,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr "Unterdrückt das Abrufen (checkout) von HEAD, nachdem das Klonen fertig ist."
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13884,7 +13896,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr "Wurde diese Option angegeben und der Zugriff auf das zu klonende Repository erfolgt über SSH, so wird damit ein Nicht-Standardpfad für den Befehlsaufruf am anderen Ende angegeben."
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template=<Template_Directory>"
@@ -13969,8 +13981,9 @@ msgstr "Kann in Verbindung mit `--single-branch` verwendet werden, um einen Bran
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<Pfadspezifikation]"
 
 #. type: Plain text
@@ -14010,7 +14023,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr "Alle geklonten Submodule verwenden den Status der Remote-Tracking-Branch des Submoduls, um das Submodul zu aktualisieren, aber nicht den registrierten SHA-1 des Hauptprojekts. Das entspricht der Option von `--remote` mit dem Befehl `git submodule update`."
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<Git-Dir>"
@@ -15290,8 +15303,7 @@ msgstr "git-config(1)"
 #: en/git-config.txt:7
 #, priority:100
 msgid "git-config - Get and set repository or global options"
-msgstr ""
-"git-config – Repository eigene oder globale Optionen auslesen und setzen"
+msgstr "git-config – Repository eigene oder globale Optionen auslesen und setzen"
 
 #. type: Plain text
 #: en/git-config.txt:27
@@ -15333,65 +15345,37 @@ msgstr ""
 #: en/git-config.txt:33
 #, priority:100
 msgid "You can query/set/replace/unset options with this command. The name is actually the section and the key separated by a dot, and the value will be escaped."
-msgstr ""
-"Sie können mit diesem Befehl Optionen abfragen/setzen/ersetzen/leeren. Der "
-"Name ist tatsächlich der Abschnitt und der Schlüssel, getrennt durch einen "
-"Punkt, und der Wert wird außer Acht gelassen."
+msgstr "Sie können mit diesem Befehl Optionen abfragen/setzen/ersetzen/leeren. Der Name ist tatsächlich der Abschnitt und der Schlüssel, getrennt durch einen Punkt, und der Wert wird außer Acht gelassen."
 
 #. type: Plain text
 #: en/git-config.txt:40
 #, priority:100
 msgid "Multiple lines can be added to an option by using the `--add` option.  If you want to update or unset an option which can occur on multiple lines, a POSIX regexp `value_regex` needs to be given.  Only the existing values that match the regexp are updated or unset.  If you want to handle the lines that do *not* match the regex, just prepend a single exclamation mark in front (see also <<EXAMPLES>>)."
-msgstr ""
-"Einer Option können mehrere Zeilen hinzugefügt werden, indem Sie die Option "
-"`--add` verwenden.  Wenn Sie eine Option, die auf mehreren Zeilen vorkommen "
-"kann, aktualisieren oder zurücksetzen wollen, muss ein regulärer POSIX-"
-"Ausdruck (regexp) `value_regex` angegeben werden.  Nur die vorhandenen "
-"Werte, die mit dem regexp übereinstimmen, werden aktualisiert oder "
-"zurückgesetzt.  Wenn Sie die Zeilen bearbeiten wollen, die mit dem regulären "
-"Ausdruck *nicht* übereinstimmen, setzen Sie einfach ein einzelnes "
-"Ausrufezeichen davor (siehe auch <<BEISPIELE>>)."
+msgstr "Einer Option können mehrere Zeilen hinzugefügt werden, indem Sie die Option `--add` verwenden.  Wenn Sie eine Option, die auf mehreren Zeilen vorkommen kann, aktualisieren oder zurücksetzen wollen, muss ein regulärer POSIX-Ausdruck (regexp) `value_regex` angegeben werden.  Nur die vorhandenen Werte, die mit dem regexp übereinstimmen, werden aktualisiert oder zurückgesetzt.  Wenn Sie die Zeilen bearbeiten wollen, die mit dem regulären Ausdruck *nicht* übereinstimmen, setzen Sie einfach ein einzelnes Ausrufezeichen davor (siehe auch <<BEISPIELE>>)."
 
 #. type: Plain text
 #: en/git-config.txt:45
 #, priority:100
 msgid "The `--type=<type>` option instructs 'git config' to ensure that incoming and outgoing values are canonicalize-able under the given <type>.  If no `--type=<type>` is given, no canonicalization will be performed. Callers may unset an existing `--type` specifier with `--no-type`."
-msgstr ""
-"Die Option `--type=<Typ>` veranlasst 'git config' zu überprüfen, ob ein- und "
-"ausgehende Werte unter den angegebenen <Typ> zulässig sind.  Wenn kein "
-"`--type=<Typ>` angegeben wird, wird keine Kanonisierung durchgeführt. "
-"Benutzer können einen bestehenden `--type` Bezeichner mit `--no-type` "
-"aufheben."
+msgstr "Die Option `--type=<Typ>` veranlasst 'git config' zu überprüfen, ob ein- und ausgehende Werte unter den angegebenen <Typ> zulässig sind.  Wenn kein `--type=<Typ>` angegeben wird, wird keine Kanonisierung durchgeführt. Benutzer können einen bestehenden `--type` Bezeichner mit `--no-type` aufheben."
 
 #. type: Plain text
 #: en/git-config.txt:51
 #, priority:100
 msgid "When reading, the values are read from the system, global and repository local configuration files by default, and options `--system`, `--global`, `--local`, `--worktree` and `--file <filename>` can be used to tell the command to read from only that location (see <<FILES>>)."
-msgstr ""
-"Standardmäßig werden die Werte aus den lokalen Konfigurationsdateien des "
-"Systems, der globalen Einstellung und der des Repositorys ausgelesen. Die "
-"Optionen `--system`, `--global`, `--local`, `---worktree` und `--file <Datei-"
-"Name>` können verwendet werden, um dem Befehl anzuweisen, nur von diesem "
-"Speicherort zu lesen (siehe den Abschnitt <<DATEIEN>>)."
+msgstr "Standardmäßig werden die Werte aus den lokalen Konfigurationsdateien des Systems, der globalen Einstellung und der des Repositorys ausgelesen. Die Optionen `--system`, `--global`, `--local`, `---worktree` und `--file <Datei-Name>` können verwendet werden, um dem Befehl anzuweisen, nur von diesem Speicherort zu lesen (siehe den Abschnitt <<DATEIEN>>)."
 
 #. type: Plain text
 #: en/git-config.txt:57
 #, priority:100
 msgid "When writing, the new value is written to the repository local configuration file by default, and options `--system`, `--global`, `--worktree`, `--file <filename>` can be used to tell the command to write to that location (you can say `--local` but that is the default)."
-msgstr ""
-"Beim Schreiben wird der neue Wert standardmäßig in die lokale "
-"Konfigurationsdatei des Repositorys geschrieben, und die Optionen `--system`"
-", `--global`, `--worktree`, `--file <filename>` können benutzt werden, um "
-"dem Befehl mitzuteilen, dass er dorthin schreiben soll (Sie können `--local` "
-"angeben, aber das ist schon die Voreinstellung)."
+msgstr "Beim Schreiben wird der neue Wert standardmäßig in die lokale Konfigurationsdatei des Repositorys geschrieben, und die Optionen `--system`, `--global`, `--worktree`, `--file <filename>` können benutzt werden, um dem Befehl mitzuteilen, dass er dorthin schreiben soll (Sie können `--local` angeben, aber das ist schon die Voreinstellung)."
 
 #. type: Plain text
 #: en/git-config.txt:60
 #, priority:100
 msgid "This command will fail with non-zero status upon error.  Some exit codes are:"
-msgstr ""
-"Dieser Befehl schlägt bei einem Fehler mit einem Nicht-Null-Status fehl.  "
-"Einige dieser Exit-Codes sind:"
+msgstr "Dieser Befehl schlägt bei einem Fehler mit einem Nicht-Null-Status fehl.  Einige dieser Exit-Codes sind:"
 
 #. type: Plain text
 #: en/git-config.txt:62
@@ -15427,17 +15411,13 @@ msgstr "Sie versuchen, eine nicht existierende Option aufzuheben (ret=5),"
 #: en/git-config.txt:67
 #, priority:100
 msgid "you try to unset/set an option for which multiple lines match (ret=5), or"
-msgstr ""
-"Sie versuchen, eine Option rückgängig zu machen/einzustellen, für die "
-"mehrere Zeilen übereinstimmen (ret=5), oder"
+msgstr "Sie versuchen, eine Option rückgängig zu machen/einzustellen, für die mehrere Zeilen übereinstimmen (ret=5), oder"
 
 #. type: Plain text
 #: en/git-config.txt:68
 #, priority:100
 msgid "you try to use an invalid regexp (ret=6)."
-msgstr ""
-"Sie versuchen, einen ungültigen regulären Ausdruck (regexp) zu verwenden "
-"(ret=6)."
+msgstr "Sie versuchen, einen ungültigen regulären Ausdruck (regexp) zu verwenden (ret=6)."
 
 #. type: Plain text
 #: en/git-config.txt:70
@@ -15455,9 +15435,7 @@ msgstr "--replace-all"
 #: en/git-config.txt:77
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
-msgstr ""
-"Das Standardverhalten ist, höchstens eine Zeile zu ersetzen. Dies ersetzt "
-"alle Zeilen, die dem Schlüssel entsprechen (und eventuell dem Wert_Regex)."
+msgstr "Das Standardverhalten ist, höchstens eine Zeile zu ersetzen. Dies ersetzt alle Zeilen, die dem Schlüssel entsprechen (und eventuell dem Wert_Regex)."
 
 #. type: Labeled list
 #: en/git-config.txt:78 en/git-update-index.txt:45
@@ -15469,10 +15447,7 @@ msgstr "--add"
 #: en/git-config.txt:82
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the value_regex in `--replace-all`."
-msgstr ""
-"Fügt der Option eine neue Zeile hinzu, ohne bestehende Werte zu ändern.  Das "
-"entspricht der Angabe von '^$' als Regex-Wert (value_regex) in `--replace-"
-"all`."
+msgstr "Fügt der Option eine neue Zeile hinzu, ohne bestehende Werte zu ändern.  Das entspricht der Angabe von '^$' als Regex-Wert (value_regex) in `--replace-all`."
 
 #. type: Labeled list
 #: en/git-config.txt:83
@@ -15484,11 +15459,7 @@ msgstr "--get"
 #: en/git-config.txt:87
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
-msgstr ""
-"Liefert den Wert für einen angegebenen Schlüssel (optional gefiltert durch "
-"einen dem Wert entsprechenden Regex). Gibt Fehlercode 1 zurück, wenn der "
-"Schlüssel nicht gefunden wurde. Wenn mehrere Schlüsselwerte gefunden werden, "
-"wird der letzte Wert zurückgegeben."
+msgstr "Liefert den Wert für einen angegebenen Schlüssel (optional gefiltert durch einen dem Wert entsprechenden Regex). Gibt Fehlercode 1 zurück, wenn der Schlüssel nicht gefunden wurde. Wenn mehrere Schlüsselwerte gefunden werden, wird der letzte Wert zurückgegeben."
 
 #. type: Labeled list
 #: en/git-config.txt:88
@@ -15500,9 +15471,7 @@ msgstr "--get-all"
 #: en/git-config.txt:90
 #, priority:100
 msgid "Like get, but returns all values for a multi-valued key."
-msgstr ""
-"Entspricht `--get`, liefert aber alle Werte eines mehrwertigen Schlüssels "
-"zurück."
+msgstr "Entspricht `--get`, liefert aber alle Werte eines mehrwertigen Schlüssels zurück."
 
 #. type: Labeled list
 #: en/git-config.txt:91
@@ -15514,13 +15483,7 @@ msgstr "--get-regexp"
 #: en/git-config.txt:97
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
-msgstr ""
-"Wie `--get-all`, interpretiert den Namen aber als regulären Ausdruck und "
-"gibt die Schlüsselnamen aus.  Der Abgleich mit regulären Ausdrücken "
-"unterscheidet derzeit zwischen Groß- und Kleinschreibung und erfolgt gegen "
-"eine kanonisierte Version des Schlüssels, in der die Namen von Abschnitt und "
-"Variablen kleingeschrieben werden, die Namen von Unterabschnitten jedoch "
-"nicht."
+msgstr "Wie `--get-all`, interpretiert den Namen aber als regulären Ausdruck und gibt die Schlüsselnamen aus.  Der Abgleich mit regulären Ausdrücken unterscheidet derzeit zwischen Groß- und Kleinschreibung und erfolgt gegen eine kanonisierte Version des Schlüssels, in der die Namen von Abschnitt und Variablen kleingeschrieben werden, die Namen von Unterabschnitten jedoch nicht."
 
 #. type: Labeled list
 #: en/git-config.txt:98
@@ -15532,14 +15495,7 @@ msgstr "--get-urlmatch Name URL"
 #: en/git-config.txt:105
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
-msgstr ""
-"Wenn ein zweiteiliger Name section.key angegeben wird, wird der Wert für "
-"section.<URL>.key zurückgegeben, dessen <URL>-Teil am besten zu der "
-"angegebenen URL passt (wenn kein solcher Schlüssel existiert, wird der Wert "
-"für section.key als Fallback verwendet). Wenn nur der Abschnitt als Name "
-"angegeben wird, geschieht das bei allen Schlüsseln in dem Abschnitt und sie "
-"werden aufgelistet. Falls kein Wert gefunden wird, liefert der Befehl den "
-"Fehlercode 1 zurück."
+msgstr "Wenn ein zweiteiliger Name section.key angegeben wird, wird der Wert für section.<URL>.key zurückgegeben, dessen <URL>-Teil am besten zu der angegebenen URL passt (wenn kein solcher Schlüssel existiert, wird der Wert für section.key als Fallback verwendet). Wenn nur der Abschnitt als Name angegeben wird, geschieht das bei allen Schlüsseln in dem Abschnitt und sie werden aufgelistet. Falls kein Wert gefunden wird, liefert der Befehl den Fehlercode 1 zurück."
 
 #. type: Labeled list
 #: en/git-config.txt:106
@@ -15551,18 +15507,13 @@ msgstr "--global"
 #: en/git-config.txt:111
 #, priority:100
 msgid "For writing options: write to global `~/.gitconfig` file rather than the repository `.git/config`, write to `$XDG_CONFIG_HOME/git/config` file if this file exists and the `~/.gitconfig` file doesn't."
-msgstr ""
-"Bei Schreib-Optionen: schreibt in die globale `~/.gitconfig` Datei anstatt "
-"in die `.git/config` des Repositorys, schreibt in die `$XDG_CONFIG_HOME/git/"
-"config` Datei, wenn diese Datei existiert und die `~/.gitconfig` Datei nicht."
+msgstr "Bei Schreib-Optionen: schreibt in die globale `~/.gitconfig` Datei anstatt in die `.git/config` des Repositorys, schreibt in die `$XDG_CONFIG_HOME/git/config` Datei, wenn diese Datei existiert und die `~/.gitconfig` Datei nicht."
 
 #. type: Plain text
 #: en/git-config.txt:114
 #, priority:100
 msgid "For reading options: read only from global `~/.gitconfig` and from `$XDG_CONFIG_HOME/git/config` rather than from all available files."
-msgstr ""
-"Bei Lese-Optionen: Liest nur aus der globalen `~/.gitconfig` und aus `$"
-"XDG_CONFIG_HOME/git/config`, statt aus allen verfügbaren Dateien."
+msgstr "Bei Lese-Optionen: Liest nur aus der globalen `~/.gitconfig` und aus `$XDG_CONFIG_HOME/git/config`, statt aus allen verfügbaren Dateien."
 
 #. type: Plain text
 #: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135 en/git-config.txt:339
@@ -15580,33 +15531,25 @@ msgstr "--system"
 #: en/git-config.txt:121
 #, priority:100
 msgid "For writing options: write to system-wide `$(prefix)/etc/gitconfig` rather than the repository `.git/config`."
-msgstr ""
-"Bei Schreib-Optionen: schreibt in die systemweite `$(prefix)/etc/gitconfig` "
-"Datei, anstatt im Repository auf `.git/config`."
+msgstr "Bei Schreib-Optionen: schreibt in die systemweite `$(prefix)/etc/gitconfig` Datei, anstatt im Repository auf `.git/config`."
 
 #. type: Plain text
 #: en/git-config.txt:124
 #, priority:100
 msgid "For reading options: read only from system-wide `$(prefix)/etc/gitconfig` rather than from all available files."
-msgstr ""
-"Bei Lese-Optionen: nur aus systemweitem `$(prefix)/etc/gitconfig` lesen, "
-"nicht aus allen verfügbaren Dateien."
+msgstr "Bei Lese-Optionen: nur aus systemweitem `$(prefix)/etc/gitconfig` lesen, nicht aus allen verfügbaren Dateien."
 
 #. type: Plain text
 #: en/git-config.txt:130
 #, priority:100
 msgid "For writing options: write to the repository `.git/config` file.  This is the default behavior."
-msgstr ""
-"Bei Schreib-Optionen: Schreibt in die `.git/config` Datei des Repositorys.  "
-"Dies entspricht dem Standardverhalten."
+msgstr "Bei Schreib-Optionen: Schreibt in die `.git/config` Datei des Repositorys.  Dies entspricht dem Standardverhalten."
 
 #. type: Plain text
 #: en/git-config.txt:133
 #, priority:100
 msgid "For reading options: read only from the repository `.git/config` rather than from all available files."
-msgstr ""
-"Bei Lese-Optionen: nur aus der Repository `.git/config` lesen, nicht aus "
-"allen verfügbaren Dateien."
+msgstr "Bei Lese-Optionen: nur aus der Repository `.git/config` lesen, nicht aus allen verfügbaren Dateien."
 
 #. type: Labeled list
 #: en/git-config.txt:136 en/git-restore.txt:55
@@ -15618,10 +15561,7 @@ msgstr "--worktree"
 #: en/git-config.txt:140
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
-msgstr ""
-"Analog zu `--local', außer dass `.git/config.worktree' gelesen oder "
-"geschrieben wird, sofern `extensions.worktreeConfig` vorhanden ist. Falls "
-"nicht, ist es identisch mit `--local`."
+msgstr "Analog zu `--local', außer dass `.git/config.worktree' gelesen oder geschrieben wird, sofern `extensions.worktreeConfig` vorhanden ist. Falls nicht, ist es identisch mit `--local`."
 
 #. type: Labeled list
 #: en/git-config.txt:141
@@ -15639,9 +15579,7 @@ msgstr "--file Konfigurations-Datei"
 #: en/git-config.txt:144
 #, priority:100
 msgid "Use the given config file instead of the one specified by GIT_CONFIG."
-msgstr ""
-"Verwendet die genannte Konfigurations-Datei anstelle jener, die in "
-"GIT_CONFIG festgelegt ist."
+msgstr "Verwendet die genannte Konfigurations-Datei anstelle jener, die in GIT_CONFIG festgelegt ist."
 
 #. type: Labeled list
 #: en/git-config.txt:145
@@ -15653,12 +15591,7 @@ msgstr "--blob Blob"
 #: en/git-config.txt:151
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
-msgstr ""
-"Analog zu `--file`, aber benutzt den genannten Blob anstelle einer Datei. "
-"Sie können z.B. 'master:.gitmodules' verwenden, um Werte aus der Datei "
-"'.gitmodules' im Master-Branch zu lesen. Siehe den Abschnitt \"REVISIONEN "
-"SPEZIFIZIEREN\" in linkgit:gitrevisions[7] für eine umfassende Liste von "
-"Schreibweisen für Blob-Namen."
+msgstr "Analog zu `--file`, aber benutzt den genannten Blob anstelle einer Datei. Sie können z.B. 'master:.gitmodules' verwenden, um Werte aus der Datei '.gitmodules' im Master-Branch zu lesen. Siehe den Abschnitt \"REVISIONEN SPEZIFIZIEREN\" in linkgit:gitrevisions[7] für eine umfassende Liste von Schreibweisen für Blob-Namen."
 
 #. type: Labeled list
 #: en/git-config.txt:152
@@ -15694,8 +15627,7 @@ msgstr "--unset"
 #: en/git-config.txt:160
 #, priority:100
 msgid "Remove the line matching the key from config file."
-msgstr ""
-"Löscht die Zeile, auf die der Schlüssel passt, aus der Konfigurations-Datei."
+msgstr "Löscht die Zeile, auf die der Schlüssel passt, aus der Konfigurations-Datei."
 
 #. type: Labeled list
 #: en/git-config.txt:161
@@ -15707,17 +15639,13 @@ msgstr "--unset-all"
 #: en/git-config.txt:163
 #, priority:100
 msgid "Remove all lines matching the key from config file."
-msgstr ""
-"Löscht alle Zeilen, auf die der Schlüssel passt, aus der Konfigurations-"
-"Datei."
+msgstr "Löscht alle Zeilen, auf die der Schlüssel passt, aus der Konfigurations-Datei."
 
 #. type: Plain text
 #: en/git-config.txt:167
 #, priority:100
 msgid "List all variables set in config file, along with their values."
-msgstr ""
-"Listet alle in der Konfigurations-Datei gesetzten Variablen mit ihren Werten "
-"auf."
+msgstr "Listet alle in der Konfigurations-Datei gesetzten Variablen mit ihren Werten auf."
 
 #. type: Labeled list
 #: en/git-config.txt:168
@@ -15729,10 +15657,7 @@ msgstr "--type <Typ>"
 #: en/git-config.txt:172
 #, priority:100
 msgid "'git config' will ensure that any input or output is valid under the given type constraint(s), and will canonicalize outgoing values in `<type>`'s canonical form."
-msgstr ""
-"'git config' sorgt dafür, dass jede Eingabe oder Ausgabe unter der/den "
-"angegebenen Typ-Bedingung(en) gültig ist und wird ausgehende Werte in der "
-"zulässigen Form von `<Typ>`ausgeben."
+msgstr "'git config' sorgt dafür, dass jede Eingabe oder Ausgabe unter der/den angegebenen Typ-Bedingung(en) gültig ist und wird ausgehende Werte in der zulässigen Form von `<Typ>`ausgeben."
 
 #. type: Plain text
 #: en/git-config.txt:174
@@ -15744,18 +15669,13 @@ msgstr "Zulässige Werte von `<Typ>` enthalten:"
 #: en/git-config.txt:176
 #, priority:100
 msgid "'bool': canonicalize values as either \"true\" or \"false\"."
-msgstr ""
-"'bool': die Werte entweder als „wahr“ (true) oder „falsch“ (false) "
-"deklarieren."
+msgstr "'bool': die Werte entweder als „wahr“ (true) oder „falsch“ (false) deklarieren."
 
 #. type: Plain text
 #: en/git-config.txt:179
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
-msgstr ""
-"'int': die Werte als einfache Dezimalzahlen deklarieren. Ein optionales "
-"Suffix von 'k', 'm' oder 'g' bewirkt, dass der Wert der Eingabe mit 1024, "
-"1048576 oder 1073741824 multipliziert wird."
+msgstr "'int': die Werte als einfache Dezimalzahlen deklarieren. Ein optionales Suffix von 'k', 'm' oder 'g' bewirkt, dass der Wert der Eingabe mit 1024, 1048576 oder 1073741824 multipliziert wird."
 
 #. type: Plain text
 #: en/git-config.txt:181
@@ -16344,7 +16264,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17773,7 +17693,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -19257,19 +19177,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -19850,7 +19770,7 @@ msgid "The id of a tree object."
 msgstr "SHA1 eines git-Markierungobjektes."
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<Pfad>..."
@@ -19976,12 +19896,19 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff – Zeigt die Unterschiede zwischen Commits, Commit und Arbeitsbereich usw."
 
 #. type: Plain text
-#: en/git-diff.txt:17
-#, ignore-ellipsis, no-wrap, priority:280
+#: en/git-diff.txt:18
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid ""
+#| "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+#| "'git diff' [<options>] <blob> <blob>\n"
+#| "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
@@ -19992,145 +19919,159 @@ msgstr ""
 "'git diff' [<Optionen>] --no-index [--] <Pfad> <Pfad>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:23
-#, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+#: en/git-diff.txt:25
+#, fuzzy, priority:280
+#| msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr "Zeigt die Veränderungen an, die a) zwischen dem Arbeitsbaum und dem Index oder einem Verzeichnisbaum, b) zwischen dem Index und einem Verzeichnisbaum, c) zwischen zwei Verzeichnisbäumen, d) zwischen zwei Blob-Objekten oder e) zwischen zwei Dateien auf der Festplatte bestehen."
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr "Mit dieser Befehlssyntax können die Änderungen angezeigt werden, die Sie relativ zum Index vorgenommen haben (Staging-Area für den nächsten Commit).  Mit anderen Worten, die Unterschiede sind das, was Sie Git mitteilen _könnten_, um es später zum Index hinzuzufügen, aber Sie haben es immer noch nicht getan.  Sie können diese Änderungen mit linkgit:git-add[1] bereitstellen (stagen)."
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr "'git diff' [<Optionen>] --no-index [--] <Pfad> <Pfad>"
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr "Diese Form dient dem Vergleich der beiden angegebenen Pfade auf dem Dateisystem.  Sie können die Option `--no-index` weglassen, wenn Sie den Befehl in einem von Git kontrollierten Arbeitsbereich ausführen und mindestens einer der Pfade außerhalb des Arbeitsbereichs liegt oder wenn Sie den Befehl außerhalb eines von Git kontrollierten Arbeitsbereichs ausführen. Diese Form impliziert die Option `--exit-code`."
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] --cached [<Commit>] [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr "Auf diese Art können Sie sich die Änderungen ansehen, die Sie für den nächsten Commit, relativ zu dem angegebenen <Commit>, vorgenommen haben.  Normalerweise werden Sie einen Vergleich mit dem letzten Commit sehen wollen. Wenn Sie also den <Commit> nicht angeben, wird standardmäßig HEAD verwendet.  Wenn HEAD nicht existiert (z.B. wegen noch nicht erstelltem Branch) und <Commit> nicht angegeben wird, zeigt dies alle Änderungen in der Staging-Area an.  --staged ist ein Synonym für --cached."
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Zeigt die Unterschiede zwischen dem Arbeitsbereich und dem angegebenen <Commit> an.  Sie können HEAD verwenden, um ihn mit dem letzten Commit zu vergleichen oder den Namen eines Branchs, um ihn mit der Spitze eines anderen Branchs zu vergleichen."
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit> <Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Zeigt die Änderungen zwischen zwei beliebigen <Commit>s an."
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit>..<Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Dieser Aufruf bewirkt das Gleiche wie der vorherige. Wird <Commit> auf einer Seite weggelassen, so wird HEAD genommen."
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "'git diff' [<Optionen>] <Commit>\\...<Commit> [--] [<Pfad>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<Optionen>] <Commit>\\...<Commit> [--] [<Pfad>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr "Dieser Befehl zeigt die Änderungen auf dem Branch an, der den zweiten <Commit> enthält, beginnend mit einem gemeinsamen Vorfahren beider <Commit>s, bis zum zweiten <Commit>.  \"git diff A\\...B\" ist äquivalent zu \"git diff $(git merge-base A B) B\".  Sie können einen der beiden <Commit>s weglassen, wodurch stattdessen HEAD eingesetzt wird."
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr "Für alle exotischen Anwendungsfälle, weisen wir darauf hin, dass alle <Commit>s in den vorstehenden Beschreibungen, mit Ausnahme der letzten beiden Varianten, die die \"...\"-Notationen verwenden, beliebige <„Verzeichnis-Bäume“> sein können."
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr "Eine ausführlichere Liste, wie <commit> spezifiziert werden kann, findet sich in linkgit:gitrevisions[7] im Abschnitt „REVISIONEN SPEZIFIZIEREN“.  Allerdings vergleicht \"diff\" immer zwei Versionen (_Endpunkte_) miteinander und keine Bereiche. Die Bereichsnotationen (\"<commit>...<commit>\" und \"<commit>\\...<commit>\") bezeichnen hier also keinen 'Bereich' (Range) wie es im Abschnitt \"BEREICHE FESTLEGEN\" in linkgit:gitrevisions[7] beschrieben ist."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<options>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Auf diese Art lassen sich die Unterschiede zwischen den Rohinhalten zweier Blob-Objekte anzeigen."
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "Vergleicht den Arbeitsbereich mit der \"Basis\"-Version ('base', Stufe #1), „unserer Branch“ ('ours', Stufe #2) oder „deren Branch“ ('theirs', Stufe #3).  Der Index enthält diese Stufen nur für nicht gemergte Einträge, d.h. bei der Auflösung von Konflikten.  Siehe dazu linkgit:git-read-tree[1] Abschnitt „3-Wege-Merge“ für weitere Informationen."
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "Lässt die Diff-Ausgabe für nicht gemergte Beiträge weg und zeigt nur \"Unmerged\" an.  Kann nur verwendet werden, wenn der Arbeitsbereich mit dem Index verglichen wird."
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Die <Pfad>-Parameter, sofern angegeben, werden verwendet, um das diff auf die benannten Pfade zu beschränken (auch Verzeichnisnamen können angegeben werden, um ein diff für alle Dateien darin zu erhalten)."
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "Diverse Methoden zum Überprüfen ihres Arbeitsbereichs"
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20142,31 +20083,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "Änderungen im Arbeitsbereich, die noch nicht im Index für den nächsten Commit vorbereitet wurden."
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr "Änderungen zwischen dem Index und dem letzten Commit. Die Daten, die Sie committen würden, wenn Sie `git commit` ohne die Option `-a` ausführen."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr "Änderungen zwischen dem Index und dem letzten Commit. Das würden Sie committen, wenn Sie \"git commit -a\" ausführen"
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Vergleichen beliebiger Commits"
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20178,31 +20119,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Statt die neuesten Version des aktuellen Branchs zu verwenden, wird die neueste Version der Branch „test“ verglichen."
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Anstatt mit der neuesten Version der Branch „test“ zu vergleichen, wird mit der neuesten Version ('HEAD') der aktuellen Branch verglichen, allerdings ist der Vergleich auf die bezeichnete Datei ('./test') beschränkt."
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Vergleicht die Version *vor* dem letzten Commit mit dem letzten Commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Branches vergleichen"
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20214,31 +20155,31 @@ msgstr ""
 "$ git diff topic...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "Vergleich zwischen den neuesten Versionen der 'topic' und der 'master' Branch."
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "Wie oben."
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "Änderungen, die am Branch 'master' seit Start des Branch 'topic' vorgenommen wurden."
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Die 'diff' Ausgabe einschränken"
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20250,31 +20191,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Zeigt nur die Änderung, Umbenennung und Kopie, aber keine Löschung oder Hinzufügung."
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Zeigt nur Namen und die Art der Änderung, nicht aber die tatsächliche Ausgabe von diff."
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Schränkt den Vergleich auf das benannte Unterverzeichnis ein."
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Manipulation (munging) der 'diff'-Ausgabe"
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20284,21 +20225,22 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "Führt weitere Iterationen durch um Umbenennungen, Kopien und komplett neugeschriebene Teile zu finden (sehr zeitaufwendig!)."
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Ausgabe in umgekehrter Reihenfolge."
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 
 #. type: Title =
@@ -20495,78 +20437,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20575,55 +20529,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20633,25 +20587,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -21099,259 +21087,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -21368,243 +21368,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
-msgstr ""
-"Jeder gültige Git SHA-1-Ausdruck, der zu einem Commit führt.  Siehe "
-"\"REVISIONEN SPEZIFIZIEREN\" in linkgit:gitrevisions[7] für weitere Details."
+msgstr "Jeder gültige Git SHA-1-Ausdruck, der zu einem Commit führt.  Siehe \"REVISIONEN SPEZIFIZIEREN\" in linkgit:gitrevisions[7] für weitere Details."
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21612,259 +21610,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21872,73 +21870,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21950,55 +21948,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -22007,25 +22005,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -22033,19 +22031,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -22055,43 +22053,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -22099,31 +22097,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -22133,25 +22131,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -22161,19 +22159,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -22181,31 +22179,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -22213,67 +22211,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -22281,286 +22279,286 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, fuzzy, no-wrap, priority:100
 #| msgid "--force"
 msgid "force"
 msgstr "--force"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, fuzzy, no-wrap, priority:100
 #| msgid "Notes"
 msgid "notes"
 msgstr "Notes"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, fuzzy, no-wrap, priority:100
 #| msgid "COMMANDS"
 msgid "RESPONSES TO COMMANDS"
 msgstr "COMMANDS"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22569,49 +22567,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22631,7 +22629,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22640,7 +22638,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22651,13 +22649,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22672,13 +22670,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22686,25 +22684,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22713,7 +22711,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22725,309 +22723,309 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, fuzzy, no-wrap, priority:100
 #| msgid "<newbranch>"
 msgid "per branch"
 msgstr "<newbranch>"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, fuzzy, no-wrap, priority:100
 #| msgid "Interactive mode"
 msgid "per active tree"
 msgstr "Interaktiver Modus"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23648,20 +23646,21 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-fetch.txt:259
-#, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
-msgstr ""
+#, fuzzy, no-wrap, priority:220
+#| msgid "$ git fetch origin\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
+msgstr "$ git fetch origin\n"
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27500,7 +27499,7 @@ msgstr ""
 #: en/git-grep.txt:213
 #, fuzzy, priority:100
 #| msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr "Ohne diese Option werden Pfadnamen mit „unüblichen“ Zeichen in Anführungszeichen gesetzt, wie es für die Konfigurations-Variable `core.quotePath` definiert ist (siehe linkgit:git-config[1])."
 
 #. type: Labeled list
@@ -28972,7 +28971,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -29046,12 +29045,25 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, fuzzy, no-wrap, priority:100
+#| msgid "--file=<path>"
+msgid "--packfile=<hash>"
+msgstr "--file=<Pfad>"
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29548,20 +29560,41 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--object-format=<format>"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--object-format=<Format>"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "Spezifiziert das angegebene Objektformat (Hash-Algorithmus) für das Repository.  Die gültigen Werte sind 'sha1' und, falls aktiviert, 'sha256'.  'sha1' ist die Voreinstellung."
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+#, fuzzy, priority:100
+#| msgid "This option may be specified more than once."
+msgid "This option cannot be used with --stdin."
+msgstr "Diese Option kann mehr als einmal angegeben werden."
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 #, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, fuzzy, priority:100
 #| msgid "Same as above."
 msgid "mentioned above."
@@ -29606,7 +29639,7 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init-db – Erstellt ein leeres Git-Repository oder initialisiert ein vorhandenes erneut"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
 #| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29615,6 +29648,7 @@ msgstr "git-init-db – Erstellt ein leeres Git-Repository oder initialisiert ei
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<Template-Verzeichnis>]\n"
@@ -29622,217 +29656,237 @@ msgstr ""
 "\t  [--shared[=<Berechtigungen>]] [Verzeichnis]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "Dieser Befehl erzeugt ein leeres Git-Repository – im Grunde ein `.git`-Verzeichnis mit Unterverzeichnissen für `objects`, `refs/heads`, `refs/tags` und für die Template-Dateien. Eine initiale `HEAD` Datei, die auf den HEAD des Master-Branchs verweist, wird ebenfalls erstellt."
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "Wenn die Umgebungsvariable `$GIT_DIR` gesetzt ist, dann gibt sie einen Pfad an, der anstelle von `./.git` für die Basis des Repositorys verwendet werden soll."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "Wenn das Objektverzeichnis über die Umgebungsvariable `$GIT_OBJECT_DIRECTORY` angegeben wird, werden die SHA1-Verzeichnisse darunter angelegt – andernfalls wird das Standardverzeichnis `$GIT_DIR/objects` verwendet."
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "Das Ausführen von `git init` in einem bestehenden Repository ist ungefährlich. Es wird nichts überschrieben, was dort bereits vorhanden ist. Der Hauptgrund für das erneute Ausführen von `git init` ist das Aufnehmen neu hinzugefügter Templates (oder das Verschieben des Repositorys an einen anderen Ort, wenn `--separate-git-dir` angegeben wird)."
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "Nur Fehler- und Warnmeldungen ausgeben; alle anderen Meldungen werden ausgeblendet."
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "Erstellt ein Bare-Repository. Wenn die Umgebungsvariable `GIT_DIR` nicht festgelegt ist, wird sie auf das aktuelle Arbeitsverzeichnis angewendet."
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--object-format=<Format>"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr "Spezifiziert das angegebene Objektformat (Hash-Algorithmus) für das Repository.  Die gültigen Werte sind 'sha1' und, falls aktiviert, 'sha256'.  'sha1' ist die Voreinstellung."
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "Gib das Verzeichnis an, aus dem Templates verwendet werden sollen (Siehe unten den Abschnitt „TEMPLATE VERZEICHNIS“)."
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "Anstatt das Repository als ein Verzeichnis entweder nach `$GIT_DIR` oder `./.git/` zu initialisieren, wird hier eine Textdatei erstellt, die den Pfad zum eigentlichen Repository enthält.  Diese Datei fungiert als symbolischer Git-Link zum Repository, der vom Dateisystem unabhängig ist."
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "Falls dies eine Neu-Initialisierung ist, wird das Repository auf den angegebenen Pfad verschoben."
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "<branchname>"
+msgid "-b <branch-name"
+msgstr "<branchname>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+#| msgid "--state-branch <branch>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--state-branch <Branch>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr "Bestimmt, dass das Git-Repository von mehreren Benutzern gemeinsam genutzt werden soll. Dadurch können Benutzer, die derselben Gruppe angehören, in dieses Repository pushen. Falls spezifiziert, wird die config-Variable \"core.sharedRepository\" so angelegt, dass Dateien und Verzeichnisse unter `$GIT_DIR` mit den angeforderten Berechtigungen erstellt werden.  Wenn nichts angegeben wird, wird Git die von umask(2) gelieferten Berechtigungen verwenden."
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr "Die Option kann die folgenden Werte annehmen, wobei 'group' die Standardeinstellung ist, falls kein Wert angegeben wird:"
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask' (oder 'false')"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "Verwendet die von umask(2) gelieferten Berechtigungen. Die Voreinstellung, falls `--shared` nicht angegeben ist."
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group' (oder 'true')"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "Das Repository von der Gruppe beschreibbar machen, (mit g+sx, da die Git-Gruppe möglicherweise nicht die primäre Gruppe aller User ist). Das wird verwendet, um die Berechtigungen eines ansonsten sicheren umask(2)-Wertes zu erweitern. Beachten Sie, dass die umask immer noch für die anderen Berechtigungsbits gilt (z.B. wenn umask '0022' ist, wird die Verwendung von 'group' nicht die Leseberechtigungen anderer (Nicht-Gruppen-) Benutzer entfernen). Siehe bei '0xxx' wie die Repository-Berechtigungen genau gesetzt werden."
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all' (oder 'world' oder 'everybody')"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "Das gleiche wie 'group', aber macht das Repository für alle Benutzer lesbar."
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr "'0xxx'"
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr "'0xxx' ist eine Oktalzahl und jede Datei hat den Status '0xxx'. '0xxx' überschreibt den umask(2)-Wert des Benutzers (und entsperrt nicht nur die Berechtigungen, wie es 'group' und 'all' tun). '0640' wird ein Repository erstellen, das gruppenlesbar, aber nicht gruppenbeschreibbar und für andere nicht zugänglich ist. '0660' erzeugt ein Repository, das für den aktuellen Benutzer und die aktuelle Gruppe les- und beschreibbar, aber für andere unzugänglich ist."
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr "Standardmäßig ist das Konfigurationsflag `receive.denyNonFastForwards` in gemeinsam genutzten Repositorys aktiviert, sodass Sie keinen „non-fast-forward“ Push erzwingen können."
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr "Wenn Sie ein 'Directory' (Verzeichnis) angeben, wird der Befehl innerhalb dieses Verzeichnisses ausgeführt. Wenn dieses Verzeichnis nicht existiert, wird es erstellt."
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "TEMPLATE DIRECTORY"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "Dateien und Verzeichnisse im Template-Verzeichnis, deren Name nicht mit einem Punkt beginnt, werden nach der Erstellung in das `$GIT_DIR` kopiert."
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "Das Template-Verzeichnis wird aus folgender Einstellung generiert (Reihenfolge nach Priorität):"
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "dem Argument, das mit der Option `--template` angegeben wurde;"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr "dem Inhalt der Umgebungs-Variablen `$GIT_TEMPLATE_DIR`;"
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "der Konfigurations-Variablen `init.templateDir`; oder"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "dem standardmäßigen Template-Verzeichnis: `/usr/share/git-core/templates`."
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "Das standardmäßige Template-Verzeichnis enthält eine gewisse Verzeichnisstruktur, vorgeschlagene „Ausschlussmuster“ (siehe linkgit:gitignore[5]) und Beispiele für Hook-Dateien."
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr "Die Beispiel-Hooks sind automatisch alle deaktiviert. Diese Hooks können aktiviert werden, indem die Datei-Erweiterung `.sample` entfernt wird."
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr "Siehe linkgit:githooks[5] für generelle Informationen zur Hook-Anwendung."
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr "Ein neues Git-Repository mit einer vorhandenen Code-Basis anlegen"
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29846,19 +29900,19 @@ msgstr ""
 "$ git commit    <3>\n"
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr "Erstellt das Verzeichnis /Pfad/zu/meiner/Code-Basis/.git."
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr "Fügt alle vorhandenen Dateien zum Index hinzu."
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr "Zeichnet den Urzustand als ersten Commit im Verlauf des Repositorys auf."
@@ -31760,9 +31814,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36897,7 +36951,7 @@ msgid "Show progress."
 msgstr "--progress"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -39305,12 +39359,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41901,7 +41951,7 @@ msgstr "git-remote - Einen Satz entfernter Repositories verwalten"
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41925,7 +41975,7 @@ msgstr "Einen Satz Repositories (\"Remotes\"), deren Zweige von Ihnen verfolgt w
 #: en/git-remote.txt:39
 #, fuzzy, priority:220
 #| msgid "Be a little more verbose and show remote url after name."
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr "Sei ein wenig gesprächiger und zeige die entfernte URL nach dem Namen."
 
 #. type: Plain text
@@ -41944,7 +41994,7 @@ msgstr "'add'"
 #: en/git-remote.txt:52
 #, fuzzy, priority:220
 #| msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>.  Fügt einen Remote mit dem Namen <Name> für das Repository auf <URL> hinzu. Der Befehl `git fetch <Name>` kann dann um einen Remote-verfolgenden Zweig <Name>/<Zweig> zu erstellen und zu aktualisieren."
 
 #. type: Plain text
@@ -42059,13 +42109,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -42083,7 +42133,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -42192,7 +42242,7 @@ msgstr ""
 #: en/git-remote.txt:186
 #, fuzzy, priority:220
 #| msgid "With `--dry-run` option, report what branches will be pruned, but do no actually prune them."
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr "Mit der Option `--dry-run`, wird lediglich angezeigt, welche Zweige gelöscht werden würden, sie werden jedoch nicht gelöscht."
 
 #. type: Labeled list
@@ -42205,7 +42255,7 @@ msgstr "'update'"
 #: en/git-remote.txt:195
 #, fuzzy, priority:220
 #| msgid "Fetch updates for a named set of remotes in the repository as defined by remotes.<group>.  If a named group is not specified on the command line, the configuration parameter remotes.default will get used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr "Holt Updates für eine genannte Sammlung von entfernten Repositories, die in remotes.<Gruppe> definiert wurden. Wenn eine genannte Gruppe nicht in der Kommandozeile angegeben wurden, wird der Parameter remotes.default verwendet; wenn remotes.default ebenfalls nicht gesetzt ist, werden alle entfernten Repositories, welche keinen Konfigurationsparameter remote.<Name>.skipDefaultUpdate auf true gesetzt haben, aktualisiert.  (Siehe linkgit:git-config[1])."
 
 #. type: Plain text
@@ -47381,7 +47431,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -47420,6 +47470,13 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "Spezifiziert das angegebene Objektformat (Hash-Algorithmus) für das Repository.  Die gültigen Werte sind 'sha1' und, falls aktiviert, 'sha256'.  'sha1' ist die Voreinstellung."
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -49624,7 +49681,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49756,7 +49813,7 @@ msgstr "-b <Branch>"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49804,7 +49861,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53703,8 +53760,8 @@ msgstr ""
 msgid "`GIT_COMMON_DIR`"
 msgstr "`GIT_COMMON_DIR`"
 
-# noqa
 #. type: Plain text
+# noqa
 #: en/git.txt:495
 #, ignore-ellipsis, priority:100
 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
@@ -54107,13 +54164,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr "Aktiviert allgemeine Ablaufverfolgungsmeldungen, z.B.. Alias-Erweiterung, Ausführung von eingebauten und externen Befehlen."
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr "Wenn diese Variable auf \"1\", \"2\" oder \"true\" (Vergleich ist unabhängig von Groß-/Kleinschreibung) gesetzt ist, werden Ablaufverfolgungsmeldungen nach stderr ausgegeben."
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr "Wenn dieser Variable ein ganzzahliger Wert größer als 2 und kleiner als 10 zugewiesen ist, interpretiert Git diesen Wert als geöffneten Datei-Handle und versucht die Ablaufverfolgungsmeldungen in diese Datei zu schreiben."
@@ -54125,7 +54182,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr "Alternativ kann diese Variable auf einen absoluten Pfad (beginnt mit einem '/'), schreibt Git die Ablaufverfolgungsmeldungen in diese Datei."
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr "Zurücksetzen der Variable oder setzen auf einen leeren Wert, \"0\" oder \"false\" (unabhängig von Groß-/Kleinschreibung) deaktiviert Ablaufverfolgungsmeldungen."
@@ -54227,392 +54284,392 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr "Falls Curl-Ablaufverfolgung aktiviert ist (sieh `GIT_TRACE_CURL` oben), keine Nutzdaten, sondern nur Header und Info-Zeilen ausgegeben."
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr "Alternativ kann diese Variable auf einen absoluten Pfad (beginnt mit einem '/'), schreibt Git die Ablaufverfolgungsmeldungen in diese Datei. Falls der Pfad ein existierendes Verzeichnis ist, werden die Ablaufverfolgungsmeldungen in Dateien (eine pro Prozess), benannt nach dem letzten Teils der SID und einem optionalen Zähler (um Datienamenskollisionen zu vermeiden), in diesem Verzeichnis geschrieben."
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
-msgstr "Dies kann als Komma-getrennte Zeichenkettenliste gesetzt werden. Wenn Curl-Ablaufverfolgung aktiviert ist, werden immer, wenn ein \"Cookies:\"-header, der vom Client gesendet wurde ausgegeben wird, die Inhalte der Cookies, deren Schlüssel in der Liste enthalten sind (Groß-/Kleinschreibung beachten) zensiert."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
+msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen buchstäblich und nicht als Glob-Muster zu interpreieren. Zum Beispiel sucht `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` nach Commits, die den Pfad `*.c` verrändern, nicht nach Dateien, die das Muster `*.c` betrifft. Das kann gewollt sein, wenn tatsächliche Pfade an Git übergeben werden (z.B. Pfade die von `git ls-tree` ausgegeben wurden oder aus Diffausgaben mit `--raw` o.ä. stammen)."
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen als Glob-Muster zu behandeln (Pfadspezifikationsangabe \"glob\")."
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr "Das Setzen dieser Variable auf 1 veranlasst Git alle Pfadspezifikationen buchstäblich zu interpreieren (Pfadspezifikationsangabe \"literal\")."
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr "Das Setzen dieser Variable auf 1 veranlasst Git bei allen Pfadspezifikationen Groß- und Kleinschreibung zu ignorieren."
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr "Wenn eine Referenz aktualisiert wird, werden Reflog-Einträge erstellt, um den Grund, dass die Referenz aktualisiert wurde (üblicherweise ist das die Bezeichnung des hochrangigen Befehls, der die Referenz aktualisiert hat), sowie den alten und neuen Wert der Referenz nachvollziehen zu können. Geskriptete Porcelain-Befehle können die Hilfsfunktion set_reflog_action in `git-sh-setup` um ihren Namen in diese Variable einzutragen, wenn sie vom Endbenutzer als Befehl der obersten Ebene aufgerufen werden, damit dieser im Reflog festgehalten wird."
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr "Nur zum internen Gebrauch. Wird beim Handshake des Git Wire Protokolls verwendet. Enthält eine durch Doppelpunkte ':' getrennte Liste von Schlüsseln mit optionalen Werten 'schlüssel[=wert]'. Unbekannte Schlüssel und Werte müssen ignoriert werden."
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr "Nur unter Windows: Erlaubt es die Standardeingabe/-ausgabe/-fehlerausgabe auf die in diesen Umgebungsvariablen angegebenen Pfade umzuleiten. Dies ist besonders hilfreich bei Multithreading-Anwendungen bei denen die Standardmethode diese Datenströme mit `CreateProcess()` keine Option ist, da das bewirken würde, dass alle weiteren Prozesse diese erben, was reguläre Git-Operationen blockieren kann. Der Hauptanwendungsfall ist die Verwendung von benannten Pipes (z.B. `\\\\.\\pipe\\my-git-stdin-123`)."
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr "Es werden zwei besondere Werte unterstützt: `off` deaktiviert den entsprechenden Standarddatenstrom und wenn `GIT_REDIRECT_STDERR` auf `2>&1` gesetzt ist wird die Standardfehlerausgabe in den selben Strom wie die Standardausgabe geleitet."
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr "`GIT_PRINT_SHA1_ELLIPSIS` (veraltet)"
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr "Diskussion[[Discussion]]"
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr "Mehr Details zum den folgenden Themen sind im link:user-manual.html#git-concepts[Kapitel \"Git concepts\" des Benutzerhandbuchs] und unter linkgit:gitcore-tutorial[7] verfügbar."
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr "Ein Git-Projekt besteht normalerweise aus einem Arbeitsverzeichnis mit einem „.git“-Unterverzeichnis auf der obersten Ebene. Das „.git“-Verzeichnis enthält unter anderem eine komprimierte Objektdatenbank, die den vollständigen Projektverlauf wiedergibt, eine „Index“-Datei, die diesen Verlauf mit dem aktuellen Inhalt des Arbeitsbereichs verknüpft und Pointer in diesem Verlauf benennt, wie z.B. Tags und Branch-Heads."
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr "Die Objektdatenbank enthält drei Hauptarten von Objekten: Blobs, die Dateiinformationen enthalten; Trees, die auf Blobs und andere Trees verweisen, um Verzeichnisstrukturen abzubilden; und Commits, die jeweils auf einen einzelnen Tree und eine gewisse Anzahl Eltern-Commits verweisen."
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr "Der Commit, in anderen Systemen auch „Changeset“ oder „Version“ genannt, stellt einen Schritt in der Projekthistorie dar und jeder Eltern-Commit stellt einen direkt vorhergehenden Schritt dar. Commits mit mehr als einem Eltern-Commit stellen Zusammenführungen verschiedener Entwicklungslinien dar."
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr "Alle Objekte werden mit dem SHA1-Hash ihres Inhalts bezeichnet. Dieser wird normalerweise als 40-stellige Hexadezimalzahl angegeben. Diese Bezeichnungen sind eindeutig. Ein einzelner signierter Commit kann die gesamte Historie bis zu diesem Commit verifizieren. Zu diesem Zweck wird eine vierte Objektart, die Markierung angeboten."
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr "Beim Erstellen werden Objekte in individuellen Dateien gespeichert, können aber aus Effizienzgründen später zusammen in sogenannten Packdateien komprimiert werden."
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr "Benannte Zeiger, die Referenzen genannt werden, markieren interessante Punkte in der Historie. Eine Referenz kann auf ein Objekt oder eine andere Referenz verweisen. Referenzen deren Bezeichnung mit `ref/head/` beginnt enthalten die SHA1-Bezeichnung de letzten Commits  (der „Spitze“) eines Entwicklungszweigs. SHA1-Bezeichnungen interessanter Markierungen werden  unter `ref/tags/` gespeichert. Eine besondere Referenz namens `HEAD` verweist auf die Bezeichnung des momnentan ausgecheckten Entwicklungszweigs."
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr "Die Indexdatei wird mit einer Liste aller Pfade, sowie pro Pfad einem Blob-Objekt und einer Reihe von Attributen initialisiert. Das Blob-Objekt repräsentiert die Inhalte der Datei gemäß der Spitze des aktuellen Entwicklungszweigs. Die Attribute (zuletzt geändert, Größe, etc.) werden von der entsprechenden Datei im Arbeitsverzeichnis genommen. Spätere Änderungen am Arbeitsverzeichnis können durch Vergleichen dieser Attribute ermittelt werden. Der Index kann mit neuen Inhalten aktualisiert werden und aus dem Inhalt des Indexes können neue Commits erstellt werden."
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr "Der Index kann auch mehrere Einträge (genannt „Stages“) eines bestimmten Pfads enthalten. Diese Stages enthalten verschiedene noch nicht zusammengeführte Versionen einer Datei während eines Merges."
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr "WEITERE DOKUMENTATION"
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr "Siehe die Verweise im Abschnitt „Beschreibung“ um mit der Verwendung von Git zu beginnen. Nachfolgend finden Sie vermutlich mehr Details als es für einen erstmaligen Benutzer nötig ist."
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr "Das link:user-manual.html#git-concepts[Kapitel „Git concepts“ des Benutzerhandbuchs] und linkgit:gitcore-tutorial[7] stellen eine Einführung in die zugrundeliegende Git-Architektur zur Verfügung."
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr "Siehe linkgit:gitworkflows[7] für eine Übersicht über empfohlene Arbeitsabläufe."
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr "In den link:howto-index.html[Howto]-Dokumenten finden Sie nützliche Beispiele."
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr "Die Interna sind in der link:technical/api-index.html[Git-API-Dokumentation] dokumentiert."
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr "Für Benutzer, die von CVS migrieren könnte auch linkgit:gitcvs-migration[7] interessant sein."
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr "Autoren"
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr "Git wurde ursprünglich von Linus Torvalds geschrieben und wird jetzt von Junio C Hamano weitergeführt. Zahlreiche Beiträge sind über die Git-E-Mail-Verteilerliste <git@vger.kernel.org> entstanden. Unter http://www.openhub.net/p/git/contributors/summary steht eine etwas vollständigere Liste der Mitwirkenden bereit."
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr "Wenn sie einen Klon von git.git haben, können Sie sich mit linkgit:git-shortlog[1] und linkgit:git-blame[1] die Urheber einzelner Projektteile anzeigen lassen."
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr "Fehler melden"
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, fuzzy, priority:100
 #| msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://public-inbox.org/git for previous bug reports and other discussions."
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr "Melden Sie Fehler (auf Englisch) an die Git-E-Mail-Verteilerliste <git@vger.kernel.org>. Sie müssen die Verteilerliste nicht abonieren um eine Nachricht zu senden. Bisherige Fehlermeldungen und andere Diskusionen können im Listenarchiv unter https://public-inbox.org/git eingesehen werden."
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr "Sicherheitsrelevante Fehler sollten vetraulich an die Git-Sicherheits-E-Mail-Verteilerliste <git-security@googlegroups.com> gemeldet werden."
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[Das Git-Benutzerhandbuch], linkgit:gitworkflows[7]"
@@ -56865,295 +56922,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr "-b <Neuer-Branch>"
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr "-B <Neuer-Branch>"
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr "Unterdrücke Hinweisnachrichten in kombination mit 'add'."
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr "--reason <Zeichenkette>"
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr "$ git config extensions.worktreeConfig true\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -57163,19 +57220,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -57184,7 +57241,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -57193,7 +57250,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -57202,13 +57259,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -57220,7 +57277,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -60004,7 +60061,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -60168,6 +60225,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -60177,7 +60240,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65916,6 +65979,13 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
+#~ msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+#~ msgstr "Dies kann als Komma-getrennte Zeichenkettenliste gesetzt werden. Wenn Curl-Ablaufverfolgung aktiviert ist, werden immer, wenn ein \"Cookies:\"-header, der vom Client gesendet wurde ausgegeben wird, die Inhalte der Cookies, deren Schlüssel in der Liste enthalten sind (Groß-/Kleinschreibung beachten) zensiert."
+
 #~ msgid "By default, the restore sources for working tree and the index are the index and `HEAD` respectively. `--source` could be used to specify a commit as the restore source."
 #~ msgstr "Die Wiederherstellungsquellen für den Arbeitsbereich und den Index (Staging Area) sind normalerweise der Index bzw. `HEAD`. `--source` könnte benutzt werden, um einen bestimmten Commit als Wiederherstellungsquelle anzugeben."
 
diff --git a/po/documentation.es.po b/po/documentation.es.po
index 100f07801a2896f2a0802a1483bf9d1f9704d9cc..259c059d64b2e4607d374fb774f557e1bd33add4 100644
--- a/po/documentation.es.po
+++ b/po/documentation.es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-04-28 14:59+0000\n"
 "Last-Translator: Adolfo Jayme Barrientos <fitojb@ubuntu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 4.0.2\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -133,7 +133,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -481,7 +481,7 @@ msgid "Get and set repository or global options."
 msgstr "Configurar repositorio u opciones globales"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +493,7 @@ msgid "Git data exporter."
 msgstr "Exportador de data Git"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2041,7 +2041,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Actualiza el archivo de información auxiliar para ayudar a los servidores dumb"
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4314,7 +4314,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignorar cambios de espacios en blanco al finalizar renglón."
@@ -4326,7 +4326,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4881,259 +4881,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Tratar todos los archivos como si fueran de texto."
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignorar cambios cuyos renglones están todos vacíos."
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Mostrar el prefijo de origen indicado en lugar de «a/»."
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Mostrar el prefijo de destino indicado en lugar de «b/»."
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "No mostrar ningún prefijo de origen o de destino."
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, fuzzy, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "anteponer un prefijo adicional a cada línea mostrada"
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5271,7 +5277,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5411,7 +5417,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5567,7 +5573,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5579,13 +5585,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5722,7 +5728,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5764,7 +5770,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6046,7 +6052,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6400,7 +6406,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6412,13 +6418,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7175,7 +7181,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7763,7 +7769,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9131,7 +9137,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9725,7 +9731,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9851,46 +9857,52 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10245,7 +10257,7 @@ msgstr "Proveer contenido o tipo y tamaño de información para objetos de repos
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11827,7 +11839,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13620,7 +13632,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13716,7 +13728,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13801,9 +13813,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13842,7 +13855,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15984,7 +15997,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17409,7 +17422,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18884,19 +18897,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19466,7 +19479,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19592,156 +19605,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19750,31 +19776,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19783,31 +19809,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19816,31 +19842,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19849,31 +19875,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19881,22 +19907,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20092,78 +20119,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20172,55 +20211,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20230,25 +20269,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20686,259 +20759,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, fuzzy, no-wrap, priority:100
 msgid "Commands"
 msgstr "comando"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20955,241 +21040,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21197,259 +21282,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21457,73 +21542,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21535,55 +21620,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21592,25 +21677,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21618,19 +21703,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21640,43 +21725,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21684,31 +21769,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21718,25 +21803,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21746,19 +21831,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21766,31 +21851,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21798,67 +21883,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21866,283 +21951,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "forzar"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr "notas"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, fuzzy, no-wrap, priority:100
 msgid "done"
 msgstr "none"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22151,49 +22236,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22213,7 +22298,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22222,7 +22307,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22233,13 +22318,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22254,13 +22339,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22268,25 +22353,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22295,7 +22380,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22307,307 +22392,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23218,19 +23303,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27026,7 +27111,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28475,7 +28560,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28546,12 +28631,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29042,20 +29139,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29097,226 +29212,245 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init: crear un repositorio de Git vacío o reinicializar uno ya existente"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+msgid "-b <branch-name"
+msgstr "'branch'"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29326,19 +29460,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31221,9 +31355,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36307,7 +36441,7 @@ msgid "Show progress."
 msgstr "mostrar progreso"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38700,12 +38834,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41279,7 +41409,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41302,7 +41432,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41320,7 +41450,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41428,13 +41558,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41452,7 +41582,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41560,7 +41690,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41572,7 +41702,7 @@ msgstr "update"
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46704,7 +46834,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46743,6 +46873,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48926,7 +49062,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49058,7 +49194,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49106,7 +49242,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53356,13 +53492,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53374,7 +53510,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53476,391 +53612,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56110,295 +56246,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56408,19 +56544,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56429,7 +56565,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56438,7 +56574,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56447,13 +56583,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56465,7 +56601,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59225,7 +59361,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59386,6 +59522,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59395,7 +59537,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65101,6 +65243,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po
index 3ff9d5948b0d10c89ac6332d739258cffbbad2cd..27b5d792593203109a87ac961331a3f938504c70 100644
--- a/po/documentation.es_MX.po
+++ b/po/documentation.es_MX.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2019-10-05 21:56+0000\n"
 "Last-Translator: Farándula <farandula@versoblanco.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 3.9-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -131,7 +131,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -481,7 +481,7 @@ msgid "Get and set repository or global options."
 msgstr "Configurar repositorio u opciones globales"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +493,7 @@ msgid "Git data exporter."
 msgstr "Exportador de data Git"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2041,7 +2041,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Actualiza el archivo de información auxiliar para ayudar a los servidores dumb"
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4314,7 +4314,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, fuzzy, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "ignorar cambios en espacios en blanco en EOL"
@@ -4326,7 +4326,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4881,259 +4881,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, fuzzy, priority:280
 msgid "Treat all files as text."
 msgstr "tratar todos los archivos como texto"
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, fuzzy, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "ignora cambios cuyas líneas son todas en blanco"
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "mostrar el prefijo de destino en lugar de \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, fuzzy, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "no mostrar ningún prefijo de fuente o destino"
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, fuzzy, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "anteponer un prefijo adicional a cada línea mostrada"
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5271,7 +5277,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5411,7 +5417,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5567,7 +5573,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5579,13 +5585,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5731,7 +5737,7 @@ msgstr ""
 "\t  [--chmod=(+|-)x] [--] [<ruta>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "DESCRIPCIÓN"
@@ -5773,7 +5779,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Véase linkgit:git-commit[1] para otras formas de añadir contenido a un commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPCIONES"
@@ -6056,7 +6062,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6410,7 +6416,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6422,13 +6428,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7185,7 +7191,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7773,7 +7779,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9141,7 +9147,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9735,7 +9741,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9861,46 +9867,52 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10255,7 +10267,7 @@ msgstr "Proveer contenido o tipo y tamaño de información para objetos de repos
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11837,7 +11849,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13631,7 +13643,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13727,7 +13739,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13812,9 +13824,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13853,7 +13866,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15995,7 +16008,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17420,7 +17433,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18895,19 +18908,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19477,7 +19490,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19603,156 +19616,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19761,31 +19787,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19794,31 +19820,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19827,31 +19853,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19860,31 +19886,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19892,22 +19918,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20103,78 +20130,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20183,55 +20222,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20241,25 +20280,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20697,259 +20770,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, fuzzy, no-wrap, priority:100
 msgid "Commands"
 msgstr "comando"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20966,241 +21051,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21208,259 +21293,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21468,73 +21553,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21546,55 +21631,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21603,25 +21688,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21629,19 +21714,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21651,43 +21736,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21695,31 +21780,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21729,25 +21814,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21757,19 +21842,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21777,31 +21862,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21809,67 +21894,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21877,283 +21962,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "forzar"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr "listo"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22162,49 +22247,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22224,7 +22309,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22233,7 +22318,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22244,13 +22329,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22265,13 +22350,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22279,25 +22364,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22306,7 +22391,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22318,307 +22403,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23229,19 +23314,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27041,7 +27126,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28490,7 +28575,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28561,12 +28646,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29057,20 +29154,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29112,226 +29227,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "Crea un repositorio de Git vacío o reinicia el que ya existe"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "<branch>"
+msgid "-b <branch-name"
+msgstr "<rama>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29341,19 +29476,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31236,9 +31371,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36322,7 +36457,7 @@ msgid "Show progress."
 msgstr "mostrar progreso"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38715,12 +38850,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41295,7 +41426,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41318,7 +41449,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41336,7 +41467,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41444,13 +41575,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41468,7 +41599,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41576,7 +41707,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41588,7 +41719,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46722,7 +46853,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46761,6 +46892,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48945,7 +49082,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49078,7 +49215,7 @@ msgstr "<rama>"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49126,7 +49263,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53378,13 +53515,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53396,7 +53533,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53498,391 +53635,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56133,295 +56270,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56431,19 +56568,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56452,7 +56589,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56461,7 +56598,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56470,13 +56607,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56488,7 +56625,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59260,7 +59397,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59425,6 +59562,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59434,7 +59577,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65145,6 +65288,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.fr.po b/po/documentation.fr.po
index 7a680833b28908a671e98a22e5eb6a7537b008bd..b437a767464c52fb5e28642fb5dfbd68971b98d0 100644
--- a/po/documentation.fr.po
+++ b/po/documentation.fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-07-07 00:41+0000\n"
 "Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
 "Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -132,7 +132,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -480,7 +480,7 @@ msgid "Get and set repository or global options."
 msgstr "Voir et régler les options globales ou de dépôt."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -492,7 +492,7 @@ msgid "Git data exporter."
 msgstr "Exporteur de données Git."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2040,7 +2040,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs idiots."
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr "FICHIER DE CONFIGURATION"
@@ -2808,12 +2808,7 @@ msgstr "ISO 8601"
 #: en/date-formats.txt:26
 #, priority:280
 msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
-msgstr ""
-"Les heures et les dates sont spécifiées par le standard ISO 8601, par "
-"exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu "
-"du caractère `T`. Les parties fractionnelles d'une seconde seront ignorées, "
-"par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant "
-"`2005-04-07T22:13:13`."
+msgstr "Les heures et les dates sont spécifiées par le standard ISO 8601, par exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu du caractère `T`. Les parties fractionnelles d'une seconde seront ignorées, par exemple, `2005-04-07T22:13:13.019` sera considéré comme étant `2005-04-07T22:13:13`."
 
 #. type: Plain text
 #: en/date-formats.txt:28
@@ -4392,7 +4387,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignorer les modifications d'espaces en fin de ligne."
@@ -4404,7 +4399,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "Ignorer les modifications de nombre d'espaces. Cela ignore les espaces en fin de ligne et considère toutes les autres séquences d'un caractère blanc ou plus comme équivalentes."
@@ -4974,259 +4969,266 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr "Échanger deux entrées ; c'est-à-dire afficher les différences depuis l'index ou avec un fichier sur disque avec le contenu de l'arbre."
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<chemin>]"
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
-#, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+#: en/diff-options.txt:658
+#, fuzzy, priority:280
+#| msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "Lorsque lancé depuis un sous-répertoire du projet, il peut lui être indiqué d'exclure les modifications hors du répertoire et d'afficher les noms de chemins relativement à lui avec cette option. Quand vous n'êtes pas dans un sous-répertoire (par ex. dans un dépôt nu), vous pouvez nommer quel sous-répertoire par rapport auquel afficher la sortie en fournissant un argument <chemin>."
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Traiter tous les fichiers comme texte."
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr "Ignorer les retours chariot en fin de ligne lors de la comparaison."
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr "Ignorer les blancs lors de la comparaison de lignes. Ceci ignore les différences même si une ligne contient des espaces alors que l'autre n'en a pas."
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignorer les modifications dont les lignes sont blanches."
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<lignes>"
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr "Afficher le contexte entre des sections de diff, jusqu'au nombre spécifié de lignes, fusionnant de ce fait les sections qui sont proches. Par défaut, `diff.interHunkContext` ou 0 si l'option de configuration n'est pas configurée."
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr "Afficher le corps des fonctions englobant les modifications."
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr "Faire sortir le programme avec un code similaire à diff(1). Autrement dit, il sort avec 1 s'il y avait des différences et 0 signifie aucune différence."
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "Désactiver toute sortie du programme. Implique `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr "Permettre l'exécution d'un assistant externe de différence. Si vous définissez un pilote externe de différence avec linkgit:gitattributes[5], vous avez besoin d'utiliser cette option avec linkgit:git-log[1] et compagnie."
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr "Désactiver les pilotes de diff externes."
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr "Permettre (ou désactiver) le lancement des filtres externes de conversion en texte lors de la comparaison de fichiers binaires. Voir linkgit:gitattributes[5] pour plus de détails. Comme les filtres textconv sont typiquement des conversions à sens unique, la diff résultante est adaptée à la consommation humaine, mais ne peut pas être appliquée. Pour cette raison, les filtres textconv sont activés par défaut seulement pour linkgit:git-diff[1] et linkgit:git-log[1], mais pas pour linkgit:git-format-patch[1] ou les commandes de plomberie de diff."
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<quand>]"
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr "Ignorer les modifications à des sous-modules lors de la génération du diff. <quand> peut valoir \"none\" (aucun), \"untracked\" (non-suivi), \"dirty\" (sale) ou \"all\" (tout) qui est la valeur par défaut. L'utilisation de \"none\" va considérer comme modifiés les sous-modules quand ils contiennent soit des fichiers non-suivis ou modifiés, ou si sa HEAD diffère du commit enregistré dans le super-projet, et peut être utilisé pour passer outre tout réglage de l'option 'ignore' dans linkgit:git-config[1] ou linkgit:gitmodules[5]. Quand \"untracked\" est utilisé, les sous-modules ne sont pas considérés sales quand ils ne contiennent que du contenu non suivi (mais ils sont quand même scannés pour trouver du contenu modifié). L'utilisation de \"dirty\" ignore toutes les modifications à l'arbre de travail des sous-modules ; seules les modifications aux commits stockés dans le super-projet sont affichées (c'était le comportement jusqu'à 1.7.0). La valeur \"all\" cache toutes les modifications des sous-modules."
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<préfixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Afficher le préfixe de source fourni au lieu de \"a/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<préfixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Afficher le préfixe de destination fourni au lieu de \"b/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "N'afficher aucun préfixe ni de source, ni de destination."
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<préfixe>"
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "Préfixer avec une chaîne additionnelle chaque ligne de la sortie."
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr "Par défaut, une entrée ajoutée par \"git add -N\" apparaît comme un fichier vide existant dans \"git diff\" et un nouveau fichier dans \"git diff --cached\". Cette option fait apparaître l'entrée comme un fichier nouveau dans \"git diff\" et non existant dans \"git diff --cached\". Cette option peut être inversée avec `--ita-visible-in-index`. Les deux options sont expérimentales et peuvent être retirées dans le futur."
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "Pour une explication plus détaillée sur ces options communes, voir aussi linkgit:gitdiffcore[7]."
@@ -5364,7 +5366,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr "Voir aussi la variable de configuration `fetch.negotiationAlgorithm` documentée dans linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5506,7 +5508,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr "Avant de récupérer, supprimer toutes les étiquettes locales qui n'existent plus sur le distant si `--prune` est activé. Cette option doit être utilisée avec plus de précaution, car contrairement à `--prune`, elle supprime toutes les références locales (étiquettes locales) qui ont été créées. Cette option est un raccourci pour la fourniture du spécificateur de référence d'étiquette explicite avec `--prune`, voir la discussion à ce sujet dans sa documentation."
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5662,7 +5664,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr "Lorsqu'il est donné, et que le dépôt à récupérer est géré par 'git fetch-pack', `--exec=<upload-pack>` est passé à la commande pour spécifier le chemin par défaut pour la commande exécutée à l'autre bout."
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5674,13 +5676,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr "Passer -- quiet pour git-fetch-pack et faire taire toute autre commande git utilisée en interne. La progression n'est pas signalée dans le flux d'erreurs standard."
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5822,7 +5824,7 @@ msgstr ""
 "\t  [--] [<spécificateur de chemin>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "DESCRIPTION"
@@ -5864,7 +5866,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Référez-vous linkgit:git-commit[1] pour des méthodes alternatives d'ajout de contenu à une validation."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPTIONS"
@@ -6146,7 +6148,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Cette option permet de séparer les options de la ligne de commande de la liste des fichiers (utile si certains noms de fichiers peuvent être confondus avec des options)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EXEMPLES"
@@ -6524,7 +6526,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modification de contenu de contexte ou de lignes supprimées"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VOIR AUSSI"
@@ -6536,13 +6538,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Fait partie de la suite linkgit:git[1]"
@@ -7308,7 +7310,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7896,7 +7898,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9258,13 +9260,29 @@ msgstr "git-branch - Liste, crée, ou supprime des branches"
 
 #. type: Plain text
 #: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#| msgid ""
+#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
+#| "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
+#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
+#| "\t[(--merged | --no-merged) [<commit>]]\n"
+#| "\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+#| "\t[--points-at <object>] [--format=<format>]\n"
+#| "\t[(-r | --remotes) | (-a | --all)]\n"
+#| "\t[--list] [<pattern>...]\n"
+#| "'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n"
+#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n"
+#| "'git branch' --unset-upstream [<branchname>]\n"
+#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n"
+#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
+#| "'git branch' (-d | -D) [-r] <branchname>...\n"
+#| "'git branch' --edit-description [<branchname>]\n"
 msgid ""
 "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9883,7 +9901,7 @@ msgid "Patterns will normally need quoting."
 msgstr "Les motifs devront normalement être cités."
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr "NOTES"
@@ -10009,43 +10027,49 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, no-wrap, priority:100
 msgid "-o <path>"
 msgstr "-o <chemin>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, no-wrap, priority:100
 msgid "--output-directory <path>"
 msgstr "--output-directory <chemin>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "-s <format>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, no-wrap, priority:100
 msgid "--suffix <format>"
 msgstr "--suffix <format>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10400,7 +10424,7 @@ msgstr "git-cat-file - Fournir le contenu ou l'information de type et taille pou
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11991,7 +12015,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr "Créer le reflog de la nouvelle branche ; voir linkgit:git-branch[1] pour plus de détails."
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13875,7 +13899,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr "Aucune extraction de HEAD n'est effectuée après la fin du clonage."
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13971,7 +13995,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr "Quand cette option est indiquée et que le dépôt à cloner est accédé via ssh, ceci spécifie un chemin différent de celui par défaut pour la commande lancée sur l'hôte distant."
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template=<répertoire_de_modèles>"
@@ -14056,8 +14080,9 @@ msgstr "Peut être utilisé en conjonction avec `--single-branch` pour cloner et
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<spéc de chemin>]"
 
 #. type: Plain text
@@ -14097,7 +14122,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr "Tous les sous-modules clonés utiliseront l'état de la branche de suivi à distance du sous-module pour mettre à jour le sous-module, plutôt que le SHA-1 enregistré par le superprojet. Équivalent à passer `--remote` à `git submodule update`."
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<répertoire git>"
@@ -16284,7 +16309,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr "BOGUES"
@@ -17709,7 +17734,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -19197,19 +19222,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr "Compare les fichiers dans l'arbre de travail et l'index. Quand les chemins sont spécifiés, compare seulement ces chemins nommés. Autrement, toutes les entrées dans l'index sont comparées. Le format de sortie est identique à celle de 'git diff-index' et 'git diff-tree'."
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -19779,7 +19804,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<chemin>..."
@@ -19905,12 +19930,19 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Affiche les modifications entre les commits, un commit et l'arbre de travail, etc"
 
 #. type: Plain text
-#: en/git-diff.txt:17
-#, ignore-ellipsis, no-wrap, priority:280
+#: en/git-diff.txt:18
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid ""
+#| "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+#| "'git diff' [<options>] <blob> <blob>\n"
+#| "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
@@ -19921,145 +19953,159 @@ msgstr ""
 "'git diff' [<options>] --no-index [--] <chemin> <chemin>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:23
-#, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+#: en/git-diff.txt:25
+#, fuzzy, priority:280
+#| msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr "Affiche les modifications entre l'arbre de travail et l'index ou un arbre, les modifications entre l'index et un arbre, les modifications entre deux arbres, les modifications entre deux objets blobs ou les modifications entre deux fichiers sur disque."
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr "'git diff' [<options>] [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr "Cette forme sert à visualiser les modifications que vous avez faites par rapport à l'index (la zone de préparation du prochain commit). En d'autres termes, les différences sont ce que vous _pourriez_ indiquer à Git d'ajouter à l'index mais que vous n'avez pas encore ajoutées. Vous pouvez indexer ces modifications en utilisant linkgit:git-add[1]."
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr "'git diff' [<options>] --no-index [--] <chemin> <chemin>"
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr "Cette forme sert à comparer les deux chemins indiqués sur le système de fichiers. Vous pouvez omettre l'option `--no-index` si la commande est lancée dans un arbre de travail contrôlé par Git et qu'au moins un des chemins pointe hors de l'arbre de travail ou si la commande est lancée hors d'un arbre de travail contrôlé par Git. Cette forme implique `--exit-code`."
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "'git diff' [<options>] --cached [<commit>] [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr "Cette forme sert à visualiser les modifications que vous avez indexées pour la prochaine validation vis-à-vis du <commit> nommé. Typiquement, vous voudriez comparer avec le commit le plus récent (HEAD), ce qui est fait automatiquement si vous ne spécifiez pas <commit>. Si HEAD n'existe pas (par exemple, des branches à naître) et si <commit> n'est pas fourni, les modifications indexées sont affichées. --staged est synonyme de --cached."
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Cette forme sert à visualiser les modifications présentes dans l'arbre de travail par rapport au <commit> indiqué. Vous pouvez utiliser HEAD pour le comparer au commit le plus récent ou un nom de branche pour le comparer avec le sommet d'une branche différente."
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit> <commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Ceci sert à visualiser les modifications entre deux <commit> arbitraires."
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>..<commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Cette forme est synonyme de la précédente. Si <commit> est omis d'un côté, cela aura le même effet que de spécifier HEAD à la place."
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<chemin>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<options>] <commit>\\...<commit> [--] [<chemin>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr "Cette forme sert à visualiser les modifications sur la branche contenant et jusqu'au second <commit>, en débutant à l'ancêtre commun au deux <commit>. \"git diff A\\...B\" est équivalent à \"git diff $(git merge-base A B) B\". Vous pouvez omettre l'un ou l'autre <commit>, ce qui a le même effet que de spécifier HEAD à la place."
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr "Juste au cas où vous feriez quelque chose d'exotique, il doit être noté que tous les <commit> dans la description ci-dessus, excepté dans les deux dernières formes qui utilisent les notations \"..\", peuvent être n'importe quel <tree>."
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr "Pour une liste plus complète des moyens de spécifier <commit>, voir la section « SPÉCIFIER LES RÉVISIONS » dans linkgit:gitrevisions[7]. Cependant, \"diff\" concerne la comparaison de deux _point finaux_, et non d'intervalles, et les notations d'intervalle (\"<commit>..<commit>\" et \"<commit>\\...<commit>\") ne réfèrent pas un intervalle tel que défini dans la section « SPÉCIFIER LES RÉVISIONS » de linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<options>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Cette forme sert à visualiser la différence entre les contenus bruts de deux objets blob."
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr "Comparer l'arbre de travail avec la version de « base » (étape #1), « notre branche » (étape #2) ou « leur branche » (étape #3). L'index contient ces étapes seulement pour les entrées non-fusionnées, c'est-à-dire lors de la résolution de conflits. Voir la section « Fusion à 3 points » de linkgit:git-read-tree[1] pour de plus amples informations."
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "Omettre la sortie de diff pour les entrées non-fusionnées et affiche juste « Non fusionné ». Ne peut être utilisé que lors de comparaison de l'arbre de travail avec l'index."
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Les paramètres <chemin>, quand spécifiés, sont utilisés pour limiter la différence aux chemins indiqués (vous pouvez indiquer des noms de répertoire et visualiser les différences pour tous les fichiers qu'ils contiennent)."
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "Différents moyens de vérifier votre arbre de travail"
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -20071,31 +20117,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "Modifications dans l'arbre de travail pas encore indexées pour la prochaine validation."
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr "Modifications entre l'index et votre dernier commit ; ce que vous valideriez si vous lanciez \"git commit\" sans l'option \"-a\"."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr "Modifications dans l'arbre de travail depuis votre dernier commit ; ce que vous valideriez si vous lanciez \"git commit -a\""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Comparaison de deux commits arbitraires"
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -20107,31 +20153,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Au lieu d'utiliser le sommet de la branche actuelle, compare avec le sommet de la branche « test »."
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Au lieu de comparer avec le sommet de la branche « test », compare avec le sommet de la branche actuelle, mais limite la comparaison au fichier « test »."
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Compare la version précédant le dernier commit et le dernier commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Comparaison de branches"
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -20143,31 +20189,31 @@ msgstr ""
 "$ git diff sujet...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "Modifications entre les sommets des branches sujet et master."
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "Identique à ci-dessus."
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "Modifications présentes sur la branche master depuis que la branche sujet en a divergé."
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Limitation de la sortie du diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -20179,31 +20225,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Ne montre que les modifications, les renommages et les copies, mais pas les additions ou les suppressions."
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Ne montre que les noms et la nature de la modification, mais pas la sortie de diff."
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Limite la sortie de diff aux sous-arbres indiqués."
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Bricoler la sortie diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20213,21 +20259,22 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "Dépense des cycles supplémentaires de CPU pour trouver les renommages, les copies ou les réécritures complètes (très cher)."
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Affiche les diff inversés."
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 
 #. type: Title =
@@ -20424,78 +20471,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr "[<git-rev-list-args>...]"
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20504,55 +20563,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20562,25 +20621,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -21018,259 +21111,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr "C'est le standard de format des courriels tel que décrit par la RFC 2822."
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr "Commandes"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -21287,241 +21392,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr "Format externe de données"
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr "Format en ligne de données"
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21529,259 +21634,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21789,73 +21894,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21867,55 +21972,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21924,25 +22029,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21950,19 +22055,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21972,43 +22077,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -22016,31 +22121,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr "Format délimité"
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -22050,25 +22155,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -22078,19 +22183,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -22098,31 +22203,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -22130,67 +22235,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -22198,283 +22303,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "no-relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "forcer"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr "get-mark"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "cat-blob"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr "fait"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22483,49 +22588,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22545,7 +22650,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22554,7 +22659,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22565,13 +22670,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22586,13 +22691,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22600,25 +22705,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22627,7 +22732,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22639,307 +22744,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr "par arbre actif"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr "par entrée active de fichier"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23566,20 +23671,23 @@ msgstr "En utilisant explicitement les spécificateurs de référence :"
 
 #. type: delimited block -
 #: en/git-fetch.txt:259
-#, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+#, fuzzy, no-wrap, priority:220
+#| msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr "$ git fetch origin +pu:pu maint:tmp\n"
 
 #. type: Plain text
 #: en/git-fetch.txt:264
-#, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+#, fuzzy, priority:220
+#| msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr "Cela met à jour (ou crée, si nécessaire) les branches `pu` et `tmp` dans le dépôt local en récupérant (respectivement) les branches `pu` et `maint` dans le dépôt distant."
 
 #. type: Plain text
 #: en/git-fetch.txt:267
-#, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+#, fuzzy, priority:220
+#| msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr "La branche `pu` sera mise à jour même si ce n'est pas en avance rapide, car elle est préfixée par un signe plus ; `tmp` ne le sera pas."
 
 #. type: Plain text
@@ -27380,13 +27488,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-grep.txt:213
-#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
-msgstr ""
-"Utiliser \\ 0 comme délimiteur pour les noms de chemin dans la sortie et les "
-"afficher verbatim. Sans cette option, les noms de chemin avec des caractères "
-"« inhabituels » sont cités comme expliqué pour la variable de configuration "
-"core.quotePath (voir linkgit:git-config[1])."
+#, fuzzy, priority:100
+#| msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
+msgstr "Utiliser \\ 0 comme délimiteur pour les noms de chemin dans la sortie et les afficher verbatim. Sans cette option, les noms de chemin avec des caractères « inhabituels » sont cités comme expliqué pour la variable de configuration core.quotePath (voir linkgit:git-config[1])."
 
 #. type: Labeled list
 #: en/git-grep.txt:215
@@ -28834,7 +28939,7 @@ msgstr "git-http-fetch - Télécharger depuis un dépôt Git distant via HTTP"
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28905,12 +29010,25 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, fuzzy, no-wrap, priority:100
+#| msgid "--file=<path>"
+msgid "--packfile=<hash>"
+msgstr "--file=<chemin>"
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29401,20 +29519,41 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--object-format=<format>"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--object-format=<format>"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "Spécifier le format d'objet donné (algorithme d'empreinte) pour le dépôt.  Les valeurs valides sont 'sha1' et (si activé) 'sha256'.  'sha1' est la valeur par défaut."
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+#, fuzzy, priority:100
+#| msgid "This behavior can be suppressed with the `--no-ff` option."
+msgid "This option cannot be used with --stdin."
+msgstr "Ce comportement peut être supprimé avec l'option `--no-off`."
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 #, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29456,11 +29595,16 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init - Crée un dépôt Git vide ou réinitialise un dépôt existant"
 
 #. type: Plain text
-#: en/git-init.txt:15
-#, no-wrap, priority:300
+#: en/git-init.txt:16
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+#| "\t  [--shared[=<permissions>]] [directory]\n"
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<répertoire_modèle>]\n"
@@ -29468,217 +29612,237 @@ msgstr ""
 "\t  [--shared[=<permissions>]] [dossier]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "Cette commande crée un dépôt Git vide - essentiellement un répertoire `.git` avec des sous-répertoires pour les fichiers `objects`, `refs/heads`, `refs/tags` et les fichiers de modèle. Un fichier `HEAD` initial qui fait référence à la tête de la branche principale (master) est également créé."
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "Si la variable d'environnement `$GIT_DIR` est définie, alors elle spécifie un chemin à utiliser au lieu de `./.git` comme base du dépôt."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "Si le répertoire de stockage d'objets est spécifié via la variable d'environnement `$GIT_OBJECT_DIRECTORY`, alors les répertoires sha1 sont créés dedans - sinon le répertoire par défaut `$GIT_DIR/objects` est utilisé."
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "Exécuter 'git init' dans un dépôt existant est sécurisé. Cela n'écrasera pas des choses qui sont déjà dedans. La raison principale de ré-exécuter 'git init' est de récupérer les modèles récemment ajoutés (ou de déplacer le dépôt ailleurs si --separate-git-dir est fourni)."
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "N'afficher que les messages d'erreur et d'alerte ; toutes les autres sorties seront supprimées."
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "Créer un dépôt nu. Si l'environnement `GIT_DIR` n'est pas défini, alors il est défini au répertoire de travail courant."
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--object-format=<format>"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr "Spécifier le format d'objet donné (algorithme d'empreinte) pour le dépôt.  Les valeurs valides sont 'sha1' et (si activé) 'sha256'.  'sha1' est la valeur par défaut."
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "Spécifier le dossier depuis lequel les modèles seront utilisés (Voyez la section « DOSSIER MODÈLE » ci-dessous.)"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "Au lieu d'initialiser le dépôt en tant que répertoire dans soit `$GIT_DIR` soit `./.git`, y créer un fichier texte contenant le chemin du dépôt réel. Ce fichier agit comme un lien symbolique Git indépendant du système de fichier vers le dépôt."
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "Si c'est une réinitialisation, le dépôt sera déplacé vers le chemin spécifié."
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "<branchname>"
+msgid "-b <branch-name"
+msgstr "<nom-de-branche>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+#| msgid "--state-branch <branch>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--state-branch <branche>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr "Spécifier que le dépôt Git doit être partagé entre plusieurs utilisateurs. Ceci permet à des utilisateurs faisant partie du même groupe de pousser dans ce dépôt. Lorsque que cette option est spécifiée, la variable de configuration \"core.sharedRepository\" est définie de telle sorte que les fichiers et les dossiers sous `$GIT_DIR` sont créés avec les permissions demandées. Lorsqu'elle n'est pas spécifiée, Git utilisera les permissions rapportées par umask(2)."
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr "L'option peut avoir les valeurs suivantes, prenant par défaut la valeur 'group' si aucune valeur n'est renseignée :"
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask' (ou 'false')"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "Utiliser les permissions rapportées par umask(2). Valeur par défaut, quand `--shared` n'est pas spécifié."
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group' (ou 'true')"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "Rendre le dépôt modifiable par groupe (et g+sx, puisque le groupe git peut ne pas être le groupe principal de tous les utilisateurs). Ceci est utilisé pour assouplir les permissions d'une valeur umask(2) par ailleurs sûre. Notez que umask s'applique toujours aux autres bits d'autorisation (par exemple, si umask est défini sur '0022', l'utilisation de 'group' ne supprime pas les privilèges de lecture des autres utilisateurs (non membres du groupe)). Voir '0xxx' pour savoir comment spécifier exactement les autorisations du dépôt."
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all' (ou 'world' ou 'everybody')"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "Comme 'group', mais rendre le dépôt lisible par tous les utilisateurs."
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr "'0xxx'"
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr "'0xxx' est un nombre octal et chaque fichier aura le mode '0xxx'. '0xxx' surchargera la valeur umask(2) des utilisateurs (en plus d'assouplir les permissions comme 'group' et 'all' le font). '0640' créera un dépôt qui est lisible par groupe, mais pas modifiable par groupe ni accessible aux autres. '0660' créera un dépôt lisible et modifiable par l'utilisateur et le groupe courants, mais inaccessible aux autres."
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr "Par défaut, l'option de configuration `receive.denyNonFastForwards` est activée dans les dépôts partagés, de telle sorte que vous ne pouvez pas forcer une poussée qui ne serait pas en avance rapide."
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr "Si vous renseignez un 'dossier', la commande est exécutée à l'intérieur de celui-ci. Si ce dossier n'existe pas, il sera créé."
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "DOSSIER MODÈLE"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "Les fichiers et les dossiers dans le dossier modèle dont le nom ne commence pas par un point seront copiés dans le `$GIT_DIR` après qu'il sera créé."
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "Le dossier modèle sera l'un des suivants (dans l'ordre) :"
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "l'argument fourni avec l'option `--template` ;"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr "le contenu de la variable d'environnement `$GIT_TEMPLATE_DIR` ;"
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "la variable de configuration `init.templateDir` ; ou"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "le dossier modèle par défaut : `/usr/share/git-core/templates`."
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "Le dossier modèle par défaut inclut une certaine structure de dossier, des \"modèles d'exclusions\" suggérés (voir linkgit:gitignore[5]), et des exemples de fichiers crochet."
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr "Les exemples de crochets sont tous désactivés par défaut. Pour activer l'un des exemples de crochets, renommez-le en enlevant le suffixe `.sample`."
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr "Voir linkgit:githooks[5] pour des informations plus générales sur l'exécution d'un crochet."
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr "Démarrer un nouveau dépôt Git pour une base de code existante"
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29692,19 +29856,19 @@ msgstr ""
 "$ git commit    <3>\n"
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr "Créer un dossier /chemin/vers/mon/code/de/base/.git."
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr "Ajouter tous les fichiers existants à l'index."
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr "Enregistrer l'état d'origine comme le premier commit dans l'historique."
@@ -31587,9 +31751,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36725,7 +36889,7 @@ msgid "Show progress."
 msgstr "Afficher l'avancement."
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr "--expire <date>"
@@ -39161,12 +39325,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41736,10 +41896,24 @@ msgstr "git-remote - Gère un ensemble de dépôts suivis"
 
 #. type: Plain text
 #: en/git-remote.txt:25
-#, ignore-ellipsis, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
+#| msgid ""
+#| "'git remote' [-v | --verbose]\n"
+#| "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+#| "'git remote rename' <old> <new>\n"
+#| "'git remote remove' <name>\n"
+#| "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
+#| "'git remote set-branches' [--add] <name> <branch>...\n"
+#| "'git remote get-url' [--push] [--all] <name>\n"
+#| "'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n"
+#| "'git remote set-url --add' [--push] <name> <newurl>\n"
+#| "'git remote set-url --delete' [--push] <name> <url>\n"
+#| "'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
+#| "'git remote prune' [-n | --dry-run] <name>...\n"
+#| "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41753,8 +41927,7 @@ msgid ""
 "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
 msgstr ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <nom> <url>\n"
+"'git remote add' [-t <branche>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nom> <url>\n"
 "'git remote renom' <ancien> <nouveau>\n"
 "'git remote remove' <nom>\n"
 "'git remote set-head' <nom> (-a | --auto | -d | --delete | <branche>)\n"
@@ -41765,8 +41938,7 @@ msgstr ""
 "'git remote set-url --delete' [--push] <nom> <url>\n"
 "'git remote' [-v | --verbose] 'show' [-n] <nom>...\n"
 "'git remote prune' [-n | --dry-run] <nom>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | "
-"<distant>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<groupe> | <distant>)...]\n"
 
 #. type: Plain text
 #: en/git-remote.txt:30
@@ -41776,11 +41948,10 @@ msgstr "Gère un ensemble de dépôts (« distants ») dont vous suivez les bra
 
 #. type: Plain text
 #: en/git-remote.txt:39
-#, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
-msgstr ""
-"Être un peu plus verbeux et montrer les urls distantes après les noms. NOTE :"
-" cette option doit être placée entre `remote` et la sous-commande."
+#, fuzzy, priority:220
+#| msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
+msgstr "Être un peu plus verbeux et montrer les urls distantes après les noms. NOTE : cette option doit être placée entre `remote` et la sous-commande."
 
 #. type: Plain text
 #: en/git-remote.txt:46
@@ -41796,12 +41967,10 @@ msgstr "'add'"
 
 #. type: Plain text
 #: en/git-remote.txt:52
-#, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgstr ""
-"Ajouter un distant nommé <nom> pour le dépôt à <url>.  La commande `git "
-"fetch <nom>` peut alors être utilisée pour créer et mettre à jour les "
-"branches de suivi à distance <nom>/<branche>."
+#, fuzzy, priority:220
+#| msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgstr "Ajouter un distant nommé <nom> pour le dépôt à <url>.  La commande `git fetch <nom>` peut alors être utilisée pour créer et mettre à jour les branches de suivi à distance <nom>/<branche>."
 
 #. type: Plain text
 #: en/git-remote.txt:55
@@ -41907,26 +42076,17 @@ msgstr "Avec `-d` ou `--delete`, la référence symbolique `refs/remotes/<nom>/H
 
 #. type: Plain text
 #: en/git-remote.txt:116
-#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
-msgstr ""
-"Avec `-a` ou `--auto`, le distant est interrogé pour déterminer son `HEAD`, "
-"puis la référence symbolique `refs/remotes/<nom>/HEAD` est définie sur la "
-"même branche. Par exemple, si le distant `HEAD` est pointé sur `next`, `git "
-"remote set-head origin -a` définira la référence symbolique `refs/remotes/"
-"origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `"
-"refs/remotes/origin/next` existe déjà ; sinon, il faut d'abord la récupérer."
+#, fuzzy, priority:220
+#| msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgstr "Avec `-a` ou `--auto`, le distant est interrogé pour déterminer son `HEAD`, puis la référence symbolique `refs/remotes/<nom>/HEAD` est définie sur la même branche. Par exemple, si le distant `HEAD` est pointé sur `next`, `git remote set-head origin -a` définira la référence symbolique `refs/remotes/origin/HEAD` sur `refs/remotes/origin/next`. Cela ne fonctionnera que si `refs/remotes/origin/next` existe déjà ; sinon, il faut d'abord la récupérer."
 
 #. type: Plain text
 #: en/git-remote.txt:121
-#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
-msgstr ""
-"Utiliser `<branche>` pour définir la référence symbolique `refs/remotes/"
-"<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` "
-"définira la référence symbolique `refs/remotes/origin/HEAD` à `refs/remotes/"
-"origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` "
-"existe déjà ; sinon, il faut d'abord le récupérer."
+#, fuzzy, priority:220
+#| msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgstr "Utiliser `<branche>` pour définir la référence symbolique `refs/remotes/<nom>/HEAD` explicitement. Par exemple, `git remote set-head origin master` définira la référence symbolique `refs/remotes/origin/HEAD` à `refs/remotes/origin/master`. Cela ne fonctionnera que si `refs/remotes/origin/master` existe déjà ; sinon, il faut d'abord le récupérer."
 
 #. type: Labeled list
 #: en/git-remote.txt:123
@@ -41942,11 +42102,10 @@ msgstr "Modifier la liste des branches suivies par le distant nommé.  Cela peut
 
 #. type: Plain text
 #: en/git-remote.txt:131
-#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
-msgstr ""
-"Les branches nommées seront interprétées comme si elles étaient spécifiées "
-"avec l'option `-t` sur la ligne de commande `git remote add`."
+#, fuzzy, priority:220
+#| msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgstr "Les branches nommées seront interprétées comme si elles étaient spécifiées avec l'option `-t` sur la ligne de commande `git remote add`."
 
 #. type: Plain text
 #: en/git-remote.txt:134
@@ -42052,11 +42211,10 @@ msgstr "Voir la section ÉLAGAGE de linkgit:git-fetch[1] pour savoir ce qui sera
 
 #. type: Plain text
 #: en/git-remote.txt:186
-#, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
-msgstr ""
-"Avec l'option `--dry-run`, signaler les branches qui seraient élaguées, mais "
-"ne pas réellement les élaguer."
+#, fuzzy, priority:220
+#| msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgstr "Avec l'option `--dry-run`, signaler les branches qui seraient élaguées, mais ne pas réellement les élaguer."
 
 #. type: Labeled list
 #: en/git-remote.txt:187
@@ -42066,16 +42224,10 @@ msgstr "'update'"
 
 #. type: Plain text
 #: en/git-remote.txt:195
-#, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
-msgstr ""
-"Récupérer les mises à jour pour les distants ou les groupes de distants dans "
-"le dépôt comme défini par `remotes.<groupe>`.  Si aucun groupe ni aucun "
-"distant n'est spécifié sur la ligne de commande, le paramètre de "
-"configuration `remotes.default` sera utilisé ; si `remotes.default` n'est "
-"pas défini, tous les distants dont le paramètre de configuration "
-"`remote.<nom>.skipDefaultUpdate` n'est pas défini à true seront mis à jour.  "
-"(Voir linkgit:git-config[1])."
+#, fuzzy, priority:220
+#| msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgstr "Récupérer les mises à jour pour les distants ou les groupes de distants dans le dépôt comme défini par `remotes.<groupe>`.  Si aucun groupe ni aucun distant n'est spécifié sur la ligne de commande, le paramètre de configuration `remotes.default` sera utilisé ; si `remotes.default` n'est pas défini, tous les distants dont le paramètre de configuration `remote.<nom>.skipDefaultUpdate` n'est pas défini à true seront mis à jour.  (Voir linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-remote.txt:197
@@ -47361,7 +47513,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -47400,6 +47552,13 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "Spécifier le format d'objet donné (algorithme d'empreinte) pour le dépôt.  Les valeurs valides sont 'sha1' et (si activé) 'sha256'.  'sha1' est la valeur par défaut."
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -49527,41 +49686,25 @@ msgstr "status [--cached] [--recursive] [--] [<chemin>...]"
 #: en/git-submodule.txt:83
 #, priority:220
 msgid "Show the status of the submodules. This will print the SHA-1 of the currently checked out commit for each submodule, along with the submodule path and the output of 'git describe' for the SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is not initialized, `+` if the currently checked out submodule commit does not match the SHA-1 found in the index of the containing repository and `U` if the submodule has merge conflicts."
-msgstr ""
-"Afficher le statut des sous-modules. Cela affichera le SHA-1 du commit "
-"actuellement extrait pour chaque sous-module, ainsi que le chemin du sous-"
-"module et la sortie de 'git describe' pour le SHA-1. Chaque SHA-1 sera "
-"éventuellement préfixé par `-` si le sous-module n'est pas initialisé, `+` "
-"si le commit du sous-module actuellement extrait ne correspond pas au SHA-1 "
-"trouvé dans l'index du dépôt contenant et `U` si le sous-module a des "
-"conflits de fusion."
+msgstr "Afficher le statut des sous-modules. Cela affichera le SHA-1 du commit actuellement extrait pour chaque sous-module, ainsi que le chemin du sous-module et la sortie de 'git describe' pour le SHA-1. Chaque SHA-1 sera éventuellement préfixé par `-` si le sous-module n'est pas initialisé, `+` si le commit du sous-module actuellement extrait ne correspond pas au SHA-1 trouvé dans l'index du dépôt contenant et `U` si le sous-module a des conflits de fusion."
 
 #. type: Plain text
 #: en/git-submodule.txt:86
 #, priority:220
 msgid "If `--cached` is specified, this command will instead print the SHA-1 recorded in the superproject for each submodule."
-msgstr ""
-"Si `--cached` est spécifié, cette commande imprimera à la place le SHA-1 "
-"enregistre dans le superprojet pour chaque sous-module."
+msgstr "Si `--cached` est spécifié, cette commande imprimera à la place le SHA-1 enregistre dans le superprojet pour chaque sous-module."
 
 #. type: Plain text
 #: en/git-submodule.txt:89
 #, priority:220
 msgid "If `--recursive` is specified, this command will recurse into nested submodules, and show their status as well."
-msgstr ""
-"Si `--recursive` est spécifié, cette commande va parcourir récursivement les "
-"sous-modules imbriqués, et montrer leur statut également."
+msgstr "Si `--recursive` est spécifié, cette commande va parcourir récursivement les sous-modules imbriqués, et montrer leur statut également."
 
 #. type: Plain text
 #: en/git-submodule.txt:94
 #, priority:220
 msgid "If you are only interested in changes of the currently initialized submodules with respect to the commit recorded in the index or the HEAD, linkgit:git-status[1] and linkgit:git-diff[1] will provide that information too (and can also report changes to a submodule's work tree)."
-msgstr ""
-"Si vous n'êtes intéressé que par les modifications des sous-modules "
-"actuellement initialisés par rapport au commit enregistré dans l'index ou "
-"dans HEAD, linkgit:git-status[1] et linkgit:git-diff[1] vous fourniront "
-"également ces informations (et peuvent également signaler les modifications "
-"de l'arbre de travail d'un sous-module)."
+msgstr "Si vous n'êtes intéressé que par les modifications des sous-modules actuellement initialisés par rapport au commit enregistré dans l'index ou dans HEAD, linkgit:git-status[1] et linkgit:git-diff[1] vous fourniront également ces informations (et peuvent également signaler les modifications de l'arbre de travail d'un sous-module)."
 
 #. type: Labeled list
 #: en/git-submodule.txt:95
@@ -49573,35 +49716,19 @@ msgstr "init [--] [<chemin>...]"
 #: en/git-submodule.txt:102
 #, priority:220
 msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from `.gitmodules` as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
-msgstr ""
-"Initialiser les sous-modules enregistrés dans l'index (qui ont été ajoutés "
-"et validés ailleurs) en définissant `submodule.$nom.url` dans .git/config. "
-"Il utilise le même paramètre de `.gitmodules` comme modèle. Si l'URL est "
-"relative, elle sera résolue en utilisant le distant par défaut. S'il n'y a "
-"pas de distant par défaut, le dépôt actuel sera supposé être en amont."
+msgstr "Initialiser les sous-modules enregistrés dans l'index (qui ont été ajoutés et validés ailleurs) en définissant `submodule.$nom.url` dans .git/config. Il utilise le même paramètre de `.gitmodules` comme modèle. Si l'URL est relative, elle sera résolue en utilisant le distant par défaut. S'il n'y a pas de distant par défaut, le dépôt actuel sera supposé être en amont."
 
 #. type: Plain text
 #: en/git-submodule.txt:107
 #, priority:220
 msgid "Optional <path> arguments limit which submodules will be initialized.  If no path is specified and submodule.active has been configured, submodules configured to be active will be initialized, otherwise all submodules are initialized."
-msgstr ""
-"Les arguments facultatifs <chemin> limitent les sous-modules qui seront "
-"initialisés.  Si aucun chemin n'est spécifié et que submodule.active a été "
-"configuré, les sous-modules configurés pour être actifs seront initialisés, "
-"sinon tous les sous-modules sont initialisés."
+msgstr "Les arguments facultatifs <chemin> limitent les sous-modules qui seront initialisés.  Si aucun chemin n'est spécifié et que submodule.active a été configuré, les sous-modules configurés pour être actifs seront initialisés, sinon tous les sous-modules sont initialisés."
 
 #. type: Plain text
 #: en/git-submodule.txt:115
 #, priority:220
 msgid "When present, it will also copy the value of `submodule.$name.update`.  This command does not alter existing information in .git/config.  You can then customize the submodule clone URLs in .git/config for your local setup and proceed to `git submodule update`; you can also just use `git submodule update --init` without the explicit 'init' step if you do not intend to customize any submodule locations."
-msgstr ""
-"Lorsqu'il est présent, copie également la valeur de `submodule.$nom.update`"
-".  Cette commande ne modifie pas les informations existantes dans le fichier "
-".git/config.  Vous pouvez ensuite personnaliser les URL de clonage de sous-"
-"module dans .git/config pour votre configuration locale et passer à `git "
-"submodule update` ; vous pouvez aussi simplement utiliser `git submodule "
-"update --init` sans l'étape explicite 'init' si vous n'avez pas l'intention "
-"de personnaliser l'emplacement des sous-module."
+msgstr "Lorsqu'il est présent, copie également la valeur de `submodule.$nom.update`.  Cette commande ne modifie pas les informations existantes dans le fichier .git/config.  Vous pouvez ensuite personnaliser les URL de clonage de sous-module dans .git/config pour votre configuration locale et passer à `git submodule update` ; vous pouvez aussi simplement utiliser `git submodule update --init` sans l'étape explicite 'init' si vous n'avez pas l'intention de personnaliser l'emplacement des sous-module."
 
 #. type: Plain text
 #: en/git-submodule.txt:117
@@ -49619,65 +49746,37 @@ msgstr "deinit [-f|--force] (--all|[--] <chemin>...)"
 #: en/git-submodule.txt:125
 #, priority:220
 msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore."
-msgstr ""
-"Désenregistrez les sous-modules donnés, c'est-à-dire supprimez toute la "
-"section `submodule.$name` de .git/config ainsi que leur arborescence de "
-"travail. Les appels ultérieurs à `git submodule update`, `git submodule "
-"foreach` et `git submodule sync` ignoreront tous les sous-modules non "
-"enregistrés jusqu'à ce qu'ils soient initialisés à nouveau, donc utilisez "
-"cette commande si vous ne voulez plus avoir de vérification locale du sous-"
-"module dans votre arbre de travail."
+msgstr "Désenregistrez les sous-modules donnés, c'est-à-dire supprimez toute la section `submodule.$name` de .git/config ainsi que leur arborescence de travail. Les appels ultérieurs à `git submodule update`, `git submodule foreach` et `git submodule sync` ignoreront tous les sous-modules non enregistrés jusqu'à ce qu'ils soient initialisés à nouveau, donc utilisez cette commande si vous ne voulez plus avoir de vérification locale du sous-module dans votre arbre de travail."
 
 #. type: Plain text
 #: en/git-submodule.txt:128
 #, priority:220
 msgid "When the command is run without pathspec, it errors out, instead of deinit-ing everything, to prevent mistakes."
-msgstr ""
-"Lorsque la commande est exécutée sans pathspec, elle sort en erreur, au lieu "
-"de tout dé-initialiser, pour éviter les erreurs."
+msgstr "Lorsque la commande est exécutée sans pathspec, elle sort en erreur, au lieu de tout dé-initialiser, pour éviter les erreurs."
 
 #. type: Plain text
 #: en/git-submodule.txt:131
 #, priority:220
 msgid "If `--force` is specified, the submodule's working tree will be removed even if it contains local modifications."
-msgstr ""
-"Si `--force` est spécifié, l'arbre de travail du sous-module sera supprimé "
-"même s'il contient des modifications locales."
+msgstr "Si `--force` est spécifié, l'arbre de travail du sous-module sera supprimé même s'il contient des modifications locales."
 
 #. type: Plain text
 #: en/git-submodule.txt:135
 #, priority:220
 msgid "If you really want to remove a submodule from the repository and commit that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options."
-msgstr ""
-"Si vous voulez vraiment supprimer un sous-module du dépôt et valider le "
-"résultat, utilisez plutôt linkgit:git-rm[1]. Voir linkgit:gitsubmodules[7] "
-"pour les options de suppression."
+msgstr "Si vous voulez vraiment supprimer un sous-module du dépôt et valider le résultat, utilisez plutôt linkgit:git-rm[1]. Voir linkgit:gitsubmodules[7] pour les options de suppression."
 
 #. type: Labeled list
 #: en/git-submodule.txt:136
 #, ignore-ellipsis, no-wrap, priority:220
 msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]"
-msgstr ""
-"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
-"[-f|--force] [--checkout|--rebase|--merge] [--reference <dépôt>] [--depth "
-"<profondeur>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] "
-"[<chemin>...]"
+msgstr "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <dépôt>] [--depth <profondeur>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<chemin>...]"
 
 #. type: Plain text
 #: en/git-submodule.txt:148
 #, priority:220
 msgid "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules. The \"updating\" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over the configuration variable. If neither is given, a 'checkout' is performed.  The 'update' procedures supported both from the command line as well as through the `submodule.<name>.update` configuration are:"
-msgstr ""
-"Mettre à jour les sous-modules enregistrés pour qu'ils correspondent aux "
-"attentes du superprojet en clonant les sous-modules manquants, en récupérant "
-"les commits manquants dans les sous-modules et en mettant à jour l'arbre de "
-"travail des sous-modules. La \"mise à jour\" peut être effectuée de "
-"plusieurs façons, en fonction des options de la ligne de commande et de la "
-"valeur de la variable de configuration `submodule.<nom>.update`. L'option de "
-"ligne de commande a la priorité sur la variable de configuration. Si aucune "
-"des deux n'est donnée, un 'checkout' est effectué.  Les procédures de "
-"'update'supportées aussi bien en ligne de commande que par la configuration "
-"`submodule.<nom>.update`sont :"
+msgstr "Mettre à jour les sous-modules enregistrés pour qu'ils correspondent aux attentes du superprojet en clonant les sous-modules manquants, en récupérant les commits manquants dans les sous-modules et en mettant à jour l'arbre de travail des sous-modules. La \"mise à jour\" peut être effectuée de plusieurs façons, en fonction des options de la ligne de commande et de la valeur de la variable de configuration `submodule.<nom>.update`. L'option de ligne de commande a la priorité sur la variable de configuration. Si aucune des deux n'est donnée, un 'checkout' est effectué.  Les procédures de 'update'supportées aussi bien en ligne de commande que par la configuration `submodule.<nom>.update`sont :"
 
 #. type: Labeled list
 #: en/git-submodule.txt:149
@@ -49701,10 +49800,7 @@ msgstr "extrait dans le sous-module avec une HEAD détachée.\n"
 #: en/git-submodule.txt:156
 #, priority:220
 msgid "If `--force` is specified, the submodule will be checked out (using `git checkout --force`), even if the commit specified in the index of the containing repository already matches the commit checked out in the submodule."
-msgstr ""
-"Si `--force` est spécifié, le sous-module sera extrait (en utilisant `git "
-"checkout --force`), même si le commit spécifié dans l'index du dépôt "
-"contenant correspond déjà au commit extrait dans le sous-module."
+msgstr "Si `--force` est spécifié, le sous-module sera extrait (en utilisant `git checkout --force`), même si le commit spécifié dans l'index du dépôt contenant correspond déjà au commit extrait dans le sous-module."
 
 #. type: Labeled list
 #: en/git-submodule.txt:157
@@ -49740,9 +49836,7 @@ msgstr "dans la branche actuelle du sous-module.\n"
 #: en/git-submodule.txt:165
 #, priority:220
 msgid "The following 'update' procedures are only available via the `submodule.<name>.update` configuration variable:"
-msgstr ""
-"Les procédures 'update' suivantes sont uniquement disponibles via la "
-"variable de configuration `submodule.<nom>.update` :"
+msgstr "Les procédures 'update' suivantes sont uniquement disponibles via la variable de configuration `submodule.<nom>.update` :"
 
 #. type: Labeled list
 #: en/git-submodule.txt:166
@@ -49803,7 +49897,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49935,7 +50029,7 @@ msgstr "-b <branche>"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49983,7 +50077,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -54260,13 +54354,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -54278,7 +54372,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -54380,391 +54474,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
@@ -57020,295 +57114,296 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr "Par défaut, `add` refuse de créer un nouvel arbre de travail lorsque `<commit-esque>` est un nom de branche et est déjà extrait par un autre arbre de travail, ou si `<chemin>` est déjà assigné à un arbre de travail mais est manquant (par exemple, si `<chemin>` a été supprimé manuellement). Cette option annule ces protections. Pour ajouter un chemin d'arbre de travail manquant mais verrouillé, spécifiez `--force` deux fois."
 
 #. type: Plain text
-#: en/git-worktree.txt:130
-#, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
-msgstr "`move` refuse de déplacer un arbre de travail verrouillé à moins que `--force` ne soit spécifié deux fois."
+#: en/git-worktree.txt:132
+#, fuzzy, priority:240
+#| msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
+msgstr "Par défaut, `add` refuse de créer un nouvel arbre de travail lorsque `<commit-esque>` est un nom de branche et est déjà extrait par un autre arbre de travail, ou si `<chemin>` est déjà assigné à un arbre de travail mais est manquant (par exemple, si `<chemin>` a été supprimé manuellement). Cette option annule ces protections. Pour ajouter un chemin d'arbre de travail manquant mais verrouillé, spécifiez `--force` deux fois."
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr "`remove` refuse de supprimer un arbre de travail sale à moins que `--force` ne soit utilisé.  Pour supprimer un arbre de travail verrouillé, il faut spécifier deux fois `-- force`."
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr "-b <nouvelle-branche>"
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr "-B <nouvelle-branche>"
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr "Avec `add`, créer une nouvelle branche nommée `<nouvelle-branche>` commençant à `<commit-esque>`, et extraire `<nouvelle-branche>` dans le nouvel arbre de travail.  Si `<commit-esque>` est omis, la valeur par défaut est HEAD.  Par défaut, `-b` refuse de créer une nouvelle branche si elle existe déjà. `-B` annule cette protection, en remettant `<nouvelle-branche>` à `<commit-esque>`."
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr "Avec `add`, détacher HEAD dans le nouvel arbre de travail. Voir \"HEAD DÉTACHÉE\" dans linkgit:git-checkout[1]."
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr "Par défaut, `add`extrait `<commit-esque>`, cependant, `--no-checkout` peut être utilisé pour annuler l'extraction afin de permettre des personnalisations, telles que la configuration de l'extraction partielle. Voir \"Extraction partielle\" dans linkgit:git-read-tree[1]."
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr "Avec `worktree add <chemin>`, sans `<commit-esque>`, au lieu de créer une nouvelle branche à partir de HEAD, s'il existe une branche de suivi d'exactement un distant correspondant au basename de `<chemin>`, baser la nouvelle branche sur la branche de suivi à distance, et marquer la branche de suivi à distance comme étant \"amont\" de la nouvelle branche."
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr "Cela peut également être configuré comme le comportement par défaut en utilisant l'option de configuration `worktree.guessRemote`."
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr "À la création d'une nouvelle branche, si `<commit-esque>`est une branche, la marquer comme « upstream » amont de la nouvelle branche. C'est la valeur par défaut si `<commit-esque>` est une branche de suivi à distance. Voir « --track » dans linkgit:git-branch[1] pour plus de détails."
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr "Garder l'arbre de travail verrouillé après la création. C'est l'équivalent de `git worktree lock` après `git worktree add`, mais sans condition de compétition."
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr "Avec `prune`, ne rien supprimer ; montrer seulement ce qui serait supprimé."
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr "Avec `list`, donner la sortie dans un format facile à analyser par script. Ce format restera stable à travers les versions de Git et sans tenir compte de la configuration utilisateur. Voir ci-dessous pour de plus amples détails."
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr "Avec 'add', supprimer les messages d'état."
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr "Avec `prune`, signaler toutes les suppressions."
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr "Avec `prune`, n'expirer que les arbres de travail inutilisés plus vieux que <temps>."
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr "--reason <chaîne>"
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr "Avec `lock`, une explication de la raison pour laquelle l'arbre de travail est verrouillé."
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr "<arbre-de-travail>"
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr "Les arbres de travail peuvent être identifiés par leur chemin, qu'il soit relatif ou absolu."
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr "Si le dernier élément du chemin de l'arbre de travail est unique parmi les arbres de travail, il peut être utilisé pour identifier les arbres de travail. Par exemple, si vous n'avez que deux arbres de travail, à \"/abc/def/ghi\" et \"/abc/def/ggg\", alors \"ghi\" ou \"def/ghi\" suffit à indiquer le premier arbre de travail."
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr "RÉFS"
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr "Dans le cas de plusieurs arbres de travail, certaines réfs peuvent être partagées entre tous les arbres de travail, certaines réfs sont locales. Par exemple, HEAD est différente pour tous les arbres de travail. Cette section concerne les règles de partage et la manière d'accéder aux références d'un arbre de travail à partir d'un autre."
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr "En général, toutes les pseudo réfs sont par arbre de travail et toutes les réfs commençant par \"refs/\" sont partagées. Les pseudo réfs sont celles comme HEAD qui sont directement sous GIT_DIR au lieu d'être à l'intérieur de GIT_DIR/refs. Il y a une exception à cela : les réfs à l'intérieur de refs/bisect et refs/worktree ne sont pas partagées."
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr "Les références par arbre de travail sont toujours accessibles à partir d'un autre arbre de travail via deux chemins spéciaux, l'arbre principal et les arbres de travail. Le premier donne accès aux références par arbre de travail de l'arbre de travail principal, tandis que le second donne accès à tous les arbres de travail liés."
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr "Par exemple, arbre-de-travail-principal/HEAD ou arbre-de-travail-principal/refs/bisect/good ont la même valeur que la HEAD de l'arbre de travail principal et refs/bisect/good respectivement. De même, worktrees/foo/HEAD ou worktrees/bar/refs/bisect/bad sont les mêmes que GIT_COMMON_DIR/worktrees/foo/HEAD et GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr "Pour accéder aux réfs, il est préférable de ne pas regarder directement dans GIT_DIR. Utilisez plutôt des commandes telles que linkgit:git-rev-parse[1] ou linkgit:git-update-ref[1] qui gèreront les réfs correctement."
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr "Par défaut, le fichier \"config\" du dépôt est partagé entre tous les arbres de travail. Si les variables de configuration `core.bare` ou `core.worktree` sont déjà présentes dans le fichier de configuration, elles ne seront appliquées qu'aux arbres de travail principaux."
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr "Afin d'avoir une configuration spécifique aux arbres de travail, vous pouvez activer l'extension \"worktreeConfig\", par exemple :"
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr "$ git config extensions.worktreeConfig true\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr "Dans ce mode, la configuration spécifique reste dans le chemin indiqué par `git rev-parse --git-path config.worktree`. Vous pouvez ajouter ou mettre à jour la configuration dans ce fichier avec `git config --worktree`. Les anciennes versions de Git refuseront l'accès aux dépôts avec cette extension."
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr "Notez que dans ce fichier, l'exception pour `core.bare` et `core.worktree` a disparu. Si vous les avez dans $GIT_DIR/config avant, vous devez les déplacer vers `config.worktree` de l'arbre de travail principal. Vous pouvez également profiter de cette occasion pour revoir et déplacer d'autres configurations que vous ne voulez pas partager dans tous les arbres de travail :"
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr "`core.worktree` et `core.bare` ne devraient jamais être partagés"
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr "Il est recommandé de paramétrer `core.sparseCheckout` par arbre de travail, à moins que vous ne soyez sûr de toujours utiliser des extractions partielles pour tous les arbres de travail."
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr "DÉTAILS"
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr "Chaque arbre de travail lié possède un sous-répertoire privé dans le répertoire $ GIT_DIR/worktrees du dépôt. Le nom du sous-répertoire privé est généralement le nom de base du chemin de l'arbre de travail lié, éventuellement accompagné d'un numéro pour le rendre unique. Par exemple, lorsque `$GIT_DIR=/chemin/principal/ .git`, la commande`git worktree add /chemin/autre/test-prochain prochain` crée l'arbre de travail lié dans `/chemin/autre/test-prochain` et crée aussi un répertoire `$GIT_DIR/worktrees/test-prochain` (ou`$GIT_DIR/worktrees/test-prochain1` si `test-prochain` est déjà pris)."
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr "Dans un arbre de travail lié, $GIT_DIR est défini pour pointer vers ce répertoire privé (par exemple, `/chemin/principal/.git/worktrees/test-prochain` dans l'exemple) et $GIT_COMMON_DIR est défini pour pointer vers l'arbre de travail principal. $GIT_DIR (par exemple `/chemin/principal/.git`). Ces paramètres sont définis dans un fichier `.git` situé dans le répertoire supérieur de l'arbre de travail lié."
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr "La résolution du chemin via `git rev-parse --git-path` utilise soit $GIT_DIR soit $GIT_COMMON_DIR selon le chemin. Par exemple, dans l'arbre de travail lié `git rev-parse --git-path HEAD` renvoie `/chemin/principal/.git/worktrees/test-prochain/HEAD` (pas `/chemin/autre/test-prochain/.git/HEAD` ou `/chemin/principal/.git/HEAD`) tandis que `git rev-parse --git-path refs/heads/master` utilise $GIT_COMMON_DIR et retourne `/chemin/principal/.git/refs/heads/master`, puisque les réfs sont partagées sur tous les arbres de travail, sauf refs/bisect et refs/worktree."
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr "Voir linkgit:gitrepository-layout[5] pour plus d'informations. La règle de base est de ne pas faire d'hypothèse sur l'appartenance d'un chemin à $GIT_DIR ou $GIT_COMMON_DIR lorsque vous devez accéder directement à quelque chose à l'intérieur de $GIT_DIR. Utilisez `git rev-parse --git-path` pour obtenir le chemin final."
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr "Si vous déplacez manuellement un arbre de travail lié, vous devez mettre à jour le fichier 'gitdir' dans le répertoire de l'entrée. Par exemple, si un arbre de travail lié est déplacé vers `/nouveau-chemin/test-prochain` et que son fichier` .git` pointe vers `/chemin/principal/.git /worktrees/test-prochain`, puis mettez à jour`/chemin/principal/.git/worktrees/test-prochain/gitdir` pour référencer `/nouveau-chemin/test-prochain` à la place."
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr "Pour éviter qu'une entrée $GIT_DIR/worktrees ne soit élaguée (ce qui peut être utile dans certaines situations, comme lorsque l'arbre de travail de l'entrée est stocké sur un support amovible), utilisez la commande `git worktree lock`, qui ajoute un fichier nommé 'locked' au répertoire de l'entrée. Le fichier contient le motif en texte clair. Par exemple, si le fichier `.git` d'un arbre de travail lié pointe vers `/chemin/principal/.git/worktrees/test-prochain`, alors un fichier nommé `/chemin/principal/.git/worktrees/test-prochain/locked` empêchera l'élagage de l'entrée `test-prochain`.  Voir linkgit:gitrepository-layout[5] pour plus de détails."
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr "Lorsque extensions.worktreeConfig est activé, le fichier de configuration `.git/worktrees/<id>/config.worktree` est lu après `.git/config`."
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr "FORMAT DE SORTIE DE LA LISTE"
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr "La commande de liste d'arbres de travail a deux formats de sortie.  Le format par défaut affiche les détails sur une seule ligne avec des colonnes.  Par exemple :"
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -57322,19 +57417,19 @@ msgstr ""
 "/chemin/vers/autre-arbre-de-travail-lié  1234abc  (detached HEAD)\n"
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr "Format de la porcelaine"
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr "Le format de porcelaine comporte une ligne par attribut.  Les attributs sont énumérés avec une étiquette et une valeur séparées par un seul espace.  Les attributs booléens (comme 'bare' et 'detached') sont énumérés sous forme d'étiquette uniquement, et ne sont présents que si et seulement si la valeur est vraie.  Le premier attribut d'un arbre de travail est toujours `worktree`, une ligne vide indique la fin de l'enregistrement.  Par exemple :"
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -57346,7 +57441,7 @@ msgstr ""
 "bare\n"
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -57358,7 +57453,7 @@ msgstr ""
 "branch refs/heads/master\n"
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -57370,13 +57465,13 @@ msgstr ""
 "detached\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr "Vous êtes au milieu d'une séance de refactorisation et votre patron arrive et exige que vous répariez quelque chose immédiatement. Vous pouvez généralement utiliser linkgit:git-stash[1] pour stocker temporairement vos modifications, cependant, votre arbre de travail est dans un tel état de désordre (avec des fichiers nouveaux, déplacés et supprimés, et d'autres éléments éparpillés) que vous ne voulez pas risquer d'en déranger quoi que ce soit. Au lieu de cela, vous créez une arborescence de travail liée temporaire pour effectuer le correctif d'urgence, le supprimez lorsque vous avez terminé, puis reprenez votre session de refactoring précédente."
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -57394,7 +57489,7 @@ msgstr ""
 "$ git worktree remove ../temp\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr "L'extraction multiple en général est encore expérimentale, et le support des sous-modules est incomplet. Il n'est PAS recommandé d'effectuer des extractions multiples d'un superprojet."
@@ -60194,7 +60289,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr "partie locale de l'e-mail de l'auteur (la partie avant le signe \"@\")"
@@ -60355,6 +60450,13 @@ msgstr "e-mail du validateur (en respectant .mailmap, voir"
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, fuzzy, priority:260
+#| msgid "author email local-part (the part before the '@' sign)"
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr "partie locale de l'e-mail de l'auteur (la partie avant le signe \"@\")"
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -60363,8 +60465,9 @@ msgstr "'%cL'"
 
 #. type: Plain text
 #: en/pretty-formats.txt:201
-#, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+#, fuzzy, priority:260
+#| msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr "partie locale de l'auteur (voir '%cl') en respectant .mailmap, voir"
 
 #. type: Labeled list
@@ -62930,20 +63033,13 @@ msgstr "La deuxième question est celle de l'audit. Lorsque plusieurs contribute
 #: en/rev-list-options.txt:679
 #, priority:260
 msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
-msgstr ""
-"En plus des commits indiqués dans l’historique par défaut, montrer chaque "
-"commit de fusion qui n’est pas MEMEARBRE à son premier parent, mais qui est "
-"MEMEARBRE à un parent ultérieur."
+msgstr "En plus des commits indiqués dans l’historique par défaut, montrer chaque commit de fusion qui n’est pas MEMEARBRE à son premier parent, mais qui est MEMEARBRE à un parent ultérieur."
 
 #. type: Plain text
 #: en/rev-list-options.txt:684
 #, priority:260
 msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
-msgstr ""
-"Quand un commit de fusion est inclus par `--show-pulls`, cette fusion est "
-"traitée comme si elle avait \"tiré\" le changement d'une autre branche. "
-"Lorsque l'on utilise `--show-pulls` sur cet exemple (et aucune autre option)"
-", le graphe résultant est :"
+msgstr "Quand un commit de fusion est inclus par `--show-pulls`, cette fusion est traitée comme si elle avait \"tiré\" le changement d'une autre branche. Lorsque l'on utilise `--show-pulls` sur cet exemple (et aucune autre option), le graphe résultant est :"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:687
@@ -66173,6 +66269,13 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
+#~ msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+#~ msgstr "`move` refuse de déplacer un arbre de travail verrouillé à moins que `--force` ne soit spécifié deux fois."
+
 #~ msgid "Countermand `commit.gpgSign` configuration variable that is set to force each and every commit to be signed."
 #~ msgstr "Annuler la variable de configuration `commit.gpgSign` qui force tous les commits à être signés."
 
diff --git a/po/documentation.hu.po b/po/documentation.hu.po
index 88a8a8eda02d50443e9afc87fa75faeebb537365..bae5e916a5d9ed8fba86bfe25600a21f79848735 100644
--- a/po/documentation.hu.po
+++ b/po/documentation.hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2019-12-10 22:56+0100\n"
 "Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -130,7 +130,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -478,7 +478,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -490,7 +490,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2038,7 +2038,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4311,7 +4311,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4323,7 +4323,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4878,259 +4878,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5268,7 +5274,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5408,7 +5414,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5564,7 +5570,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5576,13 +5582,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5719,7 +5725,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5761,7 +5767,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6043,7 +6049,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6397,7 +6403,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6409,13 +6415,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7172,7 +7178,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7760,7 +7766,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9128,7 +9134,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9722,7 +9728,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9848,47 +9854,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10243,7 +10255,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11825,7 +11837,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13618,7 +13630,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13714,7 +13726,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13799,9 +13811,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13840,7 +13853,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15982,7 +15995,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17407,7 +17420,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18882,19 +18895,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19464,7 +19477,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19590,156 +19603,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19748,31 +19774,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19781,31 +19807,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19814,31 +19840,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19847,31 +19873,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19879,22 +19905,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20090,78 +20117,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20170,55 +20209,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20228,25 +20267,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20684,259 +20757,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20953,241 +21038,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21195,259 +21280,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21455,73 +21540,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21533,55 +21618,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21590,25 +21675,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21616,19 +21701,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21638,43 +21723,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21682,31 +21767,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21716,25 +21801,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21744,19 +21829,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21764,31 +21849,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21796,67 +21881,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21864,283 +21949,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22149,49 +22234,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22211,7 +22296,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22220,7 +22305,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22231,13 +22316,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22252,13 +22337,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22266,25 +22351,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22293,7 +22378,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22305,307 +22390,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23216,19 +23301,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27027,7 +27112,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28476,7 +28561,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28547,12 +28632,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29043,20 +29140,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29098,226 +29213,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29327,19 +29462,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31219,9 +31354,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36305,7 +36440,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38698,12 +38833,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41278,7 +41409,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41301,7 +41432,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41319,7 +41450,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41427,13 +41558,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41451,7 +41582,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41559,7 +41690,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41571,7 +41702,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46700,7 +46831,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46739,6 +46870,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48922,7 +49059,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49054,7 +49191,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49102,7 +49239,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53348,13 +53485,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53366,7 +53503,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53468,391 +53605,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56102,295 +56239,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56400,19 +56537,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56421,7 +56558,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56430,7 +56567,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56439,13 +56576,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56457,7 +56594,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59223,7 +59360,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59384,6 +59521,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59393,7 +59536,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65100,3 +65243,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.id.po b/po/documentation.id.po
index 862908faebeb2bea67215aa5eeeaeb9ce7bf45da..0838d276d4442840a413834ed41cf6b4d418ed92 100644
--- a/po/documentation.id.po
+++ b/po/documentation.id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -130,7 +130,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -478,7 +478,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -490,7 +490,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2038,7 +2038,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4311,7 +4311,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4323,7 +4323,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4878,259 +4878,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5268,7 +5274,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5408,7 +5414,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5564,7 +5570,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5576,13 +5582,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5719,7 +5725,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5761,7 +5767,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6043,7 +6049,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6397,7 +6403,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6409,13 +6415,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7172,7 +7178,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7760,7 +7766,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9128,7 +9134,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9722,7 +9728,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9848,47 +9854,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10243,7 +10255,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11825,7 +11837,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13618,7 +13630,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13714,7 +13726,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13799,9 +13811,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13840,7 +13853,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15982,7 +15995,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17407,7 +17420,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18882,19 +18895,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19464,7 +19477,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19590,156 +19603,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19748,31 +19774,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19781,31 +19807,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19814,31 +19840,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19847,31 +19873,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19879,22 +19905,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20090,78 +20117,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20170,55 +20209,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20228,25 +20267,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20684,259 +20757,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20953,241 +21038,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21195,259 +21280,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21455,73 +21540,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21533,55 +21618,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21590,25 +21675,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21616,19 +21701,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21638,43 +21723,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21682,31 +21767,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21716,25 +21801,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21744,19 +21829,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21764,31 +21849,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21796,67 +21881,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21864,283 +21949,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22149,49 +22234,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22211,7 +22296,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22220,7 +22305,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22231,13 +22316,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22252,13 +22337,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22266,25 +22351,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22293,7 +22378,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22305,307 +22390,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23216,19 +23301,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27027,7 +27112,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28476,7 +28561,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28547,12 +28632,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29043,20 +29140,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29098,226 +29213,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29327,19 +29462,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31219,9 +31354,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36305,7 +36440,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38698,12 +38833,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41278,7 +41409,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41301,7 +41432,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41319,7 +41450,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41427,13 +41558,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41451,7 +41582,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41559,7 +41690,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41571,7 +41702,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46700,7 +46831,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46739,6 +46870,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48922,7 +49059,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49054,7 +49191,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49102,7 +49239,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53348,13 +53485,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53366,7 +53503,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53468,391 +53605,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56102,295 +56239,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56400,19 +56537,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56421,7 +56558,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56430,7 +56567,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56439,13 +56576,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56457,7 +56594,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59223,7 +59360,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59384,6 +59521,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59393,7 +59536,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65100,3 +65243,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.is.po b/po/documentation.is.po
index b93865fa0fcae5e1794d027a47e91130b9ef7d20..54b9ea2ffd0616e4b9ef03a23c5179dd0c98409f 100644
--- a/po/documentation.is.po
+++ b/po/documentation.is.po
@@ -10,10 +10,10 @@ msgstr ""
 "PO-Revision-Date: 2020-07-09 12:25+0200\n"
 "Last-Translator: Jean-Noel AVILA <jn.avila@free.fr>\n"
 "Language-Team: Icelandic\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
 
 #. type: Labeled list
 #: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
diff --git a/po/documentation.it.po b/po/documentation.it.po
index 420e478897a24024400ab6b4df6d4d079a33ee06..fc8dbef7a1294d76f857d9beb5ce7063fbc82a6b 100644
--- a/po/documentation.it.po
+++ b/po/documentation.it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-05-24 21:41+0000\n"
 "Last-Translator: Ivan Fossati <vania1366@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 4.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -133,7 +133,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -481,7 +481,7 @@ msgid "Get and set repository or global options."
 msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +493,7 @@ msgid "Git data exporter."
 msgstr "Esportatore di dati Git"
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2041,7 +2041,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi"
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4334,7 +4334,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, fuzzy, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "ignora modifiche agli spazi bianchi a fine riga"
@@ -4346,7 +4346,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, fuzzy, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
@@ -4916,259 +4916,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, fuzzy, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<path>]"
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, fuzzy, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr "Quando eseguito da una sottocartella del progetto, può essere detto di escludere le modifiche all'esterno della cartella e mostrare i percorsi relativi ad essa con questa opzione. Quando non ci si trova in una sottocartella (ad es. In un repository nudo), è possibile assegnare un nome a quale aottocartellarendere l'output relativo fornendo un <path> come argomento."
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, fuzzy, priority:280
 msgid "Treat all files as text."
 msgstr "tratta tutti i file come se fossero di testo"
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, fuzzy, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr "Ignora gli spazi bianchi quando si confrontano le linee. Questo ignora le differenze anche se una riga ha spazi bianchi dove l'altra riga non ne ha."
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, fuzzy, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "ignora modifiche che riguardano solo righe vuote"
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, fuzzy, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr "Mostra il contesto tra hunk diff, fino al numero specificato di linee, fondendo in tal modo hunk vicini l'uno all'altro. Il valore predefinito è `diff.interHunkContext` o 0 se l'opzione di configurazione non è impostata."
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, fuzzy, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr "Mostra tutte le funzioni circostanti delle modifiche."
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, fuzzy, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "Disabilita tutto l'output del programma. Implica `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, fuzzy, priority:280
 msgid "Disallow external diff drivers."
 msgstr "Non consentire driver diff esterni."
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, fuzzy, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<when>]"
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, fuzzy, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr "Ignora le modifiche ai sottomoduli nella generazione diff. <when> può essere \"none\", \"untracked\", \"dirty\" o \"all\", che è l'impostazione predefinita. L'uso di \"none\" considererà il sottomodulo modificato quando contiene file non tracciati o modificati o il suo HEAD differisce dal commit registrato nel superprogetto e può essere usato per sovrascrivere qualsiasi impostazione dell'opzione 'ignore' in linkgit: git-config [1 ] o linkgit: gitmodules [5]. Quando si utilizza \"untracked\", i sottomoduli non sono considerati sporchi quando contengono solo contenuto non tracciato (ma sono ancora sottoposti a scansione per il contenuto modificato). L'uso di \"dirty\" ignora tutte le modifiche all'albero di lavoro dei sottomoduli, vengono mostrate solo le modifiche ai commit archiviati nel superprogetto (questo era il comportamento fino alla 1.7.0). L'uso di \"all\" nasconde tutte le modifiche ai sottomoduli."
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, fuzzy, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, fuzzy, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "non visualizzare alcun prefisso sorgente o destinazione"
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, fuzzy, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefix>"
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, fuzzy, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, fuzzy, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "Per una spiegazione più dettagliata di queste opzioni comuni, vedere anche linkgit: gitdiffcore [7]."
@@ -5306,7 +5312,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr "Vedere anche l'opzione di configurazione`fetch.negotiationAlgorithm`documentata in linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5446,7 +5452,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5602,7 +5608,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5614,13 +5620,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5762,7 +5768,7 @@ msgstr ""
 "\t  [--] [<pathspec>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, fuzzy, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "DESCRIZIONE"
@@ -5804,7 +5810,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Prego vedere linkgit:git-commit[1] per madalità alternative per aggiungere un contenuto al commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, fuzzy, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPZIONI"
@@ -6086,7 +6092,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Questa opzione può essere usata per separare opzioni di comando di linea dalla lista dei file, (utile quando i nomi dei file potrebbero essere errati le opzioni del comando di linea)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, fuzzy, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "ESEMPI"
@@ -6464,7 +6470,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modificando i contenuti del contesto o rimuovere le linee."
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, fuzzy, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VEDERE ANCHE"
@@ -6476,13 +6482,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, fuzzy, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, fuzzy, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Parte del pacchetto linkgit:git[1]"
@@ -7239,7 +7245,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7827,7 +7833,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9195,7 +9201,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9789,7 +9795,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9915,46 +9921,52 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10309,7 +10321,7 @@ msgstr "Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gl
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11891,7 +11903,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13703,7 +13715,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr "Non viene eseguito il checkout di HEAD dopo il completamento del clone."
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13799,7 +13811,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr "Quando fornito, e al repository da cui clonare si accede tramite ssh, questo specifica un percorso non predefinito per il comando eseguito dall'altra parte."
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, fuzzy, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template=<modello_cartella>"
@@ -13885,7 +13897,7 @@ msgstr "Può essere usato insieme a `--single-branch` per clonare e mantenere un
 #. type: Labeled list
 #: en/git-clone.txt:262
 #, fuzzy, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<pathspec]"
 
 #. type: Plain text
@@ -13925,7 +13937,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr "Tutti i sottomoduli che vengono clonati useranno lo stato del ramo di tracciamento remoto del sottomodulo per aggiornare il sottomodulo, piuttosto che lo SHA-1 registrato del superprogetto. Equivale a passare `--remote` a` git submodule update`."
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, fuzzy, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<git dir>"
@@ -16080,7 +16092,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17505,7 +17517,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18980,19 +18992,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19562,7 +19574,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19688,156 +19700,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc."
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19846,31 +19871,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19879,31 +19904,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19912,31 +19937,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19945,31 +19970,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19977,22 +20002,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20188,78 +20214,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20268,55 +20306,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20326,25 +20364,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20782,259 +20854,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
+#, priority:100
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, fuzzy, no-wrap, priority:100
 msgid "Commands"
 msgstr "comando"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -21051,241 +21135,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21293,259 +21377,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21553,73 +21637,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21631,55 +21715,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21688,25 +21772,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21714,19 +21798,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21736,43 +21820,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21780,31 +21864,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21814,25 +21898,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21842,19 +21926,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21862,31 +21946,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21894,67 +21978,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21962,283 +22046,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "forza l'operazione"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, fuzzy, no-wrap, priority:100
 msgid "done"
 msgstr "none"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22247,49 +22331,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22309,7 +22393,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22318,7 +22402,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22329,13 +22413,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22350,13 +22434,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22364,25 +22448,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22391,7 +22475,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22403,307 +22487,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23314,19 +23398,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27125,7 +27209,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, fuzzy, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr "Senza questa opzione, i nomi dei percorsi con caratteri \"insoliti\" sono citati come spiegato per la variabile di configurazione `core.quotePath` (vedi linkgit: git-config [1])."
 
 #. type: Labeled list
@@ -28574,7 +28658,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28645,12 +28729,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29141,20 +29237,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+#, fuzzy, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr "Questa opzione può essere specificata più di una volta."
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 #, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29196,11 +29310,12 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, fuzzy, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29208,217 +29323,235 @@ msgstr ""
 "\t  [--shared[=<permissions>]] [directory]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, fuzzy, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "Questo comando crea un archivio Git vuoto - sostanzialmente una directory `.git` con sottocartella per` oggetti`, `refs / heads`,` refs / tag` e file modello. Viene anche creato un file iniziale `HEAD` che fa riferimento all'HEAD del ramo master."
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, fuzzy, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "Se è impostata la variabile d'ambiente `$ GIT_DIR`, esso specifica un percorso da usare invece di` ./. Git` per la base del repository."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, fuzzy, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "Se la directory di archiviazione degli oggetti viene specificata tramite la variabile d'ambiente `$ GIT_OBJECT_DIRECTORY`, vengono create le directory sha1 al di sotto, altrimenti viene utilizzata la directory predefinita $ GIT_DIR / objects."
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, fuzzy, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "L'esecuzione di \"git init\" in un repository esistente è sicura. Non sovrascriverà le cose che sono già lì. Il motivo principale per la riesecuzione di 'git init' è quello di raccogliere i modelli appena aggiunti (o spostare il repository in un altro posto se --separate-git-dir è dato)."
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, fuzzy, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "Only print error and warning messages; all other output will be suppressed."
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, fuzzy, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "Crea un archivio base. Se l'ambiente `GIT_DIR` non è impostato, è impostato sulla cartella di lavoro corrente."
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, fuzzy, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "Specifica la cartella da cui verranno utilizzati i modelli. (Vedi la sezione \"DIRECTORY DEL MODELLO\" di seguito.)"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, fuzzy, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "Invece di inizializzare il repository come directory su `$ GIT_DIR` o` ./. Git / `, crea lì un file di testo contenente il percorso del repository effettivo. Questo file funge da collegamento simbolico Git indipendente dal filesystem al repository."
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, fuzzy, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "Se questa è una reinizializzazione, il repository verrà mosso su un percorso specifico."
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+msgid "-b <branch-name"
+msgstr "--branch<nome>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr "--branch<nome>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, fuzzy, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, fuzzy, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr "Specificare che il repository Git deve essere condiviso tra più utenti. Ciò consente agli utenti appartenenti allo stesso gruppo di inviare il repository. Se specificato, la variabile di configurazione \"core.sharedRepository\" è impostata in modo che i file e le directory in `$ GIT_DIR` vengano creati con le autorizzazioni richieste. Se non specificato, Git utilizzerà le autorizzazioni riportate da umask (2)."
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, fuzzy, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr "L'opzione può avere i seguenti valori, per impostazione predefinita su \"gruppo\" se non viene fornito alcun valore:"
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, fuzzy, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask' (or 'false')"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, fuzzy, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "Usa le autorizzazioni riportate da umask (2). L'impostazione predefinita, quando `--shared` non è specificato."
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, fuzzy, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group' (o 'true')"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, fuzzy, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "Rendi il gruppo di repository scrivibile, (e g + sx, poiché il gruppo git potrebbe non essere il gruppo principale di tutti gli utenti). Viene utilizzato per allentare le autorizzazioni di un valore umask (2) altrimenti sicuro. Si noti che umask si applica ancora agli altri bit di autorizzazione (ad es. Se umask è \"0022\", l'uso di \"gruppo\" non rimuoverà i privilegi di lettura da altri utenti (non di gruppo)). Vedere '0xxx' per come specificare esattamente le autorizzazioni del repository."
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, fuzzy, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all (o 'world' o 'everybody')"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, fuzzy, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "Come \"gruppo\", ma rende il repository leggibile da tutti gli utenti."
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, fuzzy, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr "'0xxx' è un numero ottale e ogni file avrà la modalità '0xxx'. '0xxx' sostituirà il valore umask (2) degli utenti (e non solo allenterà le autorizzazioni come 'group' e 'all'). '0640' creerà un repository leggibile in gruppo, ma non scrivibile in gruppo o accessibile ad altri. '0660' creerà un repository leggibile e scrivibile per l'utente e il gruppo attuali, ma inaccessibile agli altri."
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, fuzzy, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr "Per impostazione predefinita, il flag di configurazione `receive.denyNonFastForwards` è abilitato nei repository condivisi, quindi non è possibile forzare un push non fast-forwarding in esso."
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, fuzzy, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr "Se si fornisce una 'directory', il comando viene eseguito al suo interno. Se questa directory non esiste, verrà creata."
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, fuzzy, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "CARTELLA MODELLO"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, fuzzy, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "I file e le directory nella directory del modello il cui nome non inizia con un punto verranno copiati in `$ GIT_DIR` dopo la sua creazione."
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, fuzzy, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "La cartella modello sarà una delle seguenti (in ordine):"
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, fuzzy, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "l'argomento dato con l'opzione `--template`;"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, fuzzy, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "a variabile di configurazione `init.templateDir`; o"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, fuzzy, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "La cartella modello predefinita: `/usr/share/git-core/templates`."
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, fuzzy, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "La directory del modello predefinita include alcune strutture di directory, suggerito \"escludi pattern\" (vedi link git: gitignore [5]) e file hook di esempio."
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, fuzzy, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr "Gli hook di esempio sono tutti disabilitati per impostazione predefinita. Per abilitare uno dei hook di esempio rinominalo rimuovendo il suo suffisso `.sample`."
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, fuzzy, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr "Vedi linkgit: githooks [5] per maggiori informazioni generali sull'esecuzione di hook."
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, fuzzy, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr "Avviare un repository Git nuovo per una base di un codice esistente"
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, fuzzy, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29432,19 +29565,19 @@ msgstr ""
 "$ git commit    <3>\n"
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, fuzzy, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr "Crea una directory /path/to/my/codebase/.git."
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, fuzzy, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr "Registra lo stato incontaminato come primo commit nella cronologia."
@@ -31327,9 +31460,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36413,7 +36546,7 @@ msgid "Show progress."
 msgstr "visualizza l'avanzamento"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38806,12 +38939,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41385,7 +41514,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41408,7 +41537,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41426,7 +41555,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41534,13 +41663,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41558,7 +41687,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41666,7 +41795,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41678,7 +41807,7 @@ msgstr "update"
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46811,7 +46940,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46850,6 +46979,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -49033,7 +49168,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49165,7 +49300,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49213,7 +49348,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53464,13 +53599,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53482,7 +53617,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53584,391 +53719,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56218,295 +56353,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56516,19 +56651,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56537,7 +56672,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56546,7 +56681,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56555,13 +56690,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56573,7 +56708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59339,7 +59474,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59500,6 +59635,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59509,7 +59650,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65224,6 +65365,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.ko.po b/po/documentation.ko.po
index 69edddd958701abf7409b44823d08481adc798ba..50ee2d11f71ab498a9cfebee7661830a9b3bd2fb 100644
--- a/po/documentation.ko.po
+++ b/po/documentation.ko.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l10n\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-03-02 13:01+0100\n"
 "Last-Translator: Jean-Noël AVILA <jn.avila@free.fr>\n"
 "Language-Team: Korean\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -131,7 +131,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -479,7 +479,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -491,7 +491,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2039,7 +2039,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4312,7 +4312,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4324,7 +4324,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4879,259 +4879,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5269,7 +5275,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5409,7 +5415,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5565,7 +5571,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5577,13 +5583,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5720,7 +5726,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5762,7 +5768,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6044,7 +6050,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6398,7 +6404,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6410,13 +6416,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7173,7 +7179,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7761,7 +7767,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9129,7 +9135,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9723,7 +9729,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9849,47 +9855,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10244,7 +10256,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11826,7 +11838,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13619,7 +13631,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13715,7 +13727,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13800,9 +13812,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13841,7 +13854,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15983,7 +15996,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17408,7 +17421,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18883,19 +18896,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19465,7 +19478,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19591,156 +19604,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19749,31 +19775,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19782,31 +19808,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19815,31 +19841,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19848,31 +19874,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19880,22 +19906,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20091,78 +20118,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20171,55 +20210,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20229,25 +20268,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20685,259 +20758,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20954,241 +21039,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21196,259 +21281,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21456,73 +21541,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21534,55 +21619,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21591,25 +21676,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21617,19 +21702,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21639,43 +21724,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21683,31 +21768,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21717,25 +21802,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21745,19 +21830,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21765,31 +21850,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21797,67 +21882,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21865,283 +21950,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22150,49 +22235,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22212,7 +22297,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22221,7 +22306,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22232,13 +22317,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22253,13 +22338,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22267,25 +22352,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22294,7 +22379,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22306,307 +22391,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23217,19 +23302,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27025,7 +27110,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28474,7 +28559,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28545,12 +28630,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29041,20 +29138,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29096,226 +29211,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29325,19 +29460,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31217,9 +31352,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36303,7 +36438,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38696,12 +38831,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41275,7 +41406,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41298,7 +41429,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41316,7 +41447,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41424,13 +41555,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41448,7 +41579,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41556,7 +41687,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41568,7 +41699,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46696,7 +46827,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46735,6 +46866,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48918,7 +49055,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49050,7 +49187,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49098,7 +49235,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53343,13 +53480,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53361,7 +53498,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53463,391 +53600,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56097,295 +56234,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56395,19 +56532,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56416,7 +56553,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56425,7 +56562,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56434,13 +56571,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56452,7 +56589,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59212,7 +59349,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59373,6 +59510,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59382,7 +59525,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65088,3 +65231,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.mr.po b/po/documentation.mr.po
index 232014ed0fa87836a56c09a122b78d637f50cef5..f457d65ce9f5ffec3a00db283dec1886805f04ef 100644
--- a/po/documentation.mr.po
+++ b/po/documentation.mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-manpages-l 10n\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-02-17 13:50+0000\n"
 "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n"
 "Language-Team: Marathi\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Weblate 3.11-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -133,7 +133,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -481,7 +481,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +493,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2041,7 +2041,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4314,7 +4314,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4326,7 +4326,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4881,259 +4881,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5271,7 +5277,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5411,7 +5417,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5567,7 +5573,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5579,13 +5585,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5722,7 +5728,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "वर्णन"
@@ -5764,7 +5770,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "पर्याय"
@@ -6046,7 +6052,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6400,7 +6406,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6412,13 +6418,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7175,7 +7181,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7763,7 +7769,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9131,7 +9137,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9725,7 +9731,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9851,47 +9857,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10246,7 +10258,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11828,7 +11840,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13621,7 +13633,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13717,7 +13729,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13802,9 +13814,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13843,7 +13856,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15985,7 +15998,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17410,7 +17423,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18885,19 +18898,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19467,7 +19480,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19593,156 +19606,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19751,31 +19777,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19784,31 +19810,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19817,31 +19843,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19850,31 +19876,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19882,22 +19908,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20093,78 +20120,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20173,55 +20212,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20231,25 +20270,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20687,259 +20760,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20956,241 +21041,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21198,259 +21283,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21458,73 +21543,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21536,55 +21621,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21593,25 +21678,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21619,19 +21704,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21641,43 +21726,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21685,31 +21770,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21719,25 +21804,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21747,19 +21832,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21767,31 +21852,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21799,67 +21884,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21867,283 +21952,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22152,49 +22237,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22214,7 +22299,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22223,7 +22308,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22234,13 +22319,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22255,13 +22340,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22269,25 +22354,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22296,7 +22381,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22308,307 +22393,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23219,19 +23304,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27027,7 +27112,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28476,7 +28561,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28547,12 +28632,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29043,20 +29140,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29098,226 +29213,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29327,19 +29462,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31219,9 +31354,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36305,7 +36440,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38698,12 +38833,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41277,7 +41408,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41300,7 +41431,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41318,7 +41449,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41426,13 +41557,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41450,7 +41581,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41558,7 +41689,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41570,7 +41701,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46698,7 +46829,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46737,6 +46868,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48920,7 +49057,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49052,7 +49189,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49100,7 +49237,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53345,13 +53482,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53363,7 +53500,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53465,391 +53602,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56099,295 +56236,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56397,19 +56534,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56418,7 +56555,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56427,7 +56564,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56436,13 +56573,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56454,7 +56591,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59219,7 +59356,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59380,6 +59517,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59389,7 +59532,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65095,3 +65238,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.nb_NO.po b/po/documentation.nb_NO.po
index 9d50b54eaae970b726aa1624bc3732afa97019d9..f40b2fab5ac4ef81312426b1a1927bd31321742c 100644
--- a/po/documentation.nb_NO.po
+++ b/po/documentation.nb_NO.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2019-10-14 23:28+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -128,7 +128,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -478,7 +478,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -490,7 +490,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2039,7 +2039,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4312,7 +4312,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4324,7 +4324,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4879,259 +4879,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5269,7 +5275,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5409,7 +5415,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5565,7 +5571,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5577,13 +5583,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5720,7 +5726,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5762,7 +5768,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6045,7 +6051,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6399,7 +6405,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6411,13 +6417,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7174,7 +7180,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7762,7 +7768,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9130,7 +9136,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9724,7 +9730,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9850,47 +9856,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10245,7 +10257,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11827,7 +11839,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13620,7 +13632,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13716,7 +13728,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13801,9 +13813,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13842,7 +13855,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15984,7 +15997,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17409,7 +17422,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18884,19 +18897,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19466,7 +19479,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19592,156 +19605,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19750,31 +19776,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19783,31 +19809,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19816,31 +19842,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19849,31 +19875,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19881,22 +19907,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20092,78 +20119,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20172,55 +20211,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20230,25 +20269,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20686,259 +20759,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20955,241 +21040,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21197,259 +21282,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21457,73 +21542,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21535,55 +21620,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21592,25 +21677,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21618,19 +21703,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21640,43 +21725,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21684,31 +21769,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21718,25 +21803,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21746,19 +21831,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21766,31 +21851,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21798,67 +21883,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21866,283 +21951,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22151,49 +22236,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22213,7 +22298,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22222,7 +22307,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22233,13 +22318,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22254,13 +22339,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22268,25 +22353,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22295,7 +22380,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22307,307 +22392,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23218,19 +23303,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27030,7 +27115,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28479,7 +28564,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28550,12 +28635,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29046,20 +29143,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29101,226 +29216,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29330,19 +29465,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31222,9 +31357,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36308,7 +36443,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38701,12 +38836,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41281,7 +41412,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41304,7 +41435,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41322,7 +41453,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41430,13 +41561,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41454,7 +41585,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41562,7 +41693,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41574,7 +41705,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46704,7 +46835,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46743,6 +46874,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48926,7 +49063,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49059,7 +49196,7 @@ msgstr "--branch"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49107,7 +49244,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53358,13 +53495,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53376,7 +53513,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53478,391 +53615,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56113,295 +56250,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56411,19 +56548,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56432,7 +56569,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56441,7 +56578,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56450,13 +56587,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56468,7 +56605,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59241,7 +59378,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59406,6 +59543,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59415,7 +59558,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65126,6 +65269,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, ignore-same
 #~ msgid "git-remote-testgit(1)"
 #~ msgstr "git-remote-testgit(1)"
diff --git a/po/documentation.nl.po b/po/documentation.nl.po
index 45700fe70972d694b5ee713c08817fd2b3dccb74..ffb3a58ef487786873ac6005a5bf298000fc5f5e 100644
--- a/po/documentation.nl.po
+++ b/po/documentation.nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2019-10-31 12:31+0100\n"
 "Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -130,7 +130,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -478,7 +478,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -490,7 +490,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2038,7 +2038,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4311,7 +4311,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4323,7 +4323,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4878,259 +4878,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5268,7 +5274,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5408,7 +5414,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5564,7 +5570,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5576,13 +5582,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5719,7 +5725,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5761,7 +5767,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6043,7 +6049,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6397,7 +6403,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6409,13 +6415,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7172,7 +7178,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7760,7 +7766,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9128,7 +9134,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9722,7 +9728,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9848,47 +9854,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--patch-format"
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--patch-format"
 msgid "--suffix <format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10243,7 +10255,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11825,7 +11837,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13618,7 +13630,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13714,7 +13726,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13799,9 +13811,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13840,7 +13853,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15982,7 +15995,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17407,7 +17420,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18882,19 +18895,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19464,7 +19477,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19590,156 +19603,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19748,31 +19774,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19781,31 +19807,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19814,31 +19840,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19847,31 +19873,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19879,22 +19905,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20090,78 +20117,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20170,55 +20209,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20228,25 +20267,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20684,259 +20757,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20953,241 +21038,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21195,259 +21280,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21455,73 +21540,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21533,55 +21618,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21590,25 +21675,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21616,19 +21701,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21638,43 +21723,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21682,31 +21767,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21716,25 +21801,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21744,19 +21829,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21764,31 +21849,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21796,67 +21881,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21864,283 +21949,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22149,49 +22234,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22211,7 +22296,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22220,7 +22305,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22231,13 +22316,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22252,13 +22337,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22266,25 +22351,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22293,7 +22378,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22305,307 +22390,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23216,19 +23301,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27027,7 +27112,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28476,7 +28561,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28547,12 +28632,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29043,20 +29140,39 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--patch-format"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29098,227 +29214,247 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 #| msgid "--patch-format"
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29328,19 +29464,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31220,9 +31356,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36307,7 +36443,7 @@ msgid "Show progress."
 msgstr "--progress"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, fuzzy, no-wrap, priority:240
 #| msgid "--expiry-date"
 msgid "--expire <time>"
@@ -38708,12 +38844,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41293,7 +41425,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41316,7 +41448,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41334,7 +41466,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41445,13 +41577,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41470,7 +41602,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41581,7 +41713,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41594,7 +41726,7 @@ msgstr "update"
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46759,10 +46891,9 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-show-index.txt:13
-#, fuzzy, no-wrap, priority:100
-#| msgid "linkgit:git-show-index[1]"
-msgid "'git show-index'\n"
-msgstr "linkgit:git-show-index[1]"
+#, no-wrap, priority:100
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
+msgstr ""
 
 #. type: Plain text
 #: en/git-show-index.txt:22
@@ -46800,6 +46931,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48992,7 +49129,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49125,7 +49262,7 @@ msgstr "--branch"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49173,7 +49310,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53453,13 +53590,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53471,7 +53608,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53573,392 +53710,392 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, fuzzy, no-wrap, priority:100
 #| msgid "`author`"
 msgid "Authors"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, fuzzy, priority:100
 #| msgid "linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
@@ -56217,298 +56354,298 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, fuzzy, no-wrap, priority:240
 #| msgid "--branch"
 msgid "-b <new-branch>"
 msgstr "--branch"
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, fuzzy, no-wrap, priority:240
 #| msgid "--branch"
 msgid "-B <new-branch>"
 msgstr "--branch"
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, fuzzy, no-wrap, priority:240
 #| msgid "--worktree"
 msgid "<worktree>"
 msgstr "--worktree"
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56518,20 +56655,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, fuzzy, no-wrap, priority:240
 #| msgid "porcelain"
 msgid "Porcelain Format"
 msgstr "porcelain"
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56540,7 +56677,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56549,7 +56686,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56558,13 +56695,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56576,7 +56713,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59351,7 +59488,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59515,6 +59652,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59524,7 +59667,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65253,6 +65396,14 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, fuzzy
+#~ msgid "'git show-index'\n"
+#~ msgstr "linkgit:git-show-index[1]"
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "\t(see linkgit:git-fetch[1]).\n"
 #~ msgstr "linkgit:git-fetch[1]"
diff --git a/po/documentation.pl.po b/po/documentation.pl.po
index acfc63d7b6576cf9aacba56b8377551727e9c137..df9c74167f5e360e3ba41ddeb46f9c8bbff49c70 100644
--- a/po/documentation.pl.po
+++ b/po/documentation.pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-04-23 20:24+0000\n"
 "Last-Translator: Michal Biesiada <blade-14@o2.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.0.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -132,7 +132,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -480,7 +480,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -492,7 +492,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2040,7 +2040,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4313,7 +4313,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4325,7 +4325,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4880,259 +4880,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, fuzzy, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5270,7 +5276,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5410,7 +5416,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5566,7 +5572,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5578,13 +5584,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5726,7 +5732,7 @@ msgstr ""
 "\t  [--] [<pathspec>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "OPIS"
@@ -5768,7 +5774,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPCJE"
@@ -6050,7 +6056,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "PRZYKŁADY"
@@ -6404,7 +6410,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "ZOBACZ TAKŻE"
@@ -6416,13 +6422,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7179,7 +7185,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7767,7 +7773,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9135,7 +9141,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9729,7 +9735,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9855,47 +9861,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "-o <name>"
 msgid "-o <path>"
 msgstr "-o <nazwa>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10250,7 +10262,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11832,7 +11844,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13625,7 +13637,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13721,7 +13733,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13806,9 +13818,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13847,7 +13860,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15997,7 +16010,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17422,7 +17435,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18897,19 +18910,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19479,7 +19492,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19605,156 +19618,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, fuzzy, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19766,31 +19792,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19799,31 +19825,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19832,31 +19858,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19865,31 +19891,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19897,22 +19923,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20108,78 +20135,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20188,55 +20227,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20246,25 +20285,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20702,259 +20775,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20971,241 +21056,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21213,259 +21298,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21473,73 +21558,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21551,55 +21636,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21608,25 +21693,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21634,19 +21719,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21656,43 +21741,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21700,31 +21785,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21734,25 +21819,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21762,19 +21847,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21782,31 +21867,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21814,67 +21899,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21882,283 +21967,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22167,49 +22252,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22229,7 +22314,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22238,7 +22323,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22249,13 +22334,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22270,13 +22355,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22284,25 +22369,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22311,7 +22396,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22323,307 +22408,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23234,19 +23319,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27045,7 +27130,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28494,7 +28579,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28565,12 +28650,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29061,20 +29158,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29116,226 +29231,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "-b <name>"
+msgid "-b <branch-name"
+msgstr "-b <nazwa>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29345,19 +29480,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31237,9 +31372,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36323,7 +36458,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38727,12 +38862,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41307,7 +41438,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41330,7 +41461,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41348,7 +41479,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41456,13 +41587,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41480,7 +41611,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41588,7 +41719,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41600,7 +41731,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46729,7 +46860,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46768,6 +46899,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48954,7 +49091,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49086,7 +49223,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49134,7 +49271,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53380,13 +53517,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53398,7 +53535,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53500,391 +53637,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56134,295 +56271,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56432,19 +56569,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56453,7 +56590,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56462,7 +56599,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56471,13 +56608,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56489,7 +56626,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59255,7 +59392,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59416,6 +59553,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59425,7 +59568,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65183,3 +65326,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.pot b/po/documentation.pot
index 94b0588cce98b225435c43678671b7e7a4e25cb1..1f6987bb6d4771fced763bc87e7be4d33ed13b12 100644
--- a/po/documentation.pot
+++ b/po/documentation.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, no-wrap
 msgid "-b"
 msgstr ""
@@ -135,7 +135,7 @@ msgid "-p"
 msgstr ""
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, no-wrap
 msgid "--porcelain"
 msgstr ""
@@ -507,7 +507,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, no-wrap
 msgid "linkgit:git-fast-export[1]"
 msgstr ""
@@ -518,7 +518,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, no-wrap
 msgid "linkgit:git-fast-import[1]"
 msgstr ""
@@ -1937,7 +1937,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4478,7 +4478,7 @@ msgid "ignore-space-at-eol"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
 
@@ -4489,7 +4489,7 @@ msgid "ignore-space-change"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 msgid ""
 "Ignore changes in amount of whitespace.  This ignores whitespace at line "
 "end, and considers all other sequences of one or more whitespace characters "
@@ -5152,99 +5152,106 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, no-wrap
+msgid "--no-relative"
+msgstr ""
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 msgid ""
 "When run from a subdirectory of the project, it can be told to exclude "
 "changes outside the directory and show pathnames relative to it with this "
 "option.  When you are not in a subdirectory (e.g. in a bare repository), you "
 "can name which subdirectory to make the output relative to by giving a "
-"<path> as an argument."
+"<path> as an argument.  `--no-relative` can be used to countermand both "
+"`diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, no-wrap
 msgid "-a"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, no-wrap
 msgid "--text"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, no-wrap
 msgid "--ignore-cr-at-eol"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, no-wrap
 msgid "--ignore-space-at-eol"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, no-wrap
 msgid "--ignore-space-change"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, no-wrap
 msgid "-w"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, no-wrap
 msgid "--ignore-all-space"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 msgid ""
 "Ignore whitespace when comparing lines.  This ignores differences even if "
 "one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, no-wrap
 msgid "--ignore-blank-lines"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 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 "
@@ -5252,54 +5259,54 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, no-wrap
 msgid "--function-context"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, no-wrap
 msgid "--exit-code"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 msgid ""
 "Make the program exit with codes similar to diff(1).  That is, it exits with "
 "1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, no-wrap
 msgid "--quiet"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, no-wrap
 msgid "--ext-diff"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 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 "
@@ -5307,30 +5314,30 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, no-wrap
 msgid "--no-ext-diff"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, no-wrap
 msgid "--textconv"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, no-wrap
 msgid "--no-textconv"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 msgid ""
 "Allow (or disallow) external text conversion filters to be run when "
 "comparing binary files. See linkgit:gitattributes[5] for details. Because "
@@ -5342,13 +5349,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 msgid ""
 "Ignore changes to submodules in the diff generation. <when> can be either "
 "\"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using "
@@ -5364,57 +5371,57 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, no-wrap
 msgid "--no-prefix"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, no-wrap
 msgid "--ita-invisible-in-index"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 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 "
@@ -5425,7 +5432,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 msgid ""
 "For more detailed explanation on these common options, see also "
 "linkgit:gitdiffcore[7]."
@@ -5587,7 +5594,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:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, no-wrap
 msgid "--dry-run"
 msgstr ""
@@ -5739,7 +5746,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, no-wrap
 msgid "-n"
 msgstr ""
@@ -5934,7 +5941,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, no-wrap
 msgid "-q"
 msgstr ""
@@ -5947,13 +5954,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, no-wrap
 msgid "-v"
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, no-wrap
 msgid "--verbose"
 msgstr ""
@@ -6100,7 +6107,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -6161,7 +6168,7 @@ 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:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap
 msgid "OPTIONS"
 msgstr ""
@@ -6499,7 +6506,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap
 msgid "EXAMPLES"
 msgstr ""
@@ -6903,7 +6910,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
@@ -6916,13 +6923,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:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, 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:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
 
@@ -7774,7 +7781,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, no-wrap
 msgid "--apply"
 msgstr ""
@@ -8458,7 +8465,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, no-wrap
 msgid "-0"
 msgstr ""
@@ -10000,7 +10007,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -10690,7 +10697,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap
 msgid "NOTES"
 msgstr ""
@@ -10822,7 +10829,12 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 msgid ""
 "This tool is invoked via the typical Git setup process, which means that in "
 "some cases, it might not be able to launch - for example, if a relevant "
@@ -10832,38 +10844,38 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, no-wrap
 msgid "-o <path>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, no-wrap
 msgid "--output-directory <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 msgid ""
 "Place the resulting bug report file in `<path>` instead of the root of the "
 "Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, no-wrap
 msgid "-s <format>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, no-wrap
 msgid "--suffix <format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 msgid ""
 "Specify an alternate suffix for the bugreport name, to create a file named "
 "'git-bugreport-<formatted suffix>'. This should take the form of a "
@@ -11292,8 +11304,8 @@ msgstr ""
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | "
 "-p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] "
-"[--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv "
+"| --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -13075,7 +13087,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, no-wrap
 msgid "--detach"
 msgstr ""
@@ -15159,7 +15171,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, no-wrap
 msgid "--bare"
 msgstr ""
@@ -15281,7 +15293,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap
 msgid "--template=<template_directory>"
 msgstr ""
@@ -15393,7 +15405,7 @@ msgstr ""
 #. type: Labeled list
 #: en/git-clone.txt:262
 #, no-wrap
-msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr ""
 
 #. type: Plain text
@@ -15444,7 +15456,7 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -17839,7 +17851,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -19413,7 +19425,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap
 msgid "LIMITATIONS"
 msgstr ""
@@ -21191,19 +21203,19 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap
 msgid "-3 --theirs"
 msgstr ""
@@ -21834,7 +21846,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, no-wrap
 msgid "<path>..."
 msgstr ""
@@ -21990,32 +22002,34 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, no-wrap
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 msgid ""
 "Show changes between the working tree and the index or a tree, changes "
-"between the index and a tree, changes between two trees, changes between two "
-"blob objects, or changes between two files on disk."
+"between the index and a tree, changes between two trees, changes resulting "
+"from a merge, changes between two blob objects, or changes between two files "
+"on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, no-wrap
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 msgid ""
 "This form is to view the changes you made relative to the index (staging "
 "area for the next commit).  In other words, the differences are what you "
@@ -22024,13 +22038,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 msgid ""
 "This form is to compare the given two paths on the filesystem.  You can omit "
 "the `--no-index` option when running the command in a working tree "
@@ -22040,13 +22054,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, no-wrap
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 msgid ""
 "This form is to view the changes you staged for the next commit relative to "
 "the named <commit>.  Typically you would want comparison with the latest "
@@ -22056,13 +22070,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, no-wrap
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 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, "
@@ -22070,37 +22084,54 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, no-wrap
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, no-wrap
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 msgid ""
 "This is synonymous to the previous form.  If <commit> on one side is "
 "omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, no-wrap
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+msgid ""
+"This form is to view the results of a merge commit.  The first listed "
+"<commit> must be the merge itself; the remaining two or more commits should "
+"be its parents.  A convenient way to produce the desired set of revisions is "
+"to use the {caret}@ suffix.  For instance, if `master` names a merge commit, "
+"`git diff master master^@` gives the same combined diff as `git show "
+"master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, no-wrap
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 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 "
@@ -22109,7 +22140,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 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 "
@@ -22117,7 +22148,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 msgid ""
 "For a more complete list of ways to spell <commit>, see \"SPECIFYING "
 "REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about "
@@ -22127,20 +22158,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 msgid ""
 "This form is to view the differences between the raw contents of two blob "
 "objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 msgid ""
 "Compare the working tree with the \"base\" version (stage #1), \"our "
 "branch\" (stage #2) or \"their branch\" (stage #3).  The index contains "
@@ -22149,27 +22180,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 msgid ""
 "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be "
 "used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 msgid ""
 "The <paths> parameters, when given, are used to limit the diff to the named "
 "paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap
 msgid ""
 "$ git diff            <1>\n"
@@ -22178,32 +22209,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 msgid ""
 "Changes between the index and your last commit; what you would be committing "
 "if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 msgid ""
 "Changes in the working tree since your last commit; what you would be "
 "committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap
 msgid ""
 "$ git diff test            <1>\n"
@@ -22212,32 +22243,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 msgid ""
 "Instead of using the tip of the current branch, compare with the tip of "
 "\"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 msgid ""
 "Instead of comparing with the tip of \"test\" branch, compare with the tip "
 "of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, no-wrap
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -22246,30 +22277,30 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 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:166
+#: en/git-diff.txt:177
 msgid ""
 "Changes that occurred on the master branch since when the topic branch was "
 "started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -22278,28 +22309,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -22307,22 +22338,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 msgid ""
 "Spend extra cycles to find renames, copies and complete rewrites (very "
 "expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
+#: en/git-diff.txt:212
 msgid ""
 "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
-"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], "
+"linkgit:git-show[1]"
 msgstr ""
 
 #. type: Title =
@@ -22565,11 +22597,25 @@ msgstr ""
 #. type: Labeled list
 #: en/git-fast-export.txt:122
 #, no-wrap
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+msgid ""
+"Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is "
+"omitted, map `<from>` to itself (i.e., do not anonymize it). See the section "
+"on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
+#, no-wrap
 msgid "--reference-excluded-parents"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 msgid ""
 "By default, running a command such as `git fast-export master~5..master` "
 "will not include the commit master{tilde}5 and will make master{tilde}4 no "
@@ -22582,13 +22628,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, no-wrap
 msgid "--show-original-ids"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 msgid ""
 "Add an extra directive to the output for commits and blobs, `original-oid "
 "<SHA1SUM>`.  While such directives will likely be ignored by importers such "
@@ -22598,13 +22644,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 msgid ""
 "Specify how to handle `encoding` header in commit objects.  When asking to "
 "'abort' (which is the default), this program will die when encountering such "
@@ -22613,26 +22659,26 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, no-wrap
 msgid "--refspec"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 msgid ""
 "Apply the specified refspec to each ref exported. Multiple of them can be "
 "specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, no-wrap
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 msgid ""
 "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that "
 "specifies the specific objects and references to export.  For example, "
@@ -22643,13 +22689,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 msgid ""
 "This will export the whole repository and import it into the existing empty "
 "repository.  Except for reencoding commits that are not in UTF-8, it would "
@@ -22657,7 +22703,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -22666,27 +22712,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 msgid ""
 "This makes a new branch called 'other' from 'master~5..master' (i.e. if "
 "'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 msgid ""
 "Note that this assumes that none of the blobs and commit messages referenced "
 "by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 msgid ""
 "If the `--anonymize` option is given, git will attempt to remove all "
 "identifying information from the repository while still retaining enough of "
@@ -22697,7 +22743,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 msgid ""
 "With this option, git will replace all refnames, paths, blob contents, "
 "commit and tag messages, names, and email addresses in the output with "
@@ -22713,20 +22759,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 msgid ""
 "If you think you have found a git bug, you can start by exporting an "
 "anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 msgid ""
 "Then confirm that the bug persists in a repository created from that stream "
 "(many bugs will not, as they really do depend on the exact repository "
@@ -22734,7 +22780,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, no-wrap
 msgid ""
 "$ git init anon-repo\n"
@@ -22744,7 +22790,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 msgid ""
 "If the anonymized repository shows the bug, it may be worth sharing "
 "`anon-stream` along with a regular bug report. Note that the anonymized "
@@ -22754,13 +22800,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 msgid ""
 "which shows all of the unique lines (with numbers converted to \"X\", to "
 "collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much "
@@ -22769,7 +22815,51 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+msgid ""
+"Reproducing some bugs may require referencing particular commits or paths, "
+"which becomes challenging after refnames and paths have been anonymized. You "
+"can ask for a particular token to be left as-is or mapped to a new "
+"value. For example, if you have a bug which reproduces with `git rev-list "
+"sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+msgid ""
+"After importing the stream, you can then run `git rev-list foo -- bar.c` in "
+"the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+msgid ""
+"Note that paths and refnames are split into tokens at slash boundaries.  The "
+"command above would anonymize `subdir/secret.c` as something like "
+"`path123/bar.c`; you could then search for `bar.c` in the anonymized "
+"repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+msgid ""
+"To make referencing the final pathname simpler, you can map each path "
+"component; so if you also anonymize `subdir` to `publicdir`, then the final "
+"pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 msgid ""
 "Since 'git fast-import' cannot tag trees, you will not be able to export the "
 "linux.git repository completely, as it contains a tag referencing a tree "
@@ -23326,25 +23416,40 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 msgid ""
 "Unlike the `rfc2822` format, this format is very strict.  Any variation in "
-"formatting will cause fast-import to reject the value."
+"formatting will cause fast-import to reject the value, and some sanity "
+"checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, no-wrap
+msgid "`raw-permissive`"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+msgid ""
+"This is the same as `raw` except that no sanity checks on the numeric epoch "
+"and local offset are performed.  This can be useful when trying to filter or "
+"import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 msgid ""
 "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is "
 "accurate, but a little on the lenient side.  It is the same parser used by "
@@ -23352,7 +23457,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 msgid ""
 "Some malformed strings may be accepted as valid dates.  In some of these "
 "cases Git will still be able to obtain the correct date from the malformed "
@@ -23362,7 +23467,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 msgid ""
 "Unlike the `raw` format above, the time zone/UTC offset information "
 "contained in an RFC 2822 date string is used to adjust the date value to UTC "
@@ -23371,7 +23476,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 msgid ""
 "If the source material uses RFC 2822 style dates, the frontend should let "
 "fast-import handle the parsing and conversion (rather than attempting to do "
@@ -23379,7 +23484,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 msgid ""
 "Frontends should prefer the `raw` format if the source material already uses "
 "UNIX-epoch format, can be coaxed to give dates in that format, or its format "
@@ -23387,20 +23492,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, no-wrap
 msgid "`now`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 msgid ""
 "Always use the current time and time zone.  The literal `now` must always be "
 "supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 msgid ""
 "This is a toy format.  The current time and time zone of this system is "
 "always copied into the identity string at the time it is being created by "
@@ -23408,7 +23513,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 msgid ""
 "This particular format is supplied as it's short to implement and may be "
 "useful to a process that wants to create a new commit right now, without "
@@ -23416,7 +23521,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 msgid ""
 "If separate `author` and `committer` commands are used in a `commit` the "
 "timestamps may not match, as the system clock will be polled twice (once for "
@@ -23426,13 +23531,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 msgid ""
 "fast-import accepts several commands to update the current repository and "
 "control the current import process.  More detailed discussion (with "
@@ -23440,26 +23545,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, no-wrap
 msgid "`commit`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 msgid ""
 "Creates a new branch or updates an existing branch by creating a new commit "
 "and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, no-wrap
 msgid "`tag`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 msgid ""
 "Creates an annotated tag object from an existing commit or branch.  "
 "Lightweight tags are not supported by this command, as they are not "
@@ -23467,13 +23572,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, no-wrap
 msgid "`reset`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 msgid ""
 "Reset an existing branch (or a new branch) to a specific revision.  This "
 "command must be used to change a branch to a specific revision without "
@@ -23481,26 +23586,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, no-wrap
 msgid "`blob`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 msgid ""
 "Convert raw file data into a blob, for future use in a `commit` command.  "
 "This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, no-wrap
 msgid "`alias`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 msgid ""
 "Record that a mark refers to a given object without first creating any new "
 "object.  Using --import-marks and referring to missing marks will cause "
@@ -23509,13 +23614,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, no-wrap
 msgid "`checkpoint`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 msgid ""
 "Forces fast-import to close the current packfile, generate its unique SHA-1 "
 "checksum and index, and start a new packfile.  This command is optional and "
@@ -23523,26 +23628,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, no-wrap
 msgid "`progress`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 msgid ""
 "Causes fast-import to echo the entire line to its own standard output.  This "
 "command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, no-wrap
 msgid "`done`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 msgid ""
 "Marks the end of the stream. This command is optional unless the `done` "
 "feature was requested using the `--done` command-line option or `feature "
@@ -23550,39 +23655,39 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, no-wrap
 msgid "`get-mark`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 msgid ""
 "Causes fast-import to print the SHA-1 corresponding to a mark to the file "
 "descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, no-wrap
 msgid "`cat-blob`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 msgid ""
 "Causes fast-import to print a blob in 'cat-file --batch' format to the file "
 "descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, no-wrap
 msgid "`ls`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 msgid ""
 "Causes fast-import to print a line describing a directory entry in 'ls-tree' "
 "format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
@@ -23590,26 +23695,26 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, no-wrap
 msgid "`feature`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 msgid ""
 "Enable the specified feature. This requires that fast-import supports the "
 "specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, no-wrap
 msgid "`option`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 msgid ""
 "Specify any of the options listed under OPTIONS that do not change stream "
 "semantic to suit the frontend's needs. This command is optional and is not "
@@ -23617,14 +23722,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 msgid ""
 "Create or update a branch with a new commit, recording one logical change to "
 "the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -23642,7 +23747,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 msgid ""
 "where `<ref>` is the name of the branch to make the commit on.  Typically "
 "branch names are prefixed with `refs/heads/` in Git, so importing the CVS "
@@ -23653,7 +23758,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 msgid ""
 "A `mark` command may optionally appear, requesting fast-import to save a "
 "reference to the newly created commit for future use by the frontend (see "
@@ -23663,7 +23768,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 msgid ""
 "The `data` command following `committer` must supply the commit message (see "
 "below for `data` command syntax).  To import an empty commit message use a 0 "
@@ -23673,7 +23778,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 msgid ""
 "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, "
 "`filedeleteall` and `notemodify` commands may be included to update the "
@@ -23685,7 +23790,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 msgid ""
 "The `LF` after the command is optional (it used to be required).  Note that "
 "for reasons of backward compatibility, if the commit ends with a `data` "
@@ -23695,13 +23800,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, no-wrap
 msgid "`author`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 msgid ""
 "An `author` command may optionally appear, if the author information might "
 "differ from the committer information.  If `author` is omitted then "
@@ -23711,20 +23816,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, no-wrap
 msgid "`committer`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 msgid ""
 "The `committer` command indicates who made this commit, and when they made "
 "it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 msgid ""
 "Here `<name>` is the person's display name (for example ``Com M Itter'') and "
 "`<email>` is the person's email address (``\\cm@example.com'').  `LT` and "
@@ -23736,7 +23841,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 msgid ""
 "The time of the change is specified by `<when>` using the date format that "
 "was selected by the --date-format=<fmt> command-line option.  See ``Date "
@@ -23744,13 +23849,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, no-wrap
 msgid "`encoding`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 msgid ""
 "The optional `encoding` command indicates the encoding of the commit "
 "message.  Most commits are UTF-8 and the encoding is omitted, but this "
@@ -23758,13 +23863,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, no-wrap
 msgid "`from`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 msgid ""
 "The `from` command is used to specify the commit to initialize this branch "
 "from.  This revision will be the first ancestor of the new commit.  The "
@@ -23773,7 +23878,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 msgid ""
 "Omitting the `from` command in the first commit of a new branch will cause "
 "fast-import to create that commit with no ancestor. This tends to be desired "
@@ -23786,19 +23891,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 msgid ""
 "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or "
 "escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 msgid ""
 "The name of an existing branch already in fast-import's internal branch "
 "table.  If fast-import doesn't know the name, it's treated as a SHA-1 "
@@ -23806,12 +23911,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 msgid ""
 "The reason fast-import uses `:` to denote a mark reference is this character "
 "is not legal in a Git branch name.  The leading `:` makes it easy to "
@@ -23821,44 +23926,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 msgid ""
 "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING "
 "REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 msgid ""
 "The special null SHA-1 (40 zeros) specifies that the branch is to be "
 "removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 msgid ""
 "The special case of restarting an incremental import from the current branch "
 "value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 msgid ""
 "The `^0` suffix is necessary as fast-import does not permit a branch to "
 "start from itself, and the branch is created in memory before the `from` "
@@ -23868,13 +23973,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, no-wrap
 msgid "`merge`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 msgid ""
 "Includes one additional ancestor commit.  The additional ancestry link does "
 "not change the way the tree state is built at this commit.  If the `from` "
@@ -23885,20 +23990,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 msgid ""
 "Here `<commit-ish>` is any of the commit specification expressions also "
 "accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, no-wrap
 msgid "`filemodify`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 msgid ""
 "Included in a `commit` command to add a new file or change the content of an "
 "existing file.  This command has two different means of specifying the "
@@ -23906,26 +24011,26 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 msgid ""
 "The data content for the file was already supplied by a prior `blob` "
 "command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 msgid ""
 "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set "
 "by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob "
@@ -23935,20 +24040,20 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 msgid ""
 "The data content for the file has not been supplied yet.  The frontend wants "
 "to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -23956,36 +24061,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 msgid ""
 "In both formats `<mode>` is the type of file entry, specified in octal.  Git "
 "only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 msgid ""
 "`100644` or `644`: A normal (not-executable) file.  The majority of files in "
 "most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 msgid ""
 "`160000`: A gitlink, SHA-1 of the object refers to a commit in another "
 "repository. Git links can only be specified by SHA or through a commit "
@@ -23993,21 +24098,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 msgid ""
 "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or "
 "through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 msgid ""
 "In both formats `<path>` is the complete path of the file to be added (if "
 "not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 msgid ""
 "A `<path>` string must use UNIX-style directory separators (forward slash "
 "`/`), may contain any byte other than `LF`, and must not start with double "
@@ -24015,7 +24120,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 msgid ""
 "A path can use C-style string quoting; this is accepted in all cases and "
 "mandatory if the filename starts with double quote or contains `LF`. In "
@@ -24026,50 +24131,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 msgid ""
 "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` "
 "are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, no-wrap
 msgid "`filedelete`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 msgid ""
 "Included in a `commit` command to remove a file or recursively delete an "
 "entire directory from the branch.  If the file or directory removal makes "
@@ -24079,13 +24184,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 msgid ""
 "here `<path>` is the complete path of the file or subdirectory to be removed "
 "from the branch.  See `filemodify` above for a detailed description of "
@@ -24093,13 +24198,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, no-wrap
 msgid "`filecopy`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 msgid ""
 "Recursively copies an existing file or subdirectory to a different location "
 "within the branch.  The existing file or directory must exist.  If the "
@@ -24108,13 +24213,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 msgid ""
 "here the first `<path>` is the source location and the second `<path>` is "
 "the destination.  See `filemodify` above for a detailed description of what "
@@ -24123,7 +24228,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 msgid ""
 "A `filecopy` command takes effect immediately.  Once the source location has "
 "been copied to the destination any future commands applied to the source "
@@ -24131,13 +24236,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, no-wrap
 msgid "`filerename`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 msgid ""
 "Renames an existing file or subdirectory to a different location within the "
 "branch.  The existing file or directory must exist. If the destination "
@@ -24145,13 +24250,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 msgid ""
 "A `filerename` command takes effect immediately.  Once the source location "
 "has been renamed to the destination any future commands applied to the "
@@ -24160,7 +24265,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 msgid ""
 "Note that a `filerename` is the same as a `filecopy` followed by a "
 "`filedelete` of the source location.  There is a slight performance "
@@ -24172,13 +24277,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, no-wrap
 msgid "`filedeleteall`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 msgid ""
 "Included in a `commit` command to remove all files (and also all "
 "directories) from the branch.  This command resets the internal branch "
@@ -24187,13 +24292,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 msgid ""
 "This command is extremely useful if the frontend does not know (or does not "
 "care to know) what files are currently on the branch, and therefore cannot "
@@ -24201,7 +24306,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 msgid ""
 "Issuing a `filedeleteall` followed by the needed `filemodify` commands to "
 "set the correct content will produce the same results as sending only the "
@@ -24212,13 +24317,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, no-wrap
 msgid "`notemodify`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 msgid ""
 "Included in a `commit` `<notes_ref>` command to add a new note annotating a "
 "`<commit-ish>` or change this annotation contents.  Internally it is similar "
@@ -24230,7 +24335,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 msgid ""
 "The data content for the note was already supplied by a prior `blob` "
 "command.  The frontend just needs to connect it to the commit that is to be "
@@ -24238,27 +24343,27 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 msgid ""
 "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior "
 "`blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 msgid ""
 "The data content for the note has not been supplied yet.  The frontend wants "
 "to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -24266,20 +24371,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 msgid ""
 "In both formats `<commit-ish>` is any of the commit specification "
 "expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, no-wrap
 msgid "`mark`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 msgid ""
 "Arranges for fast-import to save a reference to the current object, allowing "
 "the frontend to recall this object at a future point in time, without "
@@ -24289,13 +24394,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 msgid ""
 "where `<idnum>` is the number assigned by the frontend to this mark.  The "
 "value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is "
@@ -24304,20 +24409,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 msgid ""
 "New marks are created automatically.  Existing marks can be moved to another "
 "object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, no-wrap
 msgid "`original-oid`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 msgid ""
 "Provides the name of the object in the original source control system.  "
 "fast-import will simply ignore this directive, but filter processes which "
@@ -24326,25 +24431,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 msgid ""
 "Creates an annotated tag referring to a specific commit.  To create "
 "lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -24356,12 +24461,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 msgid ""
 "Tag names are automatically prefixed with `refs/tags/` when stored in Git, "
 "so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just "
@@ -24370,7 +24475,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 msgid ""
 "The value of `<name>` must be a valid refname in Git and therefore may "
 "contain forward slashes.  As `LF` is not valid in a Git refname, no quoting "
@@ -24378,21 +24483,21 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 msgid ""
 "The `from` command is the same as in the `commit` command; see above for "
 "details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 msgid ""
 "The `tagger` command uses the same format as `committer` within `commit`; "
 "again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 msgid ""
 "The `data` command following `tagger` must supply the annotated tag message "
 "(see below for `data` command syntax).  To import an empty tag message use a "
@@ -24402,7 +24507,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 msgid ""
 "Signing annotated tags during import from within fast-import is not "
 "supported.  Trying to include your own PGP/GPG signature is not recommended, "
@@ -24414,7 +24519,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 msgid ""
 "Creates (or recreates) the named branch, optionally starting from a specific "
 "revision.  The reset command allows a frontend to issue a new `from` command "
@@ -24423,7 +24528,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -24432,26 +24537,26 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 msgid ""
 "For a detailed description of `<ref>` and `<commit-ish>` see above under "
 "`commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 msgid ""
 "The `reset` command can also be used to create lightweight (non-annotated) "
 "tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap
 msgid ""
 "\treset refs/tags/938\n"
@@ -24459,14 +24564,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 msgid ""
 "would create the lightweight tag `refs/tags/938` referring to whatever "
 "commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 msgid ""
 "Requests writing one file revision to the packfile.  The revision is not "
 "connected to any commit; this connection must be formed in a subsequent "
@@ -24474,7 +24579,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap
 msgid ""
 "\t'blob' LF\n"
@@ -24484,7 +24589,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 msgid ""
 "The mark command is optional here as some frontends have chosen to generate "
 "the Git SHA-1 for the blob on their own, and feed that directly to "
@@ -24493,13 +24598,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, no-wrap
 msgid "`data`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 msgid ""
 "Supplies raw data (for use as blob/file content, commit messages, or "
 "annotated tag messages) to fast-import.  Data can be supplied using an exact "
@@ -24510,7 +24615,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 msgid ""
 "Comment lines appearing within the `<raw>` part of `data` commands are "
 "always taken to be part of the body of the data and are therefore never "
@@ -24519,18 +24624,18 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -24538,7 +24643,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 msgid ""
 "where `<count>` is the exact number of bytes appearing within `<raw>`.  The "
 "value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on "
@@ -24547,7 +24652,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 msgid ""
 "The `LF` after `<raw>` is optional (it used to be required) but "
 "recommended.  Always including it makes debugging a fast-import stream "
@@ -24556,13 +24661,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 msgid ""
 "A delimiter string is used to mark the end of the data.  fast-import will "
 "compute the length by searching for the delimiter.  This format is primarily "
@@ -24570,7 +24675,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -24580,7 +24685,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 msgid ""
 "where `<delim>` is the chosen delimiter string.  The string `<delim>` must "
 "not appear on a line by itself within `<raw>`, as otherwise fast-import will "
@@ -24591,19 +24696,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 msgid ""
 "Record that a mark refers to a given object without first creating any new "
 "object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap
 msgid ""
 "\t'alias' LF\n"
@@ -24613,19 +24718,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 msgid ""
 "Forces fast-import to close the current packfile, start a new one, and to "
 "save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap
 msgid ""
 "\t'checkpoint' LF\n"
@@ -24633,7 +24738,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 msgid ""
 "Note that fast-import automatically switches packfiles when the current "
 "packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  "
@@ -24642,7 +24747,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 msgid ""
 "As a `checkpoint` can require a significant amount of CPU time and disk IO "
 "(to compute the overall pack SHA-1 checksum, generate the corresponding "
@@ -24651,7 +24756,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 msgid ""
 "Frontends may choose to issue checkpoints during extremely large and long "
 "running imports, or when they need to allow another Git process access to a "
@@ -24661,7 +24766,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 msgid ""
 "Causes fast-import to print the entire `progress` line unmodified to its "
 "standard output channel (file descriptor 1) when the command is processed "
@@ -24670,7 +24775,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -24678,7 +24783,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 msgid ""
 "The `<any>` part of the command may contain any sequence of bytes that does "
 "not contain `LF`.  The `LF` after the command is optional.  Callers may wish "
@@ -24687,13 +24792,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 msgid ""
 "Placing a `progress` command immediately after a `checkpoint` will inform "
 "the reader when the `checkpoint` has been completed and it can safely access "
@@ -24701,7 +24806,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 msgid ""
 "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or "
 "to the file descriptor previously arranged with the `--cat-blob-fd` "
@@ -24711,20 +24816,20 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 msgid ""
 "See ``Responses To Commands'' below for details about how to read this "
 "output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 msgid ""
 "Causes fast-import to print a blob to a file descriptor previously arranged "
 "with the `--cat-blob-fd` argument.  The command otherwise has no impact on "
@@ -24733,25 +24838,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 msgid ""
 "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously "
 "or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -24759,7 +24864,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 msgid ""
 "This command can be used where a `filemodify` directive can appear, allowing "
 "it to be used in the middle of a commit.  For a `filemodify` using an inline "
@@ -24767,7 +24872,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 msgid ""
 "Prints information about the object at a path to a file descriptor "
 "previously arranged with the `--cat-blob-fd` argument.  This allows printing "
@@ -24776,20 +24881,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 msgid ""
 "The `ls` command can also be used where a `filemodify` directive can appear, "
 "allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 msgid ""
 "This form can only be used in the middle of a `commit`.  The path names a "
 "directory entry within fast-import's active commit.  The path must be quoted "
@@ -24797,19 +24902,19 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 msgid ""
 "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte "
 "SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be "
@@ -24818,116 +24923,116 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 msgid ""
 "The <dataref> represents the blob, tree, or commit object at <path> and can "
 "be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 msgid ""
 "If there is no file or subtree at that path, 'git fast-import' will instead "
 "report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 msgid ""
 "Require that fast-import supports the specified feature, or abort if it does "
 "not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 msgid ""
 "Act as though the corresponding command-line option with a leading `--` was "
 "passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 msgid ""
 "Like --import-marks except in two respects: first, only one \"feature "
 "import-marks\" or \"feature import-marks-if-exists\" command is allowed per "
@@ -24938,25 +25043,25 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 msgid ""
 "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command "
 "respectively.  Versions of fast-import not supporting the specified command "
@@ -24966,13 +25071,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 msgid ""
 "Require that the backend support the 'notemodify' (N)  subcommand to the "
 "'commit' command.  Versions of fast-import not supporting notes will exit "
@@ -24980,13 +25085,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 msgid ""
 "Error out if the stream ends without a 'done' command.  Without this "
 "feature, errors causing the frontend to end abruptly at a convenient point "
@@ -24996,7 +25101,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 msgid ""
 "Processes the specified option so that git fast-import behaves in a way that "
 "suits the frontend's needs.  Note that options specified by the frontend are "
@@ -25004,13 +25109,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 msgid ""
 "The `<option>` part of the command may contain any of the options listed in "
 "the OPTIONS section that do not change import semantics, without the leading "
@@ -25018,7 +25123,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 msgid ""
 "Option commands must be the first commands on the input (not counting "
 "feature commands), to give an option command after any non-option command is "
@@ -25026,39 +25131,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 msgid ""
 "The following command-line options change import semantics and may therefore "
 "not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 msgid ""
 "If the `done` feature is not in use, treated as if EOF was read.  This can "
 "be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 msgid ""
 "If the `--done` command-line option or `feature done` command is in use, the "
 "`done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 msgid ""
 "New objects written by fast-import are not available immediately.  Most "
 "fast-import commands have no visible effect until the next checkpoint (or "
@@ -25068,7 +25173,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 msgid ""
 "For some frontends, though, it is useful to be able to read back data from "
 "the current repository as it is being updated (for example when the source "
@@ -25078,7 +25183,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -25087,14 +25192,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 msgid ""
 "A frontend set up this way can use `progress`, `get-mark`, `ls`, and "
 "`cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 msgid ""
 "To avoid deadlock, such frontends must completely consume any pending output "
 "from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
@@ -25102,13 +25207,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 msgid ""
 "If fast-import is supplied invalid input it will terminate with a non-zero "
 "exit status and create a crash report in the top level of the Git repository "
@@ -25118,7 +25223,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 msgid ""
 "All recent commands (including stream comments, file changes and progress "
 "commands) are shown in the command history within the crash report, but raw "
@@ -25128,7 +25233,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 msgid ""
 "After writing a crash report fast-import will close the current packfile and "
 "export the marks table.  This allows the frontend developer to inspect the "
@@ -25139,12 +25244,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -25164,7 +25269,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap
 msgid ""
 "\t$ git fast-import <in\n"
@@ -25173,7 +25278,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -25184,13 +25289,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -25205,13 +25310,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap
 msgid ""
 "Active Branch LRU\n"
@@ -25219,23 +25324,23 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap
 msgid ""
 "Inactive Branches\n"
@@ -25244,7 +25349,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap
 msgid ""
 "status      : active loaded dirty\n"
@@ -25256,31 +25361,31 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 msgid ""
 "The following tips and tricks have been collected from various users of "
 "fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 msgid ""
 "When doing a repository conversion, use a unique mark per commit (`mark "
 ":<n>`) and supply the --export-marks option on the command line.  "
@@ -25291,7 +25396,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 msgid ""
 "Coming from a system such as Perforce or Subversion this should be quite "
 "simple, as the fast-import mark can also be the Perforce changeset number or "
@@ -25299,13 +25404,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 msgid ""
 "Don't bother trying to optimize the frontend to stick to one branch at a "
 "time during an import.  Although doing so might be slightly faster for "
@@ -25314,7 +25419,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 msgid ""
 "The branch LRU builtin to fast-import tends to behave very well, and the "
 "cost of activating an inactive branch is so low that bouncing around between "
@@ -25322,13 +25427,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 msgid ""
 "When importing a renamed file or directory, simply delete the old name(s) "
 "and modify the new name(s) during the corresponding commit.  Git performs "
@@ -25336,13 +25441,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 msgid ""
 "Some other SCM systems let the user create a tag from multiple files which "
 "are not from the same commit/changeset.  Or to create tags which are a "
@@ -25350,7 +25455,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 msgid ""
 "Importing these tags as-is in Git is impossible without making at least one "
 "commit which ``fixes up'' the files to match the content of the tag.  Use "
@@ -25360,7 +25465,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 msgid ""
 "For example since all normal branches are stored under `refs/heads/` name "
 "the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup "
@@ -25370,7 +25475,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 msgid ""
 "When committing fixups, consider using `merge` to connect the commit(s) "
 "which are supplying file revisions to the fixup branch.  Doing so will allow "
@@ -25379,20 +25484,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 msgid ""
 "After fast-import terminates the frontend will need to do `rm "
 ".git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 msgid ""
 "As soon as fast-import completes the Git repository is completely valid and "
 "ready for use.  Typically this takes only a very short time, even for "
@@ -25400,7 +25505,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 msgid ""
 "However repacking the repository is necessary to improve data locality and "
 "access performance.  It can also take hours on extremely large projects "
@@ -25411,7 +25516,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 msgid ""
 "If you choose to wait for the repack, don't try to run benchmarks or "
 "performance tests until repacking is completed.  fast-import outputs "
@@ -25419,13 +25524,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 msgid ""
 "If you are repacking very old imported data (e.g. older than the last year), "
 "consider expending some extra CPU time and supplying --window=50 (or higher) "
@@ -25435,13 +25540,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 msgid ""
 "Every once in a while have your frontend emit a `progress` message to "
 "fast-import.  The contents of the messages are entirely free-form, so one "
@@ -25451,13 +25556,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 msgid ""
 "When packing a blob fast-import always attempts to deltify against the last "
 "blob written.  Unless specifically arranged for by the frontend, this will "
@@ -25467,7 +25572,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 msgid ""
 "Frontends which have efficient access to all revisions of a single file (for "
 "example reading an RCS/CVS ,v file) can choose to supply all revisions of "
@@ -25478,7 +25583,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 msgid ""
 "The packfile(s) created by fast-import do not encourage good disk access "
 "patterns.  This is caused by fast-import writing the data in the order it is "
@@ -25489,7 +25594,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 msgid ""
 "For this reason it is strongly recommended that users repack the repository "
 "with `git repack -a -d` after fast-import completes, allowing Git to "
@@ -25500,7 +25605,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 msgid ""
 "Instead of running `git repack` you can also run `git gc --aggressive`, "
 "which will also optimize other things after an import (e.g. pack loose "
@@ -25512,13 +25617,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 msgid ""
 "There are a number of factors which affect how much memory fast-import "
 "requires to perform an import.  Like critical sections of core Git, "
@@ -25528,13 +25633,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 msgid ""
 "fast-import maintains an in-memory structure for every object written in "
 "this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit "
@@ -25545,7 +25650,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 msgid ""
 "The object table is actually a hashtable keyed on the object name (the "
 "unique SHA-1).  This storage configuration allows fast-import to reuse an "
@@ -25555,13 +25660,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 msgid ""
 "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, "
 "depending on pointer size) per mark.  Although the array is sparse, "
@@ -25570,20 +25675,20 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 msgid ""
 "Branches are classified as active and inactive.  The memory usage of the two "
 "classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 msgid ""
 "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 "
 "bit or 64 bit systems, respectively), plus the length of the branch name "
@@ -25592,7 +25697,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 msgid ""
 "Active branches have the same overhead as inactive branches, but also "
 "contain copies of every tree that has been recently modified on that "
@@ -25603,14 +25708,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 msgid ""
 "As active branches store metadata about the files contained on that branch, "
 "their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 msgid ""
 "fast-import automatically moves active branches to inactive status based on "
 "a simple least-recently-used algorithm.  The LRU chain is updated on each "
@@ -25619,13 +25724,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 msgid ""
 "Trees (aka directories) use just 12 bytes of memory on top of the memory "
 "required for their entries (see ``per active file'' below).  The cost of a "
@@ -25634,13 +25739,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 msgid ""
 "Files (and pointers to subtrees) within active trees require 52 or 64 bytes "
 "(32/64 bit platforms) per entry.  To conserve space, file and tree names are "
@@ -25650,7 +25755,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 msgid ""
 "The active branch LRU, when coupled with the filename string pool and lazy "
 "loading of subtrees, allows fast-import to efficiently import projects with "
@@ -25659,13 +25764,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 msgid ""
 "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile "
 "early, simulating a `checkpoint` command.  The impatient operator can use "
@@ -26371,22 +26476,22 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 msgid ""
-"This updates (or creates, as necessary) branches `pu` and `tmp` in the local "
-"repository by fetching from the branches (respectively)  `pu` and `maint` "
-"from the remote repository."
+"This updates (or creates, as necessary) branches `seen` and `tmp` in the "
+"local repository by fetching from the branches (respectively)  `seen` and "
+"`maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 msgid ""
-"The `pu` branch will be updated even if it does not fast-forward, because it "
-"is prefixed with a plus sign; `tmp` will not be."
+"The `seen` branch will be updated even if it does not fast-forward, because "
+"it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -30922,7 +31027,7 @@ msgid ""
 "Use \\0 as the delimiter for pathnames in the output, and print them "
 "verbatim. Without this option, pathnames with \"unusual\" characters are "
 "quoted as explained for the configuration variable core.quotePath (see "
-"linkgit:git-config[1])."
+"glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -32543,8 +32648,8 @@ msgstr ""
 #: en/git-http-fetch.txt:13
 #, no-wrap
 msgid ""
-"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] "
-"[--stdin] <commit> <url>\n"
+"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin "
+"| --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -32616,11 +32721,27 @@ msgstr ""
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
 #, no-wrap
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+msgid ""
+"Instead of a commit id on the command line (which is not expected in this "
+"case), 'git http-fetch' fetches the packfile directly at the given URL and "
+"uses index-pack to generate corresponding .idx and .keep files.  The hash is "
+"used to determine the name of the temporary file and is arbitrary. The "
+"output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
+#, no-wrap
 msgid "--recover"
 msgstr ""
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 msgid ""
 "Verify that everything reachable from target is fetched.  Used after an "
 "earlier fetch is interrupted."
@@ -33156,8 +33277,28 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+msgid ""
+"Specify the given object format (hash algorithm) for the pack.  The valid "
+"values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm "
+"for the current repository (set by `extensions.objectFormat`), or 'sha1' if "
+"no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 msgid ""
 "Once the index has been created, the list of object names is sorted and the "
 "SHA-1 hash of that list is printed to stdout. If --stdin was also used then "
@@ -33166,13 +33307,13 @@ msgid ""
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 msgid "mentioned above."
 msgstr ""
 
@@ -33214,16 +33355,17 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 msgid ""
 "This command creates an empty Git repository - basically a `.git` directory "
 "with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template "
@@ -33232,14 +33374,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 msgid ""
 "If the `$GIT_DIR` environment variable is set then it specifies a path to "
 "use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 msgid ""
 "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` "
 "environment variable then the sha1 directories are created underneath - "
@@ -33247,7 +33389,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 msgid ""
 "Running 'git init' in an existing repository is safe. It will not overwrite "
 "things that are already there. The primary reason for rerunning 'git init' "
@@ -33256,39 +33398,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 msgid ""
 "Create a bare repository. If `GIT_DIR` environment is not set, it is set to "
 "the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 msgid ""
 "Specify the given object format (hash algorithm) for the repository.  The "
 "valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 msgid ""
 "Specify the directory from which templates will be used.  (See the "
 "\"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 msgid ""
 "Instead of initializing the repository as a directory to either `$GIT_DIR` "
 "or `./.git/`, create a text file there containing the path to the actual "
@@ -33297,20 +33439,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 msgid ""
 "If this is reinitialization, the repository will be moved to the specified "
 "path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, no-wrap
+msgid "-b <branch-name"
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+msgid ""
+"Use the specified name for the initial branch in the newly created "
+"repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 msgid ""
 "Specify that the Git repository is to be shared amongst several users.  This "
 "allows users belonging to the same group to push into that repository.  When "
@@ -33321,33 +33482,33 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 msgid ""
 "The option can have the following values, defaulting to 'group' if no value "
 "is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 msgid ""
 "Use permissions reported by umask(2). The default, when `--shared` is not "
 "specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 msgid ""
 "Make the repository group-writable, (and g+sx, since the git group may be "
 "not the primary group of all users). This is used to loosen the permissions "
@@ -33358,24 +33519,24 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 msgid ""
 "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will "
 "override users' umask(2) value (and not only loosen permissions as 'group' "
@@ -33386,7 +33547,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 msgid ""
 "By default, the configuration flag `receive.denyNonFastForwards` is enabled "
 "in shared repositories, so that you cannot force a non fast-forwarding push "
@@ -33394,77 +33555,77 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 msgid ""
 "If you provide a 'directory', the command is run inside it. If this "
 "directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 msgid ""
 "Files and directories in the template directory whose name do not start with "
 "a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 msgid ""
 "The default template directory includes some directory structure, suggested "
 "\"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 msgid ""
 "The sample hooks are all disabled by default. To enable one of the sample "
 "hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -33474,17 +33635,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
 
@@ -35598,9 +35759,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -41495,7 +41656,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap
 msgid "--expire <time>"
 msgstr ""
@@ -44401,12 +44562,10 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap
 msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+"Use applying strategies to rebase (calling `git-am` internally).  This "
+"option may become a no-op in the future once the merge backend handles "
+"everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -47303,7 +47462,7 @@ msgstr ""
 msgid ""
 "'git remote' [-v | --verbose]\n"
 "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <name> <url>\n"
+"[--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -47327,7 +47486,7 @@ msgstr ""
 #: en/git-remote.txt:39
 msgid ""
 "Be a little more verbose and show remote url after name.  NOTE: This must be "
-"placed between `remote` and subcommand."
+"placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -47346,7 +47505,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 msgid ""
-"Add a remote named <name> for the repository at <url>.  The command `git "
+"Adds a remote named <name> for the repository at <url>.  The command `git "
 "fetch <name>` can then be used to create and update remote-tracking branches "
 "<name>/<branch>."
 msgstr ""
@@ -47481,8 +47640,8 @@ msgstr ""
 msgid ""
 "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
 "the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
-"if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` "
-"will set the symbolic-ref `refs/remotes/origin/HEAD` to "
+"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
+"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
 "`refs/remotes/origin/next`. This will only work if "
 "`refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
@@ -47491,7 +47650,7 @@ msgstr ""
 #: en/git-remote.txt:121
 msgid ""
 "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` "
-"explicitly. e.g., `git remote set-head origin master` will set the "
+"explicitly. e.g., \"git remote set-head origin master\" will set the "
 "symbolic-ref `refs/remotes/origin/HEAD` to "
 "`refs/remotes/origin/master`. This will only work if "
 "`refs/remotes/origin/master` already exists; if not it must be fetched "
@@ -47516,7 +47675,7 @@ msgstr ""
 #: en/git-remote.txt:131
 msgid ""
 "The named branches will be interpreted as if specified with the `-t` option "
-"on the `git remote add` command line."
+"on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -47636,7 +47795,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 msgid ""
-"With `--dry-run` option, report what branches would be pruned, but do not "
+"With `--dry-run` option, report what branches will be pruned, but do not "
 "actually prune them."
 msgstr ""
 
@@ -47650,7 +47809,7 @@ msgstr ""
 #: en/git-remote.txt:195
 msgid ""
 "Fetch updates for remotes or remote groups in the repository as defined by "
-"`remotes.<group>`. If neither group nor remote is specified on the command "
+"remotes.<group>.  If neither group nor remote is specified on the command "
 "line, the configuration parameter remotes.default will be used; if "
 "remotes.default is not defined, all remotes which do not have the "
 "configuration parameter remote.<name>.skipDefaultUpdate set to true will be "
@@ -53534,7 +53693,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -53580,6 +53739,15 @@ msgid ""
 "index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+msgid ""
+"Specify the given object format (hash algorithm) for the index file.  The "
+"valid values are 'sha1' and (if enabled) 'sha256'.  The default is the "
+"algorithm for the current repository (set by `extensions.objectFormat`), or "
+"'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, no-wrap
@@ -56039,7 +56207,7 @@ msgid ""
 "Sets the default remote tracking branch for the submodule. The `--branch` "
 "option allows the remote branch to be specified. The `--default` option "
 "removes the submodule.<name>.branch configuration key, which causes the "
-"tracking branch to default to 'master'."
+"tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -56216,8 +56384,8 @@ msgid ""
 "recorded as `submodule.<name>.branch` in `.gitmodules` for `update "
 "--remote`.  A special value of `.` is used to indicate that the name of the "
 "branch in the submodule should be the same name as the current branch in the "
-"current repository.  If the option is not specified, it defaults to "
-"'master'."
+"current repository.  If the option is not specified, it defaults to the "
+"remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -56284,9 +56452,9 @@ msgid ""
 "superproject's recorded SHA-1 to update the submodule, use the status of the "
 "submodule's remote-tracking branch.  The remote used is branch's remote "
 "(`branch.<name>.remote`), defaulting to `origin`.  The remote branch used "
-"defaults to `master`, but the branch name may be overridden by setting the "
-"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
-"(with `.git/config` taking precedence)."
+"defaults to the remote `HEAD`, but the branch name may be overridden by "
+"setting the `submodule.<name>.branch` option in either `.gitmodules` or "
+"`.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -61270,14 +61438,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 msgid ""
 "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case "
 "insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 msgid ""
 "If the variable is set to an integer value greater than 2 and lower than 10 "
 "(strictly) then Git will interpret this value as an open file descriptor and "
@@ -61293,7 +61461,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 msgid ""
 "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case "
 "insensitive) disables trace messages."
@@ -61413,43 +61581,42 @@ msgid "`GIT_TRACE_CURL`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 msgid ""
 "Enables a curl full trace dump of all incoming and outgoing data, including "
 "descriptive information, of the git transport protocol.  This is similar to "
-"doing curl `--trace-ascii` on the command line.  This option overrides "
-"setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for "
+"doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for "
 "available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, no-wrap
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 msgid ""
 "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data "
 "(that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, no-wrap
 msgid "`GIT_TRACE2`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 msgid ""
 "Enables more detailed trace messages from the \"trace2\" library.  Output "
 "from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 msgid ""
 "Alternatively, if the variable is set to an absolute path (starting with a "
 "'/' character), Git will interpret this as a file path and will try to "
@@ -61460,7 +61627,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 msgid ""
 "In addition, if the variable is set to "
 "`af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path "
@@ -61468,18 +61635,18 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, no-wrap
 msgid "`GIT_TRACE2_EVENT`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 msgid ""
 "This setting writes a JSON-based format that is suited for machine "
 "interpretation.  See `GIT_TRACE2` for available trace output options and "
@@ -61487,13 +61654,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, no-wrap
 msgid "`GIT_TRACE2_PERF`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 msgid ""
 "In addition to the text-based messages available in `GIT_TRACE2`, this "
 "setting writes a column-based format for understanding nesting regions.  See "
@@ -61502,28 +61669,27 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, no-wrap
-msgid "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 msgid ""
-"This can be set to a comma-separated list of strings. When a curl trace is "
-"enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by "
-"the client is dumped, values of cookies whose key is in that list "
-"(case-sensitive) are redacted."
+"By default, when tracing is activated, Git redacts the values of cookies, "
+"the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set "
+"this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, no-wrap
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 msgid ""
 "Setting this variable to `1` will cause Git to treat all pathspecs "
 "literally, rather than as glob patterns. For example, running "
@@ -61534,52 +61700,52 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, no-wrap
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 msgid ""
 "Setting this variable to `1` will cause Git to treat all pathspecs as glob "
 "patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, no-wrap
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 msgid ""
 "Setting this variable to `1` will cause Git to treat all pathspecs as "
 "literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, no-wrap
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 msgid ""
 "Setting this variable to `1` will cause Git to treat all pathspecs as "
 "case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, no-wrap
 msgid "`GIT_REFLOG_ACTION`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 msgid ""
 "When a ref is updated, reflog entries are created to keep track of the "
 "reason why the ref was updated (which is typically the name of the "
@@ -61591,13 +61757,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, no-wrap
 msgid "`GIT_REF_PARANOIA`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 msgid ""
 "If set to `1`, include broken or badly named refs when iterating over lists "
 "of refs. In a normal, non-corrupted repository, this does nothing. However, "
@@ -61610,13 +61776,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, no-wrap
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 msgid ""
 "If set to a colon-separated list of protocols, behave as if `protocol.allow` "
 "is set to `never`, and each of the listed protocols has "
@@ -61627,13 +61793,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, no-wrap
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 msgid ""
 "Set to 0 to prevent protocols used by fetch/push/clone which are configured "
 "to the `user` state.  This is useful to restrict recursive submodule "
@@ -61643,13 +61809,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, no-wrap
 msgid "`GIT_PROTOCOL`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 msgid ""
 "For internal use only.  Used in handshaking the wire protocol.  Contains a "
 "colon ':' separated list of keys with optional values 'key[=value]'.  "
@@ -61657,13 +61823,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, no-wrap
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 msgid ""
 "If set to `0`, Git will complete any requested operation without performing "
 "any optional sub-operations that require taking a lock.  For example, this "
@@ -61673,25 +61839,25 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, no-wrap
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, no-wrap
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, no-wrap
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 msgid ""
 "Windows-only: allow redirecting the standard input/output/error handles to "
 "paths specified by the environment variables. This is particularly useful in "
@@ -61704,7 +61870,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 msgid ""
 "Two special values are supported: `off` will simply close the corresponding "
 "standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will "
@@ -61712,13 +61878,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 msgid ""
 "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  "
 "This affects indications of detached HEADs (linkgit:git-checkout[1]) and the "
@@ -61728,13 +61894,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 msgid ""
 "More detail on the following is available from the "
 "link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] "
@@ -61742,7 +61908,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 msgid ""
 "A Git project normally consists of a working directory with a \".git\" "
 "subdirectory at the top level.  The .git directory contains, among other "
@@ -61753,7 +61919,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 msgid ""
 "The object database contains objects of three main types: blobs, which hold "
 "file data; trees, which point to blobs and other trees to build up directory "
@@ -61762,7 +61928,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 msgid ""
 "The commit, equivalent to what other systems call a \"changeset\" or "
 "\"version\", represents a step in the project's history, and each parent "
@@ -61771,7 +61937,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 msgid ""
 "All objects are named by the SHA-1 hash of their contents, normally written "
 "as a string of 40 hex digits.  Such names are globally unique.  The entire "
@@ -61780,14 +61946,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 msgid ""
 "When first created, objects are stored in individual files, but for "
 "efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 msgid ""
 "Named pointers called refs mark interesting points in history.  A ref may "
 "contain the SHA-1 name of an object or the name of another ref.  Refs with "
@@ -61798,7 +61964,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 msgid ""
 "The index file is initialized with a list of all paths and, for each path, a "
 "blob object and a set of attributes.  The blob object represents the "
@@ -61810,7 +61976,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 msgid ""
 "The index is also capable of storing multiple entries (called \"stages\")  "
 "for a given pathname.  These stages are used to hold the various unmerged "
@@ -61818,20 +61984,20 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 msgid ""
 "See the references in the \"description\" section to get started using Git.  "
 "The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 msgid ""
 "The link:user-manual.html#git-concepts[Git concepts chapter of the "
 "user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to "
@@ -61839,37 +62005,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 msgid ""
 "See also the link:howto-index.html[howto] documents for some useful "
 "examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 msgid ""
 "The internals are documented in the link:technical/api-index.html[Git API "
 "documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 msgid ""
 "Git was started by Linus Torvalds, and is currently maintained by Junio C "
 "Hamano. Numerous contributions have come from the Git mailing list "
@@ -61878,7 +62044,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 msgid ""
 "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
 "and linkgit:git-blame[1] can show you the authors for specific parts of the "
@@ -61886,13 +62052,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 msgid ""
 "Report bugs to the Git mailing list <git@vger.kernel.org> where the "
 "development and maintenance is primarily done.  You do not have to be "
@@ -61901,14 +62067,14 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 msgid ""
 "Issues which are security relevant should be disclosed privately to the Git "
 "Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 msgid ""
 "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
 "linkgit:gitcvs-migration[7], linkgit:gitglossary[7], "
@@ -64430,33 +64596,36 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 msgid ""
 "`move` refuses to move a locked working tree unless `--force` is specified "
-"twice."
+"twice. If the destination is already assigned to some other working tree but "
+"is missing (for instance, if `<new-path>` was deleted manually), then "
+"`--force` allows the move to proceed; use --force twice if the destination "
+"is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 msgid ""
 "`remove` refuses to remove an unclean working tree unless `--force` is "
 "used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 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 "
@@ -64466,20 +64635,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 msgid ""
 "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in "
 "linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, no-wrap
 msgid "--[no-]checkout"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 msgid ""
 "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be "
 "used to suppress checkout in order to make customizations, such as "
@@ -64488,13 +64657,13 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, no-wrap
 msgid "--[no-]guess-remote"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 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 "
@@ -64504,20 +64673,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 msgid ""
 "This can also be set up as the default behaviour by using the "
 "`worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, no-wrap
 msgid "--[no-]track"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 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 "
@@ -64526,25 +64695,25 @@ msgid ""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, no-wrap
 msgid "--lock"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 msgid ""
 "Keep the working tree locked after creation. This is the equivalent of `git "
 "worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 msgid ""
 "With `list`, output in an easy-to-parse format for scripts.  This format "
 "will remain stable across Git versions and regardless of user "
@@ -64552,44 +64721,44 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 msgid ""
 "If the last path components in the working tree's path is unique among "
 "working trees, it can be used to identify worktrees. For example if you only "
@@ -64598,13 +64767,13 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 msgid ""
 "In multiple working trees, some refs may be shared between all working "
 "trees, some refs are local. One example is HEAD is different for all working "
@@ -64613,7 +64782,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 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 "
@@ -64622,7 +64791,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 msgid ""
 "Refs that are per working tree can still be accessed from another working "
 "tree via two special paths, main-worktree and worktrees. The former gives "
@@ -64631,7 +64800,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 msgid ""
 "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to "
 "the same value as the main working tree's HEAD and refs/bisect/good "
@@ -64641,7 +64810,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 msgid ""
 "To access refs, it's best not to look inside GIT_DIR directly. Instead use "
 "commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which "
@@ -64649,7 +64818,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 msgid ""
 "By default, the repository \"config\" file is shared across all working "
 "trees. If the config variables `core.bare` or `core.worktree` are already "
@@ -64658,20 +64827,20 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 msgid ""
 "In order to have configuration specific to working trees, you can turn on "
 "\"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 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 "
@@ -64680,7 +64849,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 msgid ""
 "Note that in this file, the exception for `core.bare` and `core.worktree` is "
 "gone. If you have them in $GIT_DIR/config before, you must move them to the "
@@ -64690,25 +64859,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 msgid ""
 "`core.sparseCheckout` is recommended per working tree, unless you are sure "
 "you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 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 "
@@ -64721,7 +64890,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 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 "
@@ -64731,7 +64900,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 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 "
@@ -64744,7 +64913,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 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 "
@@ -64753,7 +64922,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 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 "
@@ -64764,7 +64933,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 msgid ""
 "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
 "in some situations, such as when the entry's working tree is stored on a "
@@ -64777,27 +64946,27 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 msgid ""
 "When extensions.worktreeConfig is enabled, the config file "
 "`.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 msgid ""
 "The worktree list command has two output formats.  The default format shows "
 "the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap
 msgid ""
 "$ git worktree list\n"
@@ -64807,13 +64976,13 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 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 "
@@ -64823,7 +64992,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -64832,7 +65001,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -64841,7 +65010,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -64850,7 +65019,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 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 "
@@ -64863,7 +65032,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, no-wrap
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -64875,7 +65044,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 msgid ""
 "Multiple checkout in general is still experimental, and the support for "
 "submodules is incomplete. It is NOT recommended to make multiple checkouts "
@@ -68032,7 +68201,7 @@ msgid "'%al'"
 msgstr ""
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
 
@@ -68179,6 +68348,11 @@ msgstr ""
 msgid "'%cl'"
 msgstr ""
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, no-wrap
@@ -68187,7 +68361,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/pretty-formats.txt:201
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 67d71909d8c376301650cd7c0fadb00a4f6c80a7..32bcc8ff02aded2d0b0a243f57c7b2a6fe689168 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-07-11 15:47+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -131,7 +131,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -176,11 +176,7 @@ msgstr "--encoding=<codificação>"
 #: en/blame-options.txt:58
 #, priority:100
 msgid "Specifies the encoding used to output author names and commit summaries. Setting it to `none` makes blame output unconverted data. For more information see the discussion about encoding in the linkgit:git-log[1] manual page."
-msgstr ""
-"Defina a codificação a ser utilizada para gerar os nomes dos autores e do "
-"resumo dos commits. Definindo como `none` torna a saída \"blame\" em dados "
-"sem conversão. Para mais informações, consulte a discussão sobre codificação "
-"na página do manual linkgit:git-log[1]."
+msgstr "Defina a codificação a ser utilizada para gerar os nomes dos autores e do resumo dos commits. Definindo como `none` torna a saída \"blame\" em dados sem conversão. Para mais informações, consulte a discussão sobre codificação na página do manual linkgit:git-log[1]."
 
 #. type: Labeled list
 #: en/blame-options.txt:59
@@ -192,12 +188,7 @@ msgstr "--contents <arquivo>"
 #: en/blame-options.txt:65
 #, priority:100
 msgid "When <rev> is not specified, the command annotates the changes starting backwards from the working tree copy.  This flag makes the command pretend as if the working tree copy has the contents of the named file (specify `-` to make the command read from the standard input)."
-msgstr ""
-"Quando <rev> não for definido, o comando anotará as alterações iniciando em "
-"sentido contrário na cópia da árvore de trabalho.  Essa flag faz com que o "
-"comando pareça estar trabalhando na cópia da árvore de trabalho que tenha os "
-"conteúdos informados do arquivo (especifique `-` para que o comando leia a "
-"partir da entrada padrão)."
+msgstr "Quando <rev> não for definido, o comando anotará as alterações iniciando em sentido contrário na cópia da árvore de trabalho.  Essa flag faz com que o comando pareça estar trabalhando na cópia da árvore de trabalho que tenha os conteúdos informados do arquivo (especifique `-` para que o comando leia a partir da entrada padrão)."
 
 #. type: Labeled list
 #: en/blame-options.txt:66
@@ -209,12 +200,7 @@ msgstr "--date <formato>"
 #: en/blame-options.txt:72
 #, priority:100
 msgid "Specifies the format used to output dates. If --date is not provided, the value of the blame.date config variable is used. If the blame.date config variable is also not set, the iso format is used. For supported values, see the discussion of the --date option at linkgit:git-log[1]."
-msgstr ""
-"Especifica o formato utilizado para gerar as datas. Caso --date não seja "
-"utilizado, o valor da variável de configuração `blame.date` será utilizado. "
-"Caso a variável de configuração `blame.date` também não esteja definida, o "
-"formato ISO será utilizado. Para ver quais são os valores compatíveis, "
-"consulte a discussão da opção `--date` em linkgit:git-log[1]."
+msgstr "Especifica o formato utilizado para gerar as datas. Caso --date não seja utilizado, o valor da variável de configuração `blame.date` será utilizado. Caso a variável de configuração `blame.date` também não esteja definida, o formato ISO será utilizado. Para ver quais são os valores compatíveis, consulte a discussão da opção `--date` em linkgit:git-log[1]."
 
 #. type: Labeled list
 #: en/blame-options.txt:73 en/git-fsck.txt:100
@@ -346,9 +332,7 @@ msgstr "linkgit:git-count-objects[1]"
 #: en/cmds-ancillaryinterrogators.txt:12
 #, priority:100
 msgid "Count unpacked number of objects and their disk consumption."
-msgstr ""
-"Conta a quantidade dos objetos que não foram empacotados e seu consumo no "
-"disco."
+msgstr "Conta a quantidade dos objetos que não foram empacotados e seu consumo no disco."
 
 #. type: Labeled list
 #: en/cmds-ancillaryinterrogators.txt:13
@@ -495,7 +479,7 @@ msgid "Get and set repository or global options."
 msgstr "Obtém e define os repositórios ou as opções globais."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -507,7 +491,7 @@ msgid "Git data exporter."
 msgstr "Exportador de dados do Git."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -780,8 +764,7 @@ msgstr "linkgit:git-bisect[1]"
 #: en/cmds-mainporcelain.txt:12
 #, priority:100
 msgid "Use binary search to find the commit that introduced a bug."
-msgstr ""
-"Utilize a procura binária para localizar o commit que introduziu um bug."
+msgstr "Utilize a procura binária para localizar o commit que introduziu um bug."
 
 #. type: Labeled list
 #: en/cmds-mainporcelain.txt:13
@@ -2056,7 +2039,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Atualiza a informação auxiliar sobre o arquivo para ajudar os servidores burros."
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr "ARQUIVO DE CONFIGURAÇÃO"
@@ -2083,10 +2066,7 @@ msgstr "Sintaxe"
 #: en/config.txt:28
 #, priority:100
 msgid "The syntax is fairly flexible and permissive; whitespaces are mostly ignored.  The '#' and ';' characters begin comments to the end of line, blank lines are ignored."
-msgstr ""
-"A sintaxe é bastante flexível e permissiva; os espaços são ignorados na "
-"maioria das vezes.  Os caracteres '#' e ';' define o começo dos comentários "
-"até o final da linha, as linhas em branco são ignoradas."
+msgstr "A sintaxe é bastante flexível e permissiva; os espaços são ignorados na maioria das vezes.  Os caracteres '#' e ';' define o começo dos comentários até o final da linha, as linhas em branco são ignoradas."
 
 #. type: Plain text
 #: en/config.txt:35
@@ -2110,16 +2090,7 @@ msgstr "\t[seção \"subseção\"]\n"
 #: en/config.txt:53
 #, priority:100
 msgid "Subsection names are case sensitive and can contain any characters except newline and the null byte. Doublequote `\"` and backslash can be included by escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding other characters are dropped when reading; for example, `\\t` is read as `t` and `\\0` is read as `0` Section headers cannot span multiple lines.  Variables may belong directly to a section or to a given subsection. You can have `[section]` if you have `[section \"subsection\"]`, but you don't need to."
-msgstr ""
-"Os nomes das subseções diferenciam as maiúsculas das minúsculas, podem "
-"conter qualquer caractere, exceto os que definem uma nova linha e um byte "
-"nulo. As aspas duplas `\"` e a barra invertida podem ser incluídas escapando-"
-"as como` \\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos "
-"outros caracteres são descartadas durante a leitura; `\\t` é lido como` t` e "
-"`\\0` é lido como `0` cabeçalhos da seção por exemplo e não podem abranger "
-"várias linhas.  As variáveis podem pertencer diretamente a uma seção ou a "
-"uma determinada subseção. Você pode ter `[section]` caso tenha `[section "
-"\"subsection\"]`, mas não é necessário."
+msgstr "Os nomes das subseções diferenciam as maiúsculas das minúsculas, podem conter qualquer caractere, exceto os que definem uma nova linha e um byte nulo. As aspas duplas `\"` e a barra invertida podem ser incluídas escapando-as como` \\\"` e `\\\\` respectivamente. As barras invertidas anteriores aos outros caracteres são descartadas durante a leitura; `\\t` é lido como` t` e `\\0` é lido como `0` cabeçalhos da seção por exemplo e não podem abranger várias linhas.  As variáveis podem pertencer diretamente a uma seção ou a uma determinada subseção. Você pode ter `[section]` caso tenha `[section \"subsection\"]`, mas não é necessário."
 
 #. type: Plain text
 #: en/config.txt:58
@@ -2131,25 +2102,13 @@ msgstr "Também existe uma sintaxe obsoleta `[section.subsection]`. Com esta sin
 #: en/config.txt:65
 #, priority:100
 msgid "All the other lines (and the remainder of the line after the section header) are recognized as setting variables, in the form 'name = value' (or just 'name', which is a short-hand to say that the variable is the boolean \"true\").  The variable names are case-insensitive, allow only alphanumeric characters and `-`, and must start with an alphabetic character."
-msgstr ""
-"Todas as outras linhas (e o restante da linha após o cabeçalho da seção) são "
-"reconhecidas como variáveis de configuração, no formato 'name=value' (ou "
-"apenas 'name', que é uma abreviação para dizer que a variável é um valor "
-"booleano 'true').  Os nomes das variáveis não diferenciam maiúsculas de "
-"minúsculas, permitem apenas os caracteres alfanuméricos e `-` que devem "
-"começar com um caractere alfabético."
+msgstr "Todas as outras linhas (e o restante da linha após o cabeçalho da seção) são reconhecidas como variáveis de configuração, no formato 'name=value' (ou apenas 'name', que é uma abreviação para dizer que a variável é um valor booleano 'true').  Os nomes das variáveis não diferenciam maiúsculas de minúsculas, permitem apenas os caracteres alfanuméricos e `-` que devem começar com um caractere alfabético."
 
 #. type: Plain text
 #: en/config.txt:73
 #, priority:100
 msgid "A line that defines a value can be continued to the next line by ending it with a `\\`; the backquote and the end-of-line are stripped.  Leading whitespaces after 'name =', the remainder of the line after the first comment character '#' or ';', and trailing whitespaces of the line are discarded unless they are enclosed in double quotes.  Internal whitespaces within the value are retained verbatim."
-msgstr ""
-"Uma linha que define um valor pode ser continuada para a próxima linha, "
-"terminando com um `\\`; acento grave e o final da linha são removidos.  São "
-"descartados os espaços à esquerda após 'name=', o restante da linha após o "
-"primeiro caractere de comentário '#' ou ';' e os espaços à direita da linha "
-"a menos que estejam entre aspas duplas.  Internamente os espaços com valores "
-"são retidos de forma literal."
+msgstr "Uma linha que define um valor pode ser continuada para a próxima linha, terminando com um `\\`; acento grave e o final da linha são removidos.  São descartados os espaços à esquerda após 'name=', o restante da linha após o primeiro caractere de comentário '#' ou ';' e os espaços à direita da linha a menos que estejam entre aspas duplas.  Internamente os espaços com valores são retidos de forma literal."
 
 #. type: Plain text
 #: en/config.txt:76
@@ -2179,12 +2138,7 @@ msgstr "As seções `include` e `includeIf` permitem que você inclua diretivas
 #: en/config.txt:96
 #, priority:100
 msgid "You can include a config file from another by setting the special `include.path` (or `includeIf.*.path`) variable to the name of the file to be included. The variable takes a pathname as its value, and is subject to tilde expansion. These variables can be given multiple times."
-msgstr ""
-"Você pode incluir um arquivo da configuração de outro configurando a "
-"variável especial `include.path` (ou `includeIf.*.path`) como o nome do "
-"arquivo a ser incluído. A variável assume um nome do caminho como seu valor "
-"e está sujeita à expansão do til. Estas variáveis podem ser utilizadas "
-"várias vezes."
+msgstr "Você pode incluir um arquivo da configuração de outro configurando a variável especial `include.path` (ou `includeIf.*.path`) como o nome do arquivo a ser incluído. A variável assume um nome do caminho como seu valor e está sujeita à expansão do til. Estas variáveis podem ser utilizadas várias vezes."
 
 #. type: Plain text
 #: en/config.txt:102
@@ -2532,10 +2486,7 @@ msgstr "`0` e uma cadeia de caracteres vazios.\n"
 #: en/config.txt:254
 #, priority:100
 msgid "When converting a value to its canonical form using the `--type=bool` type specifier, 'git config' will ensure that the output is \"true\" or \"false\" (spelled in lowercase)."
-msgstr ""
-"Quando converter um valor para a sua forma canônica utilizando o "
-"`--type=bool`, tipo de especificação 'git config' se assegurará que a saída "
-"seja 'true' ou 'false' (em minusculas)."
+msgstr "Quando converter um valor para a sua forma canônica utilizando o `--type=bool`, tipo de especificação 'git config' se assegurará que a saída seja 'true' ou 'false' (em minusculas)."
 
 #. type: Labeled list
 #: en/config.txt:255
@@ -2643,15 +2594,7 @@ msgstr "merge.defaultToUpstream"
 #: en/config/merge.txt:18
 #, priority:240
 msgid "If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote-tracking branches.  The values of the `branch.<current branch>.merge` that name the branches at the remote named by `branch.<current branch>.remote` are consulted, and then they are mapped via `remote.<remote>.fetch` to their corresponding remote-tracking branches, and the tips of these tracking branches are merged."
-msgstr ""
-"Se a mesclagem for chamada sem nenhum argumento para o commit, mescle as "
-"ramificações \"upstream\" configuradas para a ramificação atual utilizando "
-"os seus últimos valores observados e armazenados nos seus ramos monitorados "
-"remotamente.  Os valores do `branch.<ramo atual>.merge` que nomeiam as "
-"ramificações remotas, nomeadas através da consulta do `branch.<ramo atual>."
-"remote` e em seguida são mapeadas através de `remote.<remoto>.fetch` para as "
-"suas ramificações coincidentes monitoradas remotamente, as pontas destas "
-"ramificações monitoradas são mescladas."
+msgstr "Se a mesclagem for chamada sem nenhum argumento para o commit, mescle as ramificações \"upstream\" configuradas para a ramificação atual utilizando os seus últimos valores observados e armazenados nos seus ramos monitorados remotamente.  Os valores do `branch.<ramo atual>.merge` que nomeiam as ramificações remotas, nomeadas através da consulta do `branch.<ramo atual>.remote` e em seguida são mapeadas através de `remote.<remoto>.fetch` para as suas ramificações coincidentes monitoradas remotamente, as pontas destas ramificações monitoradas são mescladas."
 
 #. type: Labeled list
 #: en/config/merge.txt:19
@@ -2687,11 +2630,7 @@ msgstr "merge.renameLimit"
 #: en/config/merge.txt:40
 #, priority:240
 msgid "The number of files to consider when performing rename detection during a merge; if not specified, defaults to the value of diff.renameLimit. This setting has no effect if rename detection is turned off."
-msgstr ""
-"A quantidade de arquivos que serão considerados ao executar a detecção de "
-"renomeação durante uma mesclagem; caso não seja especificado, a predefinição "
-"retorna para o valor existente em `diff.renameLimit`. Esta configuração não "
-"tem efeito caso a detecção de renomeação esteja desativada."
+msgstr "A quantidade de arquivos que serão considerados ao executar a detecção de renomeação durante uma mesclagem; caso não seja especificado, a predefinição retorna para o valor existente em `diff.renameLimit`. Esta configuração não tem efeito caso a detecção de renomeação esteja desativada."
 
 #. type: Labeled list
 #: en/config/merge.txt:41
@@ -2703,11 +2642,7 @@ msgstr "merge.renames"
 #: en/config/merge.txt:45
 #, priority:240
 msgid "Whether Git detects renames.  If set to \"false\", rename detection is disabled. If set to \"true\", basic rename detection is enabled.  Defaults to the value of diff.renames."
-msgstr ""
-"Se o Git detecta renomeações.  Se definido como 'false', a detecção da "
-"renomeação será desativada. Se definido como 'true', a detecção básica da "
-"renomeação será ativada.  A predefinição é o valor existente na opção de "
-"configuração `diff.renames`."
+msgstr "Se o Git detecta renomeações.  Se definido como 'false', a detecção da renomeação será desativada. Se definido como 'true', a detecção básica da renomeação será ativada.  A predefinição é o valor existente na opção de configuração `diff.renames`."
 
 #. type: Labeled list
 #: en/config/merge.txt:46
@@ -2719,19 +2654,7 @@ msgstr "merge.directoryRenames"
 #: en/config/merge.txt:58
 #, priority:240
 msgid "Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history.  If merge.directoryRenames is set to \"false\", directory rename detection is disabled, meaning that such new files will be left behind in the old directory.  If set to \"true\", directory rename detection is enabled, meaning that such new files will be moved into the new directory.  If set to \"conflict\", a conflict will be reported for such paths.  If merge.renames is false, merge.directoryRenames is ignored and treated as false.  Defaults to \"conflict\"."
-msgstr ""
-"Se o Git detecta a renomeação de um diretório, afeta o que acontece no "
-"momento da mesclagem para os novos arquivos que foram adicionados para um "
-"diretório em um lado do histórico, quando este diretório foi renomeado do "
-"outro lado do histórico.  Caso `merge.directoryRenames` esteja definido como "
-"'false', a detecção da renomeação do diretório será desativada, o que "
-"significa que estes novos arquivos serão deixados para trás no diretório "
-"antigo.  Caso seja definido como 'true', a detecção da renomeação do "
-"diretório será ativada, o que significa que esses novos arquivos serão "
-"movidos para o novo diretório.  Caso seja definido como \"conflict\", um "
-"conflito será relatado para tais caminhos.  Caso `merge.renames` seja "
-"'false', a variável `merge.directoryRenames` será ignorada e tratado como "
-"'false'.  A predefinição retorna para \"conflict\"."
+msgstr "Se o Git detecta a renomeação de um diretório, afeta o que acontece no momento da mesclagem para os novos arquivos que foram adicionados para um diretório em um lado do histórico, quando este diretório foi renomeado do outro lado do histórico.  Caso `merge.directoryRenames` esteja definido como 'false', a detecção da renomeação do diretório será desativada, o que significa que estes novos arquivos serão deixados para trás no diretório antigo.  Caso seja definido como 'true', a detecção da renomeação do diretório será ativada, o que significa que esses novos arquivos serão movidos para o novo diretório.  Caso seja definido como \"conflict\", um conflito será relatado para tais caminhos.  Caso `merge.renames` seja 'false', a variável `merge.directoryRenames` será ignorada e tratado como 'false'.  A predefinição retorna para \"conflict\"."
 
 #. type: Labeled list
 #: en/config/merge.txt:59
@@ -2767,14 +2690,7 @@ msgstr "merge.autoStash"
 #: en/config/merge.txt:82
 #, priority:240
 msgid "When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run merge on a dirty worktree.  However, use with care: the final stash application after a successful merge might result in non-trivial conflicts.  This option can be overridden by the `--no-autostash` and `--autostash` options of linkgit:git-merge[1].  Defaults to false."
-msgstr ""
-"Quando definido como 'true', crie automaticamente uma entrada temporária "
-"\"stash\" antes do início da operação e aplique-a após o término.  Significa "
-"que você pode executar a mesclagem em uma árvore de trabalho \"dirty\" (suja)"
-".  No entanto, utilize com cuidado: conflitos não triviais podem acontecer "
-"caso a aplicação final do \"stash\" ocorra após uma mesclagem bem-sucedida.  "
-"Esta opção pode ser substituída pelas opções `--no-autostash` e `--autostash`"
-" do linkgit:git-merge[1].  A predefinição retorna para o valor `false`."
+msgstr "Quando definido como 'true', crie automaticamente uma entrada temporária \"stash\" antes do início da operação e aplique-a após o término.  Significa que você pode executar a mesclagem em uma árvore de trabalho \"dirty\" (suja).  No entanto, utilize com cuidado: conflitos não triviais podem acontecer caso a aplicação final do \"stash\" ocorra após uma mesclagem bem-sucedida.  Esta opção pode ser substituída pelas opções `--no-autostash` e `--autostash` do linkgit:git-merge[1].  A predefinição retorna para o valor `false`."
 
 #. type: Labeled list
 #: en/config/merge.txt:83
@@ -2786,12 +2702,7 @@ msgstr "merge.tool"
 #: en/config/merge.txt:88
 #, priority:240
 msgid "Controls which merge tool is used by linkgit:git-mergetool[1].  The list below shows the valid built-in values.  Any other value is treated as a custom merge tool and requires that a corresponding mergetool.<tool>.cmd variable is defined."
-msgstr ""
-"Controla qual a ferramenta de mesclagem é utilizada pelo linkgit:git-"
-"mergetool[1].  A lista abaixo exibe os valores predefinidos que são válidos "
-".  Qualquer outro valor é tratado como uma ferramenta de mesclagem "
-"personalizada e requer que uma variável `mergetool.<ferramenta>.cmd` "
-"correspondente seja definida."
+msgstr "Controla qual a ferramenta de mesclagem é utilizada pelo linkgit:git-mergetool[1].  A lista abaixo exibe os valores predefinidos que são válidos .  Qualquer outro valor é tratado como uma ferramenta de mesclagem personalizada e requer que uma variável `mergetool.<ferramenta>.cmd` correspondente seja definida."
 
 #. type: Labeled list
 #: en/config/merge.txt:89
@@ -2863,10 +2774,7 @@ msgstr "merge.branchdesc"
 #: en/config/fmt-merge-msg.txt:5
 #, priority:240
 msgid "In addition to branch names, populate the log message with the branch description text associated with them.  Defaults to false."
-msgstr ""
-"Além dos nomes das ramificações, preencha a mensagem do registro log com as "
-"descrições em formato texto associadas com ela.  A predefinição retorna para "
-"o valor `false`."
+msgstr "Além dos nomes das ramificações, preencha a mensagem do registro log com as descrições em formato texto associadas com ela.  A predefinição retorna para o valor `false`."
 
 #. type: Labeled list
 #: en/config/fmt-merge-msg.txt:6
@@ -2878,11 +2786,7 @@ msgstr "merge.log"
 #: en/config/fmt-merge-msg.txt:10
 #, priority:240
 msgid "In addition to branch names, populate the log message with at most the specified number of one-line descriptions from the actual commits that are being merged.  Defaults to false, and true is a synonym for 20."
-msgstr ""
-"Além dos nomes das ramificações, preencha o registro log com a mensagem com "
-"pelo menos a quantidade máxima especificada nas descrições de uma linha a "
-"partir dos commits reais que estão sendo mesclados.  A predefinição retorna "
-"para o valor 'false' ou 'true' caso um sinônimo seja 20."
+msgstr "Além dos nomes das ramificações, preencha o registro log com a mensagem com pelo menos a quantidade máxima especificada nas descrições de uma linha a partir dos commits reais que estão sendo mesclados.  A predefinição retorna para o valor 'false' ou 'true' caso um sinônimo seja 20."
 
 #. type: Title -
 #: en/date-formats.txt:2
@@ -2942,12 +2846,7 @@ msgstr "ISO 8601"
 #: en/date-formats.txt:26
 #, priority:280
 msgid "Time and date specified by the ISO 8601 standard, for example `2005-04-07T22:13:13`. The parser accepts a space instead of the `T` character as well. Fractional parts of a second will be ignored, for example `2005-04-07T22:13:13.019` will be treated as `2005-04-07T22:13:13`."
-msgstr ""
-"A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por "
-"exemplo. O analisador também aceita um espaço em vez do caractere `T`. O "
-"analisador aceita um espaço em vez do caractere `T` também. As partes "
-"fracionadas de um segundo serão ignoradas, logo `2005-04-07T22:13:13.019` "
-"por exemplo, será tratada como `2005-04-07T22:13:13`."
+msgstr "A data e hora definidas pela norma ISO 8601 `2005-04-07T22:13:13` por exemplo. O analisador também aceita um espaço em vez do caractere `T`. O analisador aceita um espaço em vez do caractere `T` também. As partes fracionadas de um segundo serão ignoradas, logo `2005-04-07T22:13:13.019` por exemplo, será tratada como `2005-04-07T22:13:13`."
 
 #. type: Plain text
 #: en/date-formats.txt:28
@@ -2965,9 +2864,7 @@ msgstr "Gerando o formato bruto"
 #: en/diff-format.txt:6
 #, priority:280
 msgid "The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" and \"git diff --raw\" are very similar."
-msgstr ""
-"O formato bruto gerado com os comandos \"git-diff-index\", \"git-diff-tree\""
-", \"git-diff-files\" e \"git diff --raw\" são muito parecidos."
+msgstr "O formato bruto gerado com os comandos \"git-diff-index\", \"git-diff-tree\", \"git-diff-files\" e \"git diff --raw\" são muito parecidos."
 
 #. type: Plain text
 #: en/diff-format.txt:9
@@ -3213,11 +3110,7 @@ msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
 #: en/diff-format.txt:85 en/git-ls-files.txt:212 en/git-ls-tree.txt:101
 #, priority:280
 msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]).  Using `-z` the filename is output verbatim and the line is terminated by a NUL byte."
-msgstr ""
-"Sem a opção `z`, os `pathnames` com os caracteres \"incomuns\" são citados "
-"conforme explicado na variável de configuração `core.quotePath` (consulte "
-"linkgit:git-config[1]).  Utilizando a opção `-z`, o nome do arquivo é gerado "
-"literalmente e a linha é finalizada com um byte `NUL`."
+msgstr "Sem a opção `z`, os `pathnames` com os caracteres \"incomuns\" são citados conforme explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1]).  Utilizando a opção `-z`, o nome do arquivo é gerado literalmente e a linha é finalizada com um byte `NUL`."
 
 #. type: Title -
 #: en/diff-format.txt:87
@@ -3319,11 +3212,7 @@ msgstr "Outros formatos diff"
 #: en/diff-format.txt:134
 #, priority:280
 msgid "The `--summary` option describes newly added, deleted, renamed and copied files.  The `--stat` option adds diffstat(1) graph to the output.  These options can be combined with other options, such as `-p`, and are meant for human consumption."
-msgstr ""
-"A opção `--summary` descreve os arquivos adicionados, excluídos, renomeados "
-"e copiados recentemente.  A opção `--stat` adiciona o grafo diffstat(1) à "
-"saída.  Estas opções podem ser combinadas com outras opções como `-p`, que "
-"são legíveis para nós."
+msgstr "A opção `--summary` descreve os arquivos adicionados, excluídos, renomeados e copiados recentemente.  A opção `--stat` adiciona o grafo diffstat(1) à saída.  Estas opções podem ser combinadas com outras opções como `-p`, que são legíveis para nós."
 
 #. type: Plain text
 #: en/diff-format.txt:139
@@ -3545,10 +3434,7 @@ msgstr "A linha do índice inclui os nomes dos objetos bolha antes e depois da a
 #: en/diff-generate-patch.txt:63
 #, priority:260
 msgid "Pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Os nomes dos caminhos com caracteres \"incomuns\" são citados como já "
-"explicado na variável de configuração `core.quotePath` (consulte linkgit:git-"
-"config[1])."
+msgstr "Os nomes dos caminhos com caracteres \"incomuns\" são citados como já explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/diff-generate-patch.txt:68
@@ -3786,13 +3672,7 @@ msgstr "Na saída do exemplo acima, a assinatura da função foi alterada nos do
 #: en/diff-generate-patch.txt:201
 #, priority:260
 msgid "When shown by `git diff-tree -c`, it compares the parents of a merge commit with the merge result (i.e. file1..fileN are the parents).  When shown by `git diff-files -c`, it compares the two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage 3 aka \"their version\")."
-msgstr ""
-"Quando exibido pelo comando `git diff-tree -c`, compara as origens de um "
-"commit mesclado com o resultado da mesclagem (ou seja, arquivo1..arquivoN "
-"são as origens).  Quando exibido pelo comando `git diff-files -c`, as duas "
-"origens com as suas respectivas mesclagens não resolvidas com o arquivo da "
-"árvore de trabalho (ou seja, arquivo1 é o estágio 2, informado como \"nossa "
-"versão\", o arquivo2 é o estágio 3, informado como \"a versão deles\")."
+msgstr "Quando exibido pelo comando `git diff-tree -c`, compara as origens de um commit mesclado com o resultado da mesclagem (ou seja, arquivo1..arquivoN são as origens).  Quando exibido pelo comando `git diff-files -c`, as duas origens com as suas respectivas mesclagens não resolvidas com o arquivo da árvore de trabalho (ou seja, arquivo1 é o estágio 2, informado como \"nossa versão\", o arquivo2 é o estágio 3, informado como \"a versão deles\")."
 
 #. type: Labeled list
 #: en/diff-options.txt:17 en/git-rebase.txt:409 en/merge-options.txt:93
@@ -3994,8 +3874,7 @@ msgstr "--patience"
 #: en/diff-options.txt:89
 #, priority:280
 msgid "Generate a diff using the \"patience diff\" algorithm."
-msgstr ""
-"Gere um diff utilizando o algoritmo \"patience diff\" (ou diff de paciência)."
+msgstr "Gere um diff utilizando o algoritmo \"patience diff\" (ou diff de paciência)."
 
 #. type: Labeled list
 #: en/diff-options.txt:90
@@ -4007,9 +3886,7 @@ msgstr "--histogram"
 #: en/diff-options.txt:92
 #, priority:280
 msgid "Generate a diff using the \"histogram diff\" algorithm."
-msgstr ""
-"Gere um diff utilizando o algoritmo \"histogram diff\" (ou diff de "
-"histograma)."
+msgstr "Gere um diff utilizando o algoritmo \"histogram diff\" (ou diff de histograma)."
 
 #. type: Labeled list
 #: en/diff-options.txt:93
@@ -4021,8 +3898,7 @@ msgstr "--anchored=<texto>"
 #: en/diff-options.txt:95
 #, priority:280
 msgid "Generate a diff using the \"anchored diff\" algorithm."
-msgstr ""
-"Gere um diff utilizando o algoritmo \"anchored diff\" (ou diff ancorado)."
+msgstr "Gere um diff utilizando o algoritmo \"anchored diff\" (ou diff ancorado)."
 
 #. type: Plain text
 #: en/diff-options.txt:97
@@ -4034,10 +3910,7 @@ msgstr "Esta opção pode ser especificada mais de uma vez."
 #: en/diff-options.txt:102
 #, priority:280
 msgid "If a line exists in both the source and destination, exists only once, and starts with this text, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the \"patience diff\" algorithm internally."
-msgstr ""
-"Caso uma linha exista na origem e no destino, exista apenas uma vez e comece "
-"com este texto, este algoritmo tenta impedir que apareça como uma exclusão "
-"ou adição na saída. O algoritmo \"patience diff\" é utilizado internamente."
+msgstr "Caso uma linha exista na origem e no destino, exista apenas uma vez e comece com este texto, este algoritmo tenta impedir que apareça como uma exclusão ou adição na saída. O algoritmo \"patience diff\" é utilizado internamente."
 
 #. type: Labeled list
 #: en/diff-options.txt:103
@@ -4079,9 +3952,7 @@ msgstr "`patience`"
 #: en/diff-options.txt:114
 #, priority:280
 msgid "Use \"patience diff\" algorithm when generating patches."
-msgstr ""
-"Utilize o algoritmo \"patience diff\" (ou diff de paciência) ao gerar os "
-"patches."
+msgstr "Utilize o algoritmo \"patience diff\" (ou diff de paciência) ao gerar os patches."
 
 #. type: Labeled list
 #: en/diff-options.txt:114
@@ -4093,9 +3964,7 @@ msgstr "`histogram`"
 #: en/diff-options.txt:117
 #, priority:280
 msgid "This algorithm extends the patience algorithm to \"support low-occurrence common elements\"."
-msgstr ""
-"Este algoritmo estende o algoritmo \"patience\" (paciência) para \"se "
-"compatível com os elementos comuns com baixa ocorrência\"."
+msgstr "Este algoritmo estende o algoritmo \"patience\" (paciência) para \"se compatível com os elementos comuns com baixa ocorrência\"."
 
 #. type: Plain text
 #: en/diff-options.txt:122
@@ -4113,18 +3982,7 @@ msgstr "--stat[=<largura>[,<largura-do-nome>[,<count>]]]"
 #: en/diff-options.txt:137
 #, ignore-ellipsis, priority:280
 msgid "Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph part. Maximum width defaults to terminal width, or 80 columns if not connected to a terminal, and can be overridden by `<width>`. The width of the filename part can be limited by giving another width `<name-width>` after a comma. The width of the graph part can be limited by using `--stat-graph-width=<width>` (affects all commands generating a stat graph) or by setting `diff.statGraphWidth=<width>` (does not affect `git format-patch`).  By giving a third parameter `<count>`, you can limit the output to the first `<count>` lines, followed by `...` if there are more."
-msgstr ""
-"Gera um diffstat. É predefinido que o espaço necessário será utilizado para "
-"a parte do nome do arquivo e o restante para a parte do grafo. A largura "
-"máxima a predefinição retorna para a largura do terminal ou 80 colunas, caso "
-"não esteja conectada em um terminal e pode ser substituída por `<largura>`. "
-"A largura da parte do nome do arquivo pode ser limitada, fornecendo outra "
-"largura `<largura-do-nome>` após uma vírgula. A largura da parte do grafo "
-"pode ser limitada utilizando `--stat-graph-width=<largura>` (afeta todos os "
-"comandos que geram um grafo estatístico) ou definindo `diff."
-"statGraphWidth=<largura>` (não afeta o `git format-patch`).  Ao fornecer um "
-"terceiro parâmetro `<count>`, é possível limitar a saída às primeiras linhas "
-"`<count>`, seguidas por `...` caso haja mais."
+msgstr "Gera um diffstat. É predefinido que o espaço necessário será utilizado para a parte do nome do arquivo e o restante para a parte do grafo. A largura máxima a predefinição retorna para a largura do terminal ou 80 colunas, caso não esteja conectada em um terminal e pode ser substituída por `<largura>`. A largura da parte do nome do arquivo pode ser limitada, fornecendo outra largura `<largura-do-nome>` após uma vírgula. A largura da parte do grafo pode ser limitada utilizando `--stat-graph-width=<largura>` (afeta todos os comandos que geram um grafo estatístico) ou definindo `diff.statGraphWidth=<largura>` (não afeta o `git format-patch`).  Ao fornecer um terceiro parâmetro `<count>`, é possível limitar a saída às primeiras linhas `<count>`, seguidas por `...` caso haja mais."
 
 #. type: Plain text
 #: en/diff-options.txt:140
@@ -4142,13 +4000,7 @@ msgstr "--compact-summary"
 #: en/diff-options.txt:148
 #, priority:280
 msgid "Output a condensed summary of extended header information such as file creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a symlink) and mode changes (\"+x\" or \"-x\" for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies `--stat`."
-msgstr ""
-"A saída de um resumo condensado das informações do cabeçalho estendido como "
-"criações ou exclusões dos arquivos (\"novo\" ou \"desaparecido\", "
-"opcionalmente \"+l\" se for um link simbólico) e alterações do modo (\"+x\" "
-"ou \"-x\" para adicionar ou remover um bit executável, respectivamente) no "
-"diffstat. As informações são colocadas entre a parte do nome do arquivo e a "
-"parte do grafo. Implica no uso da opção `--stat`."
+msgstr "A saída de um resumo condensado das informações do cabeçalho estendido como criações ou exclusões dos arquivos (\"novo\" ou \"desaparecido\", opcionalmente \"+l\" se for um link simbólico) e alterações do modo (\"+x\" ou \"-x\" para adicionar ou remover um bit executável, respectivamente) no diffstat. As informações são colocadas entre a parte do nome do arquivo e a parte do grafo. Implica no uso da opção `--stat`."
 
 #. type: Labeled list
 #: en/diff-options.txt:149 en/git-apply.txt:45
@@ -4190,12 +4042,7 @@ msgstr "--dirstat[=<parâmetro1,parâmetro2,...>]"
 #: en/diff-options.txt:169
 #, priority:280
 msgid "Output the distribution of relative amount of changes for each sub-directory. The behavior of `--dirstat` can be customized by passing it a comma separated list of parameters.  The defaults are controlled by the `diff.dirstat` configuration variable (see linkgit:git-config[1]).  The following parameters are available:"
-msgstr ""
-"Produz a distribuição da quantidade relativa de alterações para cada "
-"subdiretório. O comportamento do `--dirstat` pode ser customizado passando "
-"uma lista de parâmetros separados por vírgula.  As predefinições são "
-"controlados pela variável de configuração `diff.dirstat` (veja linkgit:git-"
-"config[1]).  Os seguintes parâmetros estão disponíveis:"
+msgstr "Produz a distribuição da quantidade relativa de alterações para cada subdiretório. O comportamento do `--dirstat` pode ser customizado passando uma lista de parâmetros separados por vírgula.  As predefinições são controlados pela variável de configuração `diff.dirstat` (veja linkgit:git-config[1]).  Os seguintes parâmetros estão disponíveis:"
 
 #. type: Labeled list
 #: en/diff-options.txt:171
@@ -4255,20 +4102,13 @@ msgstr "<limite>"
 #: en/diff-options.txt:199
 #, priority:280
 msgid "An integer parameter specifies a cut-off percent (3% by default).  Directories contributing less than this percentage of the changes are not shown in the output."
-msgstr ""
-"Um parâmetro inteiro especifica uma porcentagem de corte (a predefinição "
-"retorna para 3%).  Os diretórios que contribuem com menos que esta "
-"porcentagem nas alterações não são exibidos na saída."
+msgstr "Um parâmetro inteiro especifica uma porcentagem de corte (a predefinição retorna para 3%).  Os diretórios que contribuem com menos que esta porcentagem nas alterações não são exibidos na saída."
 
 #. type: Plain text
 #: en/diff-options.txt:205
 #, priority:280
 msgid "Example: The following will count changed files, while ignoring directories with less than 10% of the total amount of changed files, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`."
-msgstr ""
-"Exemplo: O seguinte contará os arquivos alterados, ignorando os diretórios "
-"com menos de 10% da quantidade total dos arquivos alterados e acumulando as "
-"contagens de um diretório-herdado nos diretórios-raiz: "
-"`---dirstat=arquivos,10,cumulative`."
+msgstr "Exemplo: O seguinte contará os arquivos alterados, ignorando os diretórios com menos de 10% da quantidade total dos arquivos alterados e acumulando as contagens de um diretório-herdado nos diretórios-raiz: `---dirstat=arquivos,10,cumulative`."
 
 #. type: Labeled list
 #: en/diff-options.txt:206
@@ -4350,10 +4190,7 @@ msgstr ""
 #: en/diff-options.txt:238 en/git-apply.txt:122
 #, priority:280
 msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Sem esta opção, os nomes do caminho com caracteres \"incomuns\" são citados "
-"como explicado na variável de configuração `core.quotePath` (veja linkgit"
-":git-config [1])."
+msgstr "Sem esta opção, os nomes do caminho com caracteres \"incomuns\" são citados como explicado na variável de configuração `core.quotePath` (veja linkgit:git-config [1])."
 
 #. type: Labeled list
 #: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
@@ -4389,18 +4226,7 @@ msgstr "--submodule[=<formato>]"
 #: en/diff-options.txt:257
 #, priority:280
 msgid "Specify how differences in submodules are shown.  When specifying `--submodule=short` the 'short' format is used.  This format just shows the names of the commits at the beginning and end of the range.  When `--submodule` or `--submodule=log` is specified, the 'log' format is used.  This format lists the commits in the range like linkgit:git-submodule[1] `summary` does.  When `--submodule=diff` is specified, the 'diff' format is used.  This format shows an inline diff of the changes in the submodule contents between the commit range.  Defaults to `diff.submodule` or the 'short' format if the config option is unset."
-msgstr ""
-"Especifique como as diferenças nos submódulos são exibidos.  Ao especificar "
-"`--submodule=short`, o formato 'short' (curto) é utilizado.  Este formato "
-"exibe apenas os nomes dos commits no início e no final do intervalo.  Ao "
-"utilizar a opção `--submodule` ou `--submodule=log`, o formato 'log' passa a "
-"ser utilizado.  Este formato lista os commits no intervalo como o linkgit"
-":git-submodule[1] `summary` (resumo) faz.  Ao utilizar a opção "
-"`--submodule=diff`, o formato 'diff' passa a ser utilizado.  Este formato "
-"exibe uma comparação nas linhas das alterações no conteúdo do submódulo "
-"entre o intervalo do commit.  A predefinição retorna para a opção de "
-"configuração `diff.submodule` ou o formato 'short' (curto) caso a opção da "
-"configuração estiver desativada."
+msgstr "Especifique como as diferenças nos submódulos são exibidos.  Ao especificar `--submodule=short`, o formato 'short' (curto) é utilizado.  Este formato exibe apenas os nomes dos commits no início e no final do intervalo.  Ao utilizar a opção `--submodule` ou `--submodule=log`, o formato 'log' passa a ser utilizado.  Este formato lista os commits no intervalo como o linkgit:git-submodule[1] `summary` (resumo) faz.  Ao utilizar a opção `--submodule=diff`, o formato 'diff' passa a ser utilizado.  Este formato exibe uma comparação nas linhas das alterações no conteúdo do submódulo entre o intervalo do commit.  A predefinição retorna para a opção de configuração `diff.submodule` ou o formato 'short' (curto) caso a opção da configuração estiver desativada."
 
 #. type: Labeled list
 #: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:224 en/git-show-branch.txt:119 en/git-tag.txt:125
@@ -4474,8 +4300,7 @@ msgid ""
 "\tand to 'zebra' if the option with no mode is given.\n"
 "\tThe mode must be one of:\n"
 msgstr ""
-"\tO <modo> retorna para a predefinição como 'no' caso a opção não seja "
-"utilizada\n"
+"\tO <modo> retorna para a predefinição como 'no' caso a opção não seja utilizada\n"
 "\te para 'zebra' caso a opção seja utilizada sem nenhum modo.\n"
 "\tO modo deve ser um dos seguintes:\n"
 
@@ -4525,11 +4350,7 @@ msgstr "blocks"
 #: en/diff-options.txt:301
 #, priority:280
 msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color.  Adjacent blocks cannot be told apart."
-msgstr ""
-"Os blocos de texto movidos com pelo menos 20 caracteres alfanuméricos são "
-"detectados de forma ávida. Os blocos detectados são pintados utilizando a "
-"cor `color.diff.{old,new}Moved`.  Os blocos adjacentes não podem ser "
-"separados."
+msgstr "Os blocos de texto movidos com pelo menos 20 caracteres alfanuméricos são detectados de forma ávida. Os blocos detectados são pintados utilizando a cor `color.diff.{old,new}Moved`.  Os blocos adjacentes não podem ser separados."
 
 #. type: Labeled list
 #: en/diff-options.txt:301
@@ -4541,11 +4362,7 @@ msgstr "zebra"
 #: en/diff-options.txt:306
 #, priority:280
 msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
-msgstr ""
-"Os blocos de texto que foram movidos são detectados como no modo 'blocks' "
-"(blocos). Os blocos são pintados utilizando a cor `color.diff.{old,new}Moved`"
-" ou `color.diff.{old,new}MovedAlternative`. A alteração entre as duas cores "
-"indica que um novo bloco foi detectado."
+msgstr "Os blocos de texto que foram movidos são detectados como no modo 'blocks' (blocos). Os blocos são pintados utilizando a cor `color.diff.{old,new}Moved` ou `color.diff.{old,new}MovedAlternative`. A alteração entre as duas cores indica que um novo bloco foi detectado."
 
 #. type: Labeled list
 #: en/diff-options.txt:306
@@ -4581,17 +4398,13 @@ msgstr "--color-moved-ws=<modos>"
 #: en/diff-options.txt:320
 #, priority:280
 msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
-msgstr ""
-"Configura como o espaço é ignorado durante a execução da detecção do mover "
-"para `--color-moved`."
+msgstr "Configura como o espaço é ignorado durante a execução da detecção do mover para `--color-moved`."
 
 #. type: Plain text
 #: en/diff-options.txt:322
 #, no-wrap, priority:280
 msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
-msgstr ""
-"\tPode ser definido através da definição da variável de configuração `diff."
-"colorMovedWS`.\n"
+msgstr "\tPode ser definido através da definição da variável de configuração `diff.colorMovedWS`.\n"
 
 #. type: Plain text
 #: en/diff-options.txt:324
@@ -4612,7 +4425,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "Ignore as alterações no espaço na EOL (fim da linha)."
@@ -4624,13 +4437,10 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
-msgstr ""
-"Ignore as alterações na quantidade do espaço.  Ignora o espaço no final da "
-"linha e considera todas as outras sequências de um ou mais caracteres de "
-"espaço como equivalentes."
+msgstr "Ignore as alterações na quantidade do espaço.  Ignora o espaço no final da linha e considera todas as outras sequências de um ou mais caracteres de espaço como equivalentes."
 
 #. type: Labeled list
 #: en/diff-options.txt:334 en/merge-strategies.txt:60
@@ -4642,9 +4452,7 @@ msgstr "ignore-all-space"
 #: en/diff-options.txt:337
 #, priority:280
 msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignore o espaço durante a comparação das linhas. Ignore as diferenças mesmo "
-"que uma linha tenha espaços quando a outra linha não tiver nenhuma."
+msgstr "Ignore o espaço durante a comparação das linhas. Ignore as diferenças mesmo que uma linha tenha espaços quando a outra linha não tiver nenhuma."
 
 #. type: Labeled list
 #: en/diff-options.txt:337
@@ -4656,11 +4464,7 @@ msgstr "allow-indentation-change"
 #: en/diff-options.txt:342
 #, priority:280
 msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
-msgstr ""
-"Ignore inicialmente, qualquer espaço na detecção da ação de mover, em "
-"seguida, agrupe os blocos do código que foram movidos apenas em um bloco "
-"caso a alteração no espaço seja a mesma em cada linha. Isto é incompatível "
-"com os outros modos."
+msgstr "Ignore inicialmente, qualquer espaço na detecção da ação de mover, em seguida, agrupe os blocos do código que foram movidos apenas em um bloco caso a alteração no espaço seja a mesma em cada linha. Isto é incompatível com os outros modos."
 
 #. type: Labeled list
 #: en/diff-options.txt:344
@@ -4672,10 +4476,7 @@ msgstr "--no-color-moved-ws"
 #: en/diff-options.txt:348
 #, priority:280
 msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
-msgstr ""
-"Não ignore os espaços quando realizar a detecção da ação de mover. Pode ser "
-"utilizado para substituir a definição da configuração. É o mesmo que "
-"`--color-moved-ws=no`."
+msgstr "Não ignore os espaços quando realizar a detecção da ação de mover. Pode ser utilizado para substituir a definição da configuração. É o mesmo que `--color-moved-ws=no`."
 
 #. type: Labeled list
 #: en/diff-options.txt:349
@@ -4687,11 +4488,7 @@ msgstr "--word-diff[=<modo>]"
 #: en/diff-options.txt:354
 #, priority:280
 msgid "Show a word diff, using the <mode> to delimit changed words.  By default, words are delimited by whitespace; see `--word-diff-regex` below.  The <mode> defaults to 'plain', and must be one of:"
-msgstr ""
-"Exiba umadiff entre as palavras, usando o <modo> para delimitar as palavras "
-"alteradas.  É predefinido que as palavras sejam delimitadas por espaços; "
-"consulte `--word-diff-regex` abaixo.  O <modo> retorna para a predefinição "
-"'plain' e deve ser um dos seguintes:"
+msgstr "Exiba umadiff entre as palavras, usando o <modo> para delimitar as palavras alteradas.  É predefinido que as palavras sejam delimitadas por espaços; consulte `--word-diff-regex` abaixo.  O <modo> retorna para a predefinição 'plain' e deve ser um dos seguintes:"
 
 #. type: Plain text
 #: en/diff-options.txt:358
@@ -4745,24 +4542,13 @@ msgstr "--word-diff-regex=<expressão-regular>"
 #: en/diff-options.txt:380
 #, priority:280
 msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word.  Also implies `--word-diff` unless it was already enabled."
-msgstr ""
-"Utilize uma `<expressão-regular>` para decidir o que uma palavra é em vez de "
-"considerar as execuções dos espaços que não estejam vazios como uma "
-"palavra.  Também implica no uso da opção `--word-diff`, a menos que já "
-"esteja ativo."
+msgstr "Utilize uma `<expressão-regular>` para decidir o que uma palavra é em vez de considerar as execuções dos espaços que não estejam vazios como uma palavra.  Também implica no uso da opção `--word-diff`, a menos que já esteja ativo."
 
 #. type: Plain text
 #: en/diff-options.txt:388
 #, priority:280
 msgid "Every non-overlapping match of the <regex> is considered a word.  Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences.  You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters.  A match that contains a newline is silently truncated(!) at the newline."
-msgstr ""
-"Toda a coincidência não sobreposta do `<expressão-regular>` é considerado "
-"como sendo uma palavra.  Qualquer coisa entre estas coincidências é "
-"considerada um espaço e é ignorado(!) com o objetivo de encontrar as "
-"diferenças.  Você pode anexar `|[^[:space:]]` à sua expressão regular para "
-"garantir que ela coincida com todos os caracteres que não sejam espaços.  "
-"Uma coincidência que contenha uma nova linha é silenciosamente truncada(!) "
-"na nova linha."
+msgstr "Toda a coincidência não sobreposta do `<expressão-regular>` é considerado como sendo uma palavra.  Qualquer coisa entre estas coincidências é considerada um espaço e é ignorado(!) com o objetivo de encontrar as diferenças.  Você pode anexar `|[^[:space:]]` à sua expressão regular para garantir que ela coincida com todos os caracteres que não sejam espaços.  Uma coincidência que contenha uma nova linha é silenciosamente truncada(!) na nova linha."
 
 #. type: Plain text
 #: en/diff-options.txt:391
@@ -4786,9 +4572,7 @@ msgstr "--color-words[=<expressão-regular>]"
 #: en/diff-options.txt:400
 #, priority:280
 msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
-msgstr ""
-"Equivalente a `--word-diff=color` mais (caso um regex seja utilizado) "
-"`--word-diff-regex=<expressão-regular>`."
+msgstr "Equivalente a `--word-diff=color` mais (caso um regex seja utilizado) `--word-diff-regex=<expressão-regular>`."
 
 #. type: Labeled list
 #: en/diff-options.txt:402 en/git-status.txt:143
@@ -4824,15 +4608,7 @@ msgstr "--check"
 #: en/diff-options.txt:419
 #, priority:280
 msgid "Warn if changes introduce conflict markers or whitespace errors.  What are considered whitespace errors is controlled by `core.whitespace` configuration.  By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors.  Exits with non-zero status if problems are found. Not compatible with --exit-code."
-msgstr ""
-"Avise caso as alterações introduzirem os marcadores de conflito ou os erros "
-"de espaço.  A configuração `core.whitespace` define o que são considerados "
-"erros de espaço.  É predefinido que os espaços à direita (incluindo as "
-"linhas que consistem apenas de espaços) e um caractere de espaço que seja "
-"imediatamente seguido por um caractere de tabulação dentro do recuo inicial "
-"da linha, são considerados erros de espaço.  Encerra com uma condição "
-"diferente de zero caso problemas sejam encontrados. Não é compatível com "
-"`--exit-code`."
+msgstr "Avise caso as alterações introduzirem os marcadores de conflito ou os erros de espaço.  A configuração `core.whitespace` define o que são considerados erros de espaço.  É predefinido que os espaços à direita (incluindo as linhas que consistem apenas de espaços) e um caractere de espaço que seja imediatamente seguido por um caractere de tabulação dentro do recuo inicial da linha, são considerados erros de espaço.  Encerra com uma condição diferente de zero caso problemas sejam encontrados. Não é compatível com `--exit-code`."
 
 #. type: Labeled list
 #: en/diff-options.txt:420
@@ -4844,14 +4620,7 @@ msgstr "--ws-error-highlight=<tipo>"
 #: en/diff-options.txt:429
 #, priority:280
 msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff.  Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`.  When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
-msgstr ""
-"Destaque os erros de espaço nas linhas `context` (contexto), `old` (antigo) "
-"ou `new` (novo) do diff.  Vários valores são separados por vírgula, `none` "
-"redefine os valores anteriores, `default` redefine a lista para `new` e `all`"
-" é uma abreviação para `old,new,context`.  Quando esta opção não é utilizada "
-"e a variável de configuração `diff.wsErrorHighlight` não está definida, "
-"apenas os erros de espaço nas linhas `novas` são destacados. Os erros de "
-"espaço são coloridos com `color.diff.whitespace`."
+msgstr "Destaque os erros de espaço nas linhas `context` (contexto), `old` (antigo) ou `new` (novo) do diff.  Vários valores são separados por vírgula, `none` redefine os valores anteriores, `default` redefine a lista para `new` e `all` é uma abreviação para `old,new,context`.  Quando esta opção não é utilizada e a variável de configuração `diff.wsErrorHighlight` não está definida, apenas os erros de espaço nas linhas `novas` são destacados. Os erros de espaço são coloridos com `color.diff.whitespace`."
 
 #. type: Labeled list
 #: en/diff-options.txt:432
@@ -4911,29 +4680,13 @@ msgstr "Divida as alterações reescritas que foram completas em pares de exclus
 #: en/diff-options.txt:463
 #, priority:280
 msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
-msgstr ""
-"Afeta a maneira como uma mudança que equivale a uma reescrita total de um "
-"arquivo, não como uma série de exclusão e inserção combinadas com poucas "
-"linhas que coincidem textualmente com o contexto, e sim como uma única "
-"exclusão de tudo o que é antigo seguido por um inserção única de tudo que "
-"for novo, o número `m` controla este aspecto da opção `-B` (a predefinição "
-"retorna para 60%). `-B / 70%` determina que menos de 30% do original deve "
-"permanecer no resultado para que o Git considere-o como uma reescrita total ("
-"ou seja, caso contrário, o patch resultante será uma série de exclusões e "
-"inserções combinados com linhas de contexto)."
+msgstr "Afeta a maneira como uma mudança que equivale a uma reescrita total de um arquivo, não como uma série de exclusão e inserção combinadas com poucas linhas que coincidem textualmente com o contexto, e sim como uma única exclusão de tudo o que é antigo seguido por um inserção única de tudo que for novo, o número `m` controla este aspecto da opção `-B` (a predefinição retorna para 60%). `-B / 70%` determina que menos de 30% do original deve permanecer no resultado para que o Git considere-o como uma reescrita total (ou seja, caso contrário, o patch resultante será uma série de exclusões e inserções combinados com linhas de contexto)."
 
 #. type: Plain text
 #: en/diff-options.txt:471
 #, priority:280
 msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
-msgstr ""
-"Quando utilizado com a opção `-M`, um arquivo totalmente reescrito também é "
-"considerado a fonte de uma renomeação (O `-M` geralmente considera apenas um "
-"arquivo que desapareceu como a origem de uma renomeação), o número `n` "
-"controla esse aspecto da opção `-B` (a predefinição retorna para 50%). O "
-"`-B20%` determina que uma alteração com a adição e a exclusão em comparação "
-"com 20% ou mais do tamanho do arquivo é elegível para ser selecionada como "
-"uma possível fonte de renomeação para um outro arquivo."
+msgstr "Quando utilizado com a opção `-M`, um arquivo totalmente reescrito também é considerado a fonte de uma renomeação (O `-M` geralmente considera apenas um arquivo que desapareceu como a origem de uma renomeação), o número `n` controla esse aspecto da opção `-B` (a predefinição retorna para 50%). O `-B20%` determina que uma alteração com a adição e a exclusão em comparação com 20% ou mais do tamanho do arquivo é elegível para ser selecionada como uma possível fonte de renomeação para um outro arquivo."
 
 #. type: Labeled list
 #: en/diff-options.txt:472
@@ -4981,15 +4734,12 @@ msgid ""
 msgstr ""
 "\tCaso `n` seja utilizado, é a limítrofe do índice da similaridade\n"
 "\t(A quantidade de adições/exclusões comparado ao tamanho\n"
-"\tdo arquivo). `-M90%` significa que o Git deve considerar uma ação do par "
-"de\n"
+"\tdo arquivo). `-M90%` significa que o Git deve considerar uma ação do par de\n"
 "\texclusão/adição para ser renomeado caso mais que 90% do arquivo\n"
-"\tnão tenha sido alterado.  Sem um sinal de `%`, a quantidade deve ser lida "
-"como\n"
+"\tnão tenha sido alterado.  Sem um sinal de `%`, a quantidade deve ser lida como\n"
 "\tuma fração, com um ponto decimal antes dele.  `-M5` se torna por exemplo\n"
 "\t0.5, portanto, é o mesmo que `-M50%`.  Da mesma forma que `-M05` é\n"
-"\to mesmo que `-M5%`.  Para limitar a detecção para renomeações exatas, "
-"utilize\n"
+"\to mesmo que `-M5%`.  Para limitar a detecção para renomeações exatas, utilize\n"
 "\t`-M100%`.  A predefinição para o índice de similaridade é 50%.\n"
 
 #. type: Labeled list
@@ -5020,13 +4770,7 @@ msgstr "--find-copies-harder"
 #: en/diff-options.txt:505
 #, priority:280
 msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset.  This flag makes the command inspect unmodified files as candidates for the source of copy.  This is a very expensive operation for large projects, so use it with caution.  Giving more than one `-C` option has the same effect."
-msgstr ""
-"Por motivos de desempenho, a predefinição retorna para que a opção `-C` "
-"encontre as cópias apenas caso o arquivo original da cópia tenha sido "
-"modificado no mesmo conjunto de alterações.  Essa flag faz com que o comando "
-"inspecione os arquivos que não modificados como candidatos à origem da "
-"cópia.  Esta é uma operação muito dispendiosa em projetos grandes, portanto, "
-"utilize-a com cuidado.  Tem o mesmo efeito caso a opção `-C` seja repetida."
+msgstr "Por motivos de desempenho, a predefinição retorna para que a opção `-C` encontre as cópias apenas caso o arquivo original da cópia tenha sido modificado no mesmo conjunto de alterações.  Essa flag faz com que o comando inspecione os arquivos que não modificados como candidatos à origem da cópia.  Esta é uma operação muito dispendiosa em projetos grandes, portanto, utilize-a com cuidado.  Tem o mesmo efeito caso a opção `-C` seja repetida."
 
 #. type: Labeled list
 #: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
@@ -5062,11 +4806,7 @@ msgstr "-l<num>"
 #: en/diff-options.txt:525
 #, priority:280
 msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets.  This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
-msgstr ""
-"As opções `-M` e `-C` requerem um tempo de processamento O(n^2) em que n é a "
-"quantidade de possíveis alvos para renomeações/cópia.  Esta opção impede que "
-"a detecção da ação de renomear/cópia seja executada se a quantidade dos "
-"alvos a serem renomeados/copiados exceda o a quantidade especificada."
+msgstr "As opções `-M` e `-C` requerem um tempo de processamento O(n^2) em que n é a quantidade de possíveis alvos para renomeações/cópia.  Esta opção impede que a detecção da ação de renomear/cópia seja executada se a quantidade dos alvos a serem renomeados/copiados exceda o a quantidade especificada."
 
 #. type: Labeled list
 #: en/diff-options.txt:527
@@ -5126,18 +4866,13 @@ msgstr "-G<expressão-regular>"
 #: en/diff-options.txt:564
 #, priority:280
 msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
-msgstr ""
-"Procure por diferenças cujo texto do patch contenha as linhas adicionadas/"
-"removidas que correspondam a um `<expressão-regular>`."
+msgstr "Procure por diferenças cujo texto do patch contenha as linhas adicionadas/removidas que correspondam a um `<expressão-regular>`."
 
 #. type: Plain text
 #: en/diff-options.txt:568
 #, priority:280
 msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
-msgstr ""
-"Para ilustrar a diferença entre `-S<expressão-regular> --pickaxe-regex` e `-G"
-"<expressão-regular>`, considere um commit com o seguinte diff no mesmo "
-"arquivo:"
+msgstr "Para ilustrar a diferença entre `-S<expressão-regular> --pickaxe-regex` e `-G<expressão-regular>`, considere um commit com o seguinte diff no mesmo arquivo:"
 
 #. type: delimited block -
 #: en/diff-options.txt:573
@@ -5197,10 +4932,7 @@ msgstr "--pickaxe-all"
 #: en/diff-options.txt:598
 #, priority:280
 msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
-msgstr ""
-"Quando a opção `-S` ou `-G` encontra uma alteração, exiba todas as "
-"alterações naquele conjunto de alterações e não apenas nos arquivos que "
-"contenham as alterações em uma `<texto>`."
+msgstr "Quando a opção `-S` ou `-G` encontra uma alteração, exiba todas as alterações naquele conjunto de alterações e não apenas nos arquivos que contenham as alterações em uma `<texto>`."
 
 #. type: Labeled list
 #: en/diff-options.txt:599
@@ -5212,9 +4944,7 @@ msgstr "--pickaxe-regex"
 #: en/diff-options.txt:602
 #, priority:280
 msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
-msgstr ""
-"Trate o `<texto>` utilizado com o `-S` como uma expressão regular POSIX "
-"estendida para coincidir."
+msgstr "Trate o `<texto>` utilizado com o `-S` como uma expressão regular POSIX estendida para coincidir."
 
 #. type: Labeled list
 #: en/diff-options.txt:605 en/git-mergetool.txt:95
@@ -5226,26 +4956,13 @@ msgstr "-O<ordem-do-arquivo>"
 #: en/diff-options.txt:610
 #, priority:280
 msgid "Control the order in which files appear in the output.  This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]).  To cancel `diff.orderFile`, use `-O/dev/null`."
-msgstr ""
-"Controlar a ordem em que os arquivos aparecem na saída.  Substitui a "
-"variável de configuração `diff.orderFile` (consulte linkgit:git-config[1]).  "
-"Para cancelar a variável `diff.orderFile`, utilize `-O/dev/null`."
+msgstr "Controlar a ordem em que os arquivos aparecem na saída.  Substitui a variável de configuração `diff.orderFile` (consulte linkgit:git-config[1]).  Para cancelar a variável `diff.orderFile`, utilize `-O/dev/null`."
 
 #. type: Plain text
 #: en/diff-options.txt:622
 #, priority:280
 msgid "The output order is determined by the order of glob patterns in <orderfile>.  All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on.  All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file.  If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
-msgstr ""
-"A ordem da saída é determinada pela ordem dos padrões bolha na <ordem-do-"
-"arquivo>.  São enviados primeiro todos os arquivos cujos nomes do caminho "
-"coincidam com o primeiro padrão, em seguida todos os arquivos cujos nomes do "
-"caminho coincidam com o segundo padrão (mas não ao primeiro) e assim por "
-"diante.  São exibidos por último todos os arquivos cujos nomes do caminho "
-"não coincidam com nenhum padrão como se houvesse um padrão de coincidência "
-"total implícito no final do arquivo.  Caso vários nomes do caminho tenham a "
-"mesma classificação (eles coincidem com o mesmo padrão, mas não com os "
-"padrões anteriores), a sua ordem na saída em relação à outra é a ordem "
-"normal."
+msgstr "A ordem da saída é determinada pela ordem dos padrões bolha na <ordem-do-arquivo>.  São enviados primeiro todos os arquivos cujos nomes do caminho coincidam com o primeiro padrão, em seguida todos os arquivos cujos nomes do caminho coincidam com o segundo padrão (mas não ao primeiro) e assim por diante.  São exibidos por último todos os arquivos cujos nomes do caminho não coincidam com nenhum padrão como se houvesse um padrão de coincidência total implícito no final do arquivo.  Caso vários nomes do caminho tenham a mesma classificação (eles coincidem com o mesmo padrão, mas não com os padrões anteriores), a sua ordem na saída em relação à outra é a ordem normal."
 
 #. type: Plain text
 #: en/diff-options.txt:624
@@ -5290,270 +5007,266 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr "Troque as duas entradas; isto é, exiba as diferenças do índice ou do arquivo no disco para o conteúdo da árvore."
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr "--relative[=<caminho>]"
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
-#, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
-msgstr ""
-"Com esta opção, quando executado a partir de um subdiretório do projeto, "
-"pode-se dizer para excluir as alterações fora do diretório e exibir os nomes "
-"do caminho relativos a ele.  Quando não estiver em um subdiretório (em um "
-"repositório simples por exemplo), é possível nomear em qual subdiretório "
-"tornar a saída relativa, utilizando um `<caminho>` como argumento."
+#: en/diff-options.txt:658
+#, fuzzy, priority:280
+#| msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
+msgstr "Com esta opção, quando executado a partir de um subdiretório do projeto, pode-se dizer para excluir as alterações fora do diretório e exibir os nomes do caminho relativos a ele.  Quando não estiver em um subdiretório (em um repositório simples por exemplo), é possível nomear em qual subdiretório tornar a saída relativa, utilizando um `<caminho>` como argumento."
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt: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:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr "Trate todos os arquivos como texto."
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr "Ignore o retorno do carro no final da linha durante uma comparação."
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
-msgstr ""
-"Ignore o espaço durante a comparação das linhas.  Ignore as diferenças mesmo "
-"que uma linha tenha espaços quando a outra linha não tiver nenhuma."
+msgstr "Ignore o espaço durante a comparação das linhas.  Ignore as diferenças mesmo que uma linha tenha espaços quando a outra linha não tiver nenhuma."
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Ignore as alterações cujas linhas estejam todas em branco."
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr "--inter-hunk-context=<linhas>"
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
-msgstr ""
-"Exiba o contexto entre as diferenças, até a quantidade de linhas "
-"especificada, fundindo assim as que estão próximas umas das outras.  A "
-"predefinição retorna para `diff.interHunkContext` ou 0 caso a opção de "
-"configuração não esteja definida."
+msgstr "Exiba o contexto entre as diferenças, até a quantidade de linhas especificada, fundindo assim as que estão próximas umas das outras.  A predefinição retorna para `diff.interHunkContext` ou 0 caso a opção de configuração não esteja definida."
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr "Exiba todas as funções ao redor das alterações."
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr "Faça com que o programa encerre com códigos semelhantes ao diff(1).  Ou seja, encerra com 1 caso haja diferenças ou 0 quando não houver."
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr "Faz com que o programa trabalhe em silêncio. Implica no uso da opção `--exit-code`."
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr "Permitir que um auxiliar diff externo seja executado. Caso um controlador diff externo seja definido com linkgit:gitattributes[5], será necessário a utilização desta opção com linkgit:git-log[1] e seus companheiros."
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr "Não permitir o uso de um controladores diff externo."
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr "Permita (ou não permita) a execução dos filtros externos para a conversão do texto durante a comparação dos arquivos binários. Para mais detalhes consulte linkgit:gitattributes[5]. Como os filtros \"textconv\" são normalmente uma conversão unidirecional, o diff resultante é legível para as pessoas porém não pode ser aplicado. Por este motivo, é predefinido que os filtros \"textconv\" estejam ativos apenas para os comandos linkgit:git-diff[1] e linkgit:git-log[1], mas não para os comandos linkgit:git-format-patch[1] ou comandos \"diff\" que possam ser redirecionados."
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr "--ignore-submodules[=<quando>]"
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr "Ignore as alterações nos submódulos durante a geração dos diffs. O `<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que é a predefinição.  O \"none\" considera o submódulo modificado quando houver arquivos não estejam rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado no superprojeto, pode ser utilizado para substituir qualquer configuração da opção 'ignore' (ignorar) em  linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando o \"untracked\" é utilizado, os submódulos não são considerados sujos quando houver apenas  um conteúdo sem rastreamento (porém o monitoramento de alterações do seu conteúdo continua) O uso de \"dirty\" ignora todas as alterações na árvore de trabalho dos submódulos, apenas as alterações nos commits armazenados no superprojeto são exibidos (este era o comportamento anterior até a versão 1.7.0). O uso de \"all\" oculta todas as alterações nos submódulos."
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr "--src-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr "Exiba o prefixo da origem utilizada em vez de \"a/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr "--dst-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr "Exiba o prefixo do destino utilizado em vez de \"b/\"."
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr "Não exiba nenhum prefixo da origem ou destino."
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr "--line-prefix=<prefixo>"
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr "Prefira um prefixo adicional em cada linha produzida."
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr "É predefinido que as entradas adicionadas através do comando \"git add -N\" apareçam como uma cadeia de caracteres vazia existente com o comando \"git diff\" e um novo arquivo com \"git diff --cached\".  Esta opção faz com que a entrada apareça como um novo arquivo no \"git diff\" e inexistente no \"git diff --cached\". Esta opção pode ser revertida com `--ita-visible-in-index`. Ambas as opções são experimentais e podem ser removidas no futuro."
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr "Para uma explicação mais detalhada sobre estas opções comuns, consulte também linkgit:gitdiffcore[7]."
@@ -5580,10 +5293,7 @@ msgstr "--append"
 #: en/fetch-options.txt:9
 #, priority:220
 msgid "Append ref names and object names of fetched refs to the existing contents of `.git/FETCH_HEAD`.  Without this option old data in `.git/FETCH_HEAD` will be overwritten."
-msgstr ""
-"Acrescente nomes ao \"ref\" e os nomes dos objetos refs capturados ao "
-"conteúdo existente de `.git/FETCH_HEAD`.  Sem esta opção, os dados antigos "
-"em `.git/FETCH_HEAD` serão substituídos."
+msgstr "Acrescente nomes ao \"ref\" e os nomes dos objetos refs capturados ao conteúdo existente de `.git/FETCH_HEAD`.  Sem esta opção, os dados antigos em `.git/FETCH_HEAD` serão substituídos."
 
 #. type: Labeled list
 #: en/fetch-options.txt:10
@@ -5619,9 +5329,7 @@ msgstr "--shallow-since=<data>"
 #: en/fetch-options.txt:25 en/git-fetch-pack.txt:93
 #, priority:220
 msgid "Deepen or shorten the history of a shallow repository to include all reachable commits after <date>."
-msgstr ""
-"Aprofunde ou encurte o histórico de um repositório raso para incluir todas "
-"os commits acessíveis após a <data>."
+msgstr "Aprofunde ou encurte o histórico de um repositório raso para incluir todas os commits acessíveis após a <data>."
 
 #. type: Labeled list
 #: en/fetch-options.txt:26 en/git-clone.txt:235 en/git-fetch-pack.txt:94
@@ -5633,10 +5341,7 @@ msgstr "--shallow-exclude=<revisão>"
 #: en/fetch-options.txt:30 en/git-fetch-pack.txt:98
 #, priority:220
 msgid "Deepen or shorten the history of a shallow repository to exclude commits reachable from a specified remote branch or tag.  This option can be specified multiple times."
-msgstr ""
-"Aprofunde ou diminua o histórico de um repositório raso para excluir os "
-"commits acessíveis vindos de uma determinada tag ou ramificação remota.  "
-"Esta opção pode ser utilizada várias vezes."
+msgstr "Aprofunde ou diminua o histórico de um repositório raso para excluir os commits acessíveis vindos de uma determinada tag ou ramificação remota.  Esta opção pode ser utilizada várias vezes."
 
 #. type: Labeled list
 #: en/fetch-options.txt:31
@@ -5666,10 +5371,7 @@ msgstr "--update-shallow"
 #: en/fetch-options.txt:44
 #, priority:220
 msgid "By default when fetching from a shallow repository, `git fetch` refuses refs that require updating .git/shallow. This option updates .git/shallow and accept such refs."
-msgstr ""
-"É predefinido que durante a captura em um repositório superficial, o `git "
-"fetch` recuse os refs que exijam a atualização do `.git/shallow`. Esta opção "
-"atualiza o `.git/shallow` e aceita tais refs."
+msgstr "É predefinido que durante a captura em um repositório superficial, o `git fetch` recuse os refs que exijam a atualização do `.git/shallow`. Esta opção atualiza o `.git/shallow` e aceita tais refs."
 
 #. type: Labeled list
 #: en/fetch-options.txt:45
@@ -5681,22 +5383,13 @@ msgstr "--negotiation-tip=<commit|glob>"
 #: en/fetch-options.txt:53
 #, priority:220
 msgid "By default, Git will report, to the server, commits reachable from all local refs to find common commits in an attempt to reduce the size of the to-be-received packfile. If specified, Git will only report commits reachable from the given tips.  This is useful to speed up fetches when the user knows which local ref is likely to have commits in common with the upstream ref being fetched."
-msgstr ""
-"É predefinido que o Git relatará ao servidor os commits acessíveis de todos "
-"as refs locais para que localize os commits comuns na tentativa de reduzir o "
-"tamanho do pacote que será recebido. Caso seja utilizado, o Git relatará "
-"apenas os commits acessíveis a partir das dicas informadas.  Útil para "
-"acelerar o processo \"fetch\" quando o usuário sabe qual a ref local que "
-"provavelmente, haverá commits em comum com uma ref upstream que está sendo "
-"capturada."
+msgstr "É predefinido que o Git relatará ao servidor os commits acessíveis de todos as refs locais para que localize os commits comuns na tentativa de reduzir o tamanho do pacote que será recebido. Caso seja utilizado, o Git relatará apenas os commits acessíveis a partir das dicas informadas.  Útil para acelerar o processo \"fetch\" quando o usuário sabe qual a ref local que provavelmente, haverá commits em comum com uma ref upstream que está sendo capturada."
 
 #. type: Plain text
 #: en/fetch-options.txt:56
 #, priority:220
 msgid "This option may be specified more than once; if so, Git will report commits reachable from any of the given commits."
-msgstr ""
-"Esta opção pode ser utilizada mais de uma vez; Se assim for, o Git irá "
-"reportar os commits de qualquer um dos commits informados."
+msgstr "Esta opção pode ser utilizada mais de uma vez; Se assim for, o Git irá reportar os commits de qualquer um dos commits informados."
 
 #. type: Plain text
 #: en/fetch-options.txt:60
@@ -5708,12 +5401,10 @@ msgstr "O argumento para esta opção pode ser um \"ref\" aos nomes de referênc
 #: en/fetch-options.txt:63
 #, priority:220
 msgid "See also the `fetch.negotiationAlgorithm` configuration variable documented in linkgit:git-config[1]."
-msgstr ""
-"Consulte também a variável de configuração `fetch.negotiationAlgorithm` "
-"documentada em linkgit:git-config[1]."
+msgstr "Consulte também a variável de configuração `fetch.negotiationAlgorithm` documentada em linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5816,9 +5507,7 @@ msgstr "--[no-]write-commit-graph"
 #: en/fetch-options.txt:96
 #, priority:220
 msgid "Write a commit-graph after fetching. This overrides the config setting `fetch.writeCommitGraph`."
-msgstr ""
-"Grave um grafo do commit após a captura remota. Este sobrescreve a "
-"configuração `fetch.writeCommitGraph`."
+msgstr "Grave um grafo do commit após a captura remota. Este sobrescreve a configuração `fetch.writeCommitGraph`."
 
 #. type: Labeled list
 #: en/fetch-options.txt:99 en/git-push.txt:153
@@ -5857,7 +5546,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr "Antes de capturar, remova as tags locais que não existam mais remotamente caso a opção `--prune` esteja ativa. Esta opção deve ser utilizada com mais cuidado, ao contrário da opção `--prune`, ela removerá todas as referências locais (tags locais) que forem criadas. Esta opção é um atalho para informar a tag explícita refspec junto com a opção `--prune`, consulte a discussão sobre isso em sua documentação."
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5884,15 +5573,7 @@ msgstr "--refmap=<refspec>"
 #: en/fetch-options.txt:146
 #, priority:220
 msgid "When fetching refs listed on the command line, use the specified refspec (can be given more than once) to map the refs to remote-tracking branches, instead of the values of `remote.*.fetch` configuration variables for the remote repository.  Providing an empty `<refspec>` to the `--refmap` option causes Git to ignore the configured refspecs and rely entirely on the refspecs supplied as command-line arguments. See section on \"Configured Remote-tracking Branches\" for details."
-msgstr ""
-"Ao capturar as refs listadas na linha de comando, utilize o \"refspec\" "
-"informado (pode ser utilizado mais de uma vez) para mapear os refs para as "
-"ramificações rastreadas remotamente em vez dos valores das variáveis da "
-"configuração `remote.*.fetch` para o repositório remoto.  Informe um "
-"`<refspec>` vazio à opção `--refmap` faz com que o Git ignore os \"refspecs\""
-" configurados e confie inteiramente nos \"refspecs\" informados como os "
-"argumentos da linha de comando. Para mais detalhes consulte a seção "
-"\"Configuração dos Ramos Monitorados Remotamente\"."
+msgstr "Ao capturar as refs listadas na linha de comando, utilize o \"refspec\" informado (pode ser utilizado mais de uma vez) para mapear os refs para as ramificações rastreadas remotamente em vez dos valores das variáveis da configuração `remote.*.fetch` para o repositório remoto.  Informe um `<refspec>` vazio à opção `--refmap` faz com que o Git ignore os \"refspecs\" configurados e confie inteiramente nos \"refspecs\" informados como os argumentos da linha de comando. Para mais detalhes consulte a seção \"Configuração dos Ramos Monitorados Remotamente\"."
 
 #. type: Labeled list
 #: en/fetch-options.txt:148 en/git-describe.txt:55 en/git-fsck.txt:41 en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186 en/git-show-ref.txt:41
@@ -5916,18 +5597,7 @@ msgstr "--recurse-submodules[=yes|on-demand|no]"
 #: en/fetch-options.txt:168
 #, priority:220
 msgid "This option controls if and under what conditions new commits of populated submodules should be fetched too. It can be used as a boolean option to completely disable recursion when set to 'no' or to unconditionally recurse into all populated submodules when set to 'yes', which is the default when this option is used without any value. Use 'on-demand' to only recurse into a populated submodule when the superproject retrieves a commit that updates the submodule's reference to a commit that isn't already in the local submodule clone. By default, 'on-demand' is used, unless `fetch.recurseSubmodules` is set (see linkgit:git-config[1])."
-msgstr ""
-"Essa opção controla se e sob quais condições os novos commits dos submódulos "
-"preenchidos também devem ser capturadas. Pode ser utilizado como uma opção "
-"booleana para desativar completamente a recursão quando definido como 'no' "
-"ou para recursar incondicionalmente em todos os sub-módulos preenchidos "
-"quando definido como 'sim', que é a predefinição quando esta opção é "
-"utilizada sem qualquer valor. Utilize 'on demand' para re-examinar apenas em "
-"um submódulo preenchido quando o superprojeto recuperar um commit que "
-"atualize a referência do submódulo para um commit que ainda não esteja no "
-"clone do submódulo local. É predefinido que 'on demand' seja utilizado, a "
-"menos que `fetch.recurseSubmodules` seja definido (consulte linkgit:git-"
-"config[1])."
+msgstr "Essa opção controla se e sob quais condições os novos commits dos submódulos preenchidos também devem ser capturadas. Pode ser utilizado como uma opção booleana para desativar completamente a recursão quando definido como 'no' ou para recursar incondicionalmente em todos os sub-módulos preenchidos quando definido como 'sim', que é a predefinição quando esta opção é utilizada sem qualquer valor. Utilize 'on demand' para re-examinar apenas em um submódulo preenchido quando o superprojeto recuperar um commit que atualize a referência do submódulo para um commit que ainda não esteja no clone do submódulo local. É predefinido que 'on demand' seja utilizado, a menos que `fetch.recurseSubmodules` seja definido (consulte linkgit:git-config[1])."
 
 #. type: Labeled list
 #: en/fetch-options.txt:170
@@ -5981,12 +5651,7 @@ msgstr "--set-upstream"
 #: en/fetch-options.txt:194
 #, priority:220
 msgid "If the remote is fetched successfully, pull and add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` and `branch.<name>.remote` in linkgit:git-config[1]."
-msgstr ""
-"Caso a captura remota seja bem sucedida, uma referência de rastreamento "
-"`pull` e `add` será adicionada ao \"upstream\", utilizado pelo argumento "
-"`less` linkgit:git-pull[1] e outros comandos. Para mais informações, "
-"consulte `branch.<nome>.merge` e `branch.<nome>.remote` em linkgit:git-"
-"config[1]."
+msgstr "Caso a captura remota seja bem sucedida, uma referência de rastreamento `pull` e `add` será adicionada ao \"upstream\", utilizado pelo argumento `less` linkgit:git-pull[1] e outros comandos. Para mais informações, consulte `branch.<nome>.merge` e `branch.<nome>.remote` em linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/fetch-options.txt:196
@@ -6034,13 +5699,10 @@ msgstr "--upload-pack <pacote-para-envio>"
 #: en/fetch-options.txt:224
 #, priority:220
 msgid "When given, and the repository to fetch from is handled by 'git fetch-pack', `--exec=<upload-pack>` is passed to the command to specify non-default path for the command run on the other end."
-msgstr ""
-"Quando o repositório é informado para capturar e que seja manipulado por "
-"'git fetch-pack', o `--exec=<upload-pack>` é passado para o comando utilizar "
-"um caminho alternativo para o comando executado na outra extremidade."
+msgstr "Quando o repositório é informado para capturar e que seja manipulado por 'git fetch-pack', o `--exec=<upload-pack>` é passado para o comando utilizar um caminho alternativo para o comando executado na outra extremidade."
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -6052,13 +5714,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr "Repasse a opção `--quiet` para o `git-fetch-pack` e silencie qualquer outro comando git utilizado internamente. O progresso não é relatado para o fluxo de erro predefinido."
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -6200,7 +5862,7 @@ msgstr ""
 "\t  [--] [<pathspec>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "DESCRIÇÃO"
@@ -6215,23 +5877,13 @@ msgstr "Este comando atualiza o índice utilizando o conteúdo atual encontrado
 #: en/git-add.txt:31
 #, priority:300
 msgid "The \"index\" holds a snapshot of the content of the working tree, and it is this snapshot that is taken as the contents of the next commit.  Thus after making any changes to the working tree, and before running the commit command, you must use the `add` command to add any new or modified files to the index."
-msgstr ""
-"O \"index\" (ou índice) contém um instantâneo do conteúdo da árvore de "
-"trabalho que é tomado como o conteúdo do próximo commit.  Portanto, depois "
-"de fazer alterações na árvore de trabalho e antes de executar o comando "
-"commit, você deve utilizar o comando `add` para adicionar qualquer aquivo "
-"novo ou que foi modificado ao índice."
+msgstr "O \"index\" (ou índice) contém um instantâneo do conteúdo da árvore de trabalho que é tomado como o conteúdo do próximo commit.  Portanto, depois de fazer alterações na árvore de trabalho e antes de executar o comando commit, você deve utilizar o comando `add` para adicionar qualquer aquivo novo ou que foi modificado ao índice."
 
 #. type: Plain text
 #: en/git-add.txt:36
 #, priority:300
 msgid "This command can be performed multiple times before a commit.  It only adds the content of the specified file(s) at the time the add command is run; if you want subsequent changes included in the next commit, then you must run `git add` again to add the new content to the index."
-msgstr ""
-"Este comando pode ser executado várias vezes antes de um commit.  Ele "
-"adiciona apenas o conteúdo do(s) arquivo(s) informados(s) no momento em que "
-"o comando `add` for executado; caso queira que as alterações subsequentes "
-"sejam incluídas no próximo commit, execute o comando `git add` novamente "
-"para adicionar o novo conteúdo ao índice."
+msgstr "Este comando pode ser executado várias vezes antes de um commit.  Ele adiciona apenas o conteúdo do(s) arquivo(s) informados(s) no momento em que o comando `add` for executado; caso queira que as alterações subsequentes sejam incluídas no próximo commit, execute o comando `git add` novamente para adicionar o novo conteúdo ao índice."
 
 #. type: Plain text
 #: en/git-add.txt:39
@@ -6252,7 +5904,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "Consulte linkgit:git-commit[1] para ver as formas alternativas de adicionar um conteúdo a um commit."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "OPÇÕES"
@@ -6267,19 +5919,7 @@ msgstr "<pathspec>..."
 #: en/git-add.txt:65
 #, priority:300
 msgid "Files to add content from.  Fileglobs (e.g. `*.c`) can be given to add all matching files.  Also a leading directory name (e.g. `dir` to add `dir/file1` and `dir/file2`) can be given to update the index to match the current state of the directory as a whole (e.g.  specifying `dir` will record not just a file `dir/file1` modified in the working tree, a file `dir/file2` added to the working tree, but also a file `dir/file3` removed from the working tree). Note that older versions of Git used to ignore removed files; use `--no-all` option if you want to add modified or new files but ignore removed ones."
-msgstr ""
-"Os arquivos que serão adicionados ao conteúdo.  Os agrupamentos dos arquivos "
-"(`*.c` por exemplo) podem ser utilizados para adicionar todos os arquivos "
-"coincidentes.  Também um nome do diretório principal (`dir` para adicionar `"
-"dir/arquivo1` e `dir/arquivo2` por exemplo) pode ser utilizados para "
-"atualizar o índice para coincidir a condição atual do diretório como um todo "
-"(definindo o `dir` gravará não apenas um arquivo `dir/arquivo1` modificado "
-"na árvore de trabalho, um arquivo `dir/arquivo2` adicionado à árvore de "
-"trabalho, mas também um arquivo `dir/arquivo3` que será removido da árvore "
-"de trabalho por exemplo). Observe que as versões mais antigas do Git "
-"costumavam ignorar os arquivos removidos; utilize a opção `--no-all` caso "
-"queira adicionar os arquivos novos ou alterados, porém ignore os que foram "
-"removidos."
+msgstr "Os arquivos que serão adicionados ao conteúdo.  Os agrupamentos dos arquivos (`*.c` por exemplo) podem ser utilizados para adicionar todos os arquivos coincidentes.  Também um nome do diretório principal (`dir` para adicionar `dir/arquivo1` e `dir/arquivo2` por exemplo) pode ser utilizados para atualizar o índice para coincidir a condição atual do diretório como um todo (definindo o `dir` gravará não apenas um arquivo `dir/arquivo1` modificado na árvore de trabalho, um arquivo `dir/arquivo2` adicionado à árvore de trabalho, mas também um arquivo `dir/arquivo3` que será removido da árvore de trabalho por exemplo). Observe que as versões mais antigas do Git costumavam ignorar os arquivos removidos; utilize a opção `--no-all` caso queira adicionar os arquivos novos ou alterados, porém ignore os que foram removidos."
 
 #. type: Plain text
 #: en/git-add.txt:68 en/git-grep.txt:334
@@ -6291,16 +5931,13 @@ msgstr "Para mais detalhes sobre a sintaxe `<pathspec>`, consulte a entrada 'pat
 #: en/git-add.txt:73
 #, priority:300
 msgid "Don't actually add the file(s), just show if they exist and/or will be ignored."
-msgstr ""
-"Na verdade, não adicione o(s) arquivo(s), apenas demonstre se eles existem e/"
-"ou serão ignorados."
+msgstr "Na verdade, não adicione o(s) arquivo(s), apenas demonstre se eles existem e/ou serão ignorados."
 
 #. type: Plain text
 #: en/git-add.txt:81
 #, priority:300
 msgid "Allow adding otherwise ignored files."
-msgstr ""
-"Permitir a inclusão dos arquivos que já foram ignorados por outros motivos."
+msgstr "Permitir a inclusão dos arquivos que já foram ignorados por outros motivos."
 
 #. type: Labeled list
 #: en/git-add.txt:82 en/git-am.txt:127 en/git-branch.txt:149 en/git-clean.txt:44 en/git-commit.txt:261 en/git-cvsimport.txt:88 en/git-grep.txt:113 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:49 en/git-rebase.txt:483 en/git-repack.txt:163 en/git-tag.txt:130 en/rev-list-options.txt:73
@@ -6372,11 +6009,7 @@ msgstr "Atualize o índice exatamente onde ele já possua uma entrada que coinci
 #: en/git-add.txt:122
 #, priority:300
 msgid "If no <pathspec> is given when `-u` option is used, all tracked files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
-msgstr ""
-"Caso nenhum `<pathspec>` seja informado durante o uso da opção `-u`, todos "
-"os arquivos monitorados na árvore de trabalho serão atualizados (as versões "
-"antigas do Git costumavam limitar a atualização ao diretório atual e seus "
-"subdiretórios)."
+msgstr "Caso nenhum `<pathspec>` seja informado durante o uso da opção `-u`, todos os arquivos monitorados na árvore de trabalho serão atualizados (as versões antigas do Git costumavam limitar a atualização ao diretório atual e seus subdiretórios)."
 
 #. type: Labeled list
 #: en/git-add.txt:123 en/git-repack.txt:49 en/git-svn.txt:418
@@ -6400,11 +6033,7 @@ msgstr "Atualize o índice não apenas onde a árvore de trabalho possa um arqui
 #: en/git-add.txt:135
 #, priority:300
 msgid "If no <pathspec> is given when `-A` option is used, all files in the entire working tree are updated (old versions of Git used to limit the update to the current directory and its subdirectories)."
-msgstr ""
-"Caso nenhum `<pathspec>` seja informado durante o uso da opção `-A`, todos "
-"os arquivos na árvore de trabalho serão atualizados (as versões antigas do "
-"Git costumavam limitar a atualização ao diretório atual e seus "
-"subdiretórios)."
+msgstr "Caso nenhum `<pathspec>` seja informado durante o uso da opção `-A`, todos os arquivos na árvore de trabalho serão atualizados (as versões antigas do Git costumavam limitar a atualização ao diretório atual e seus subdiretórios)."
 
 #. type: Labeled list
 #: en/git-add.txt:136
@@ -6470,12 +6099,7 @@ msgstr "--ignore-errors"
 #: en/git-add.txt:165
 #, priority:300
 msgid "If some files could not be added because of errors indexing them, do not abort the operation, but continue adding the others. The command shall still exit with non-zero status.  The configuration variable `add.ignoreErrors` can be set to true to make this the default behaviour."
-msgstr ""
-"Caso alguns arquivos não possam ser adicionados por motivos de erros durante "
-"a indexação, não interrompa a operação e continue a adicionar os outros que "
-"não tenham erros. O comando ainda deve sair com a condição diferente de "
-"zero.  Para que este comportamento esteja sempre ativado, a variável de "
-"configuração `add.ignoreErrors` pode ser definida como 'true'."
+msgstr "Caso alguns arquivos não possam ser adicionados por motivos de erros durante a indexação, não interrompa a operação e continue a adicionar os outros que não tenham erros. O comando ainda deve sair com a condição diferente de zero.  Para que este comportamento esteja sempre ativado, a variável de configuração `add.ignoreErrors` pode ser definida como 'true'."
 
 #. type: Labeled list
 #: en/git-add.txt:166 en/git-notes.txt:169 en/git-update-index.txt:73 en/rev-list-options.txt:201
@@ -6487,11 +6111,7 @@ msgstr "--ignore-missing"
 #: en/git-add.txt:171
 #, priority:300
 msgid "This option can only be used together with --dry-run. By using this option the user can check if any of the given files would be ignored, no matter if they are already present in the work tree or not."
-msgstr ""
-"Esta opção só pode ser utilizada em conjunto com a opção `--dry-run`. Ao "
-"utilizar esta opção, o usuário pode verificar se algum dos arquivos "
-"informados seriam ignorados, independentemente caso já estejam presentes na "
-"árvore de trabalho ou não."
+msgstr "Esta opção só pode ser utilizada em conjunto com a opção `--dry-run`. Ao utilizar esta opção, o usuário pode verificar se algum dos arquivos informados seriam ignorados, independentemente caso já estejam presentes na árvore de trabalho ou não."
 
 #. type: Labeled list
 #: en/git-add.txt:172
@@ -6539,14 +6159,7 @@ msgstr "--pathspec-from-file=<arquivo>"
 #: en/git-add.txt:198 en/git-checkout.txt:318 en/git-commit.txt:289 en/git-reset.txt:119 en/git-restore.txt:132 en/git-rm.txt:85 en/git-stash.txt:207
 #, priority:300
 msgid "Pathspec is passed in `<file>` instead of commandline args. If `<file>` is exactly `-` then standard input is used. Pathspec elements are separated by LF or CR/LF. Pathspec elements can be quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). See also `--pathspec-file-nul` and global `--literal-pathspecs`."
-msgstr ""
-"O \"pathspec\" é passado com `<arquivo>` em vez dos argumentos da linha de "
-"comando. Caso o `<arquivo>` seja exatamente `-`, a entrada padrão será "
-"utilizada. Os elementos do \"pathspec\" são separados por caracteres de "
-"término de linha `LF` ou `CR/LF`. Os elementos do \"pathspec\" podem ser "
-"citados conforme explicado na variável de configuração `core.quotePath` ("
-"consulte linkgit:git-config[1]). Consulte também opção `--pathspec-file-nul` "
-"e o global `--literal-pathspecs`."
+msgstr "O \"pathspec\" é passado com `<arquivo>` em vez dos argumentos da linha de comando. Caso o `<arquivo>` seja exatamente `-`, a entrada padrão será utilizada. Os elementos do \"pathspec\" são separados por caracteres de término de linha `LF` ou `CR/LF`. Os elementos do \"pathspec\" podem ser citados conforme explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1]). Consulte também opção `--pathspec-file-nul` e o global `--literal-pathspecs`."
 
 #. type: Labeled list
 #: en/git-add.txt:199 en/git-checkout.txt:319 en/git-commit.txt:290 en/git-reset.txt:120 en/git-restore.txt:133 en/git-rm.txt:86 en/git-stash.txt:208
@@ -6573,7 +6186,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "Esta opção pode ser utilizada para separar as opções da linha de comandos da lista dos arquivos (útil quando os nomes do arquivo puderem ser confundidos com as opções da linha de comando)."
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "EXEMPLOS"
@@ -6642,8 +6255,7 @@ msgid ""
 "    What now> 1\n"
 msgstr ""
 "    *** Comandos ***\n"
-"      1: status       2: atualiza       3: reverte       4: adiciona sem "
-"monitoramento\n"
+"      1: status       2: atualiza       3: reverte       4: adiciona sem monitoramento\n"
 "      5: patch        6: diff           7: encerra       8: ajuda\n"
 "    Agora o quê> 1\n"
 
@@ -6693,7 +6305,7 @@ msgstr "Demonstra que foo.png tem diferenças em relação ao `HEAD` (mas por se
 #: en/git-add.txt:281 en/git-update-ref.txt:102
 #, ignore-same, no-wrap, priority:300
 msgid "update"
-msgstr "atualiza"
+msgstr "update"
 
 #. type: Plain text
 #: en/git-add.txt:290
@@ -6796,8 +6408,7 @@ msgstr ""
 "n - não prepare este pedaço\n"
 "q - saia; não prepare este pedaço ou qualquer um dos restantes\n"
 "a - prepare este pedaço e todos os pedaços posteriores no arquivo\n"
-"d - não prepare este pedaço ou qualquer um dos pedaços posteriores no "
-"arquivo\n"
+"d - não prepare este pedaço ou qualquer um dos pedaços posteriores no arquivo\n"
 "g - selecione um pedaço para ir de encontro com\n"
 "/ - procure um pedaço correspondente ao regex especificado\n"
 "j - não decida sobre este pedaço, veja o próximo pedaço indeciso\n"
@@ -6812,17 +6423,13 @@ msgstr ""
 #: en/git-add.txt:346
 #, priority:300
 msgid "After deciding the fate for all hunks, if there is any hunk that was chosen, the index is updated with the selected hunks."
-msgstr ""
-"Depois de decidir o destino de todos os pedaços, caso haja algum pedaço "
-"selecionado, o índice é atualizado com os pedaços que foram selecionados."
+msgstr "Depois de decidir o destino de todos os pedaços, caso haja algum pedaço selecionado, o índice é atualizado com os pedaços que foram selecionados."
 
 #. type: Plain text
 #: en/git-add.txt:349
 #, priority:300
 msgid "You can omit having to type return here, by setting the configuration variable `interactive.singleKey` to `true`."
-msgstr ""
-"Não é necessário pressionar o enter, ao configurar a variável de "
-"configuração `interactive.singleKey` para `true`."
+msgstr "Não é necessário pressionar o enter, ao configurar a variável de configuração `interactive.singleKey` para `true`."
 
 #. type: Labeled list
 #: en/git-add.txt:350
@@ -6882,12 +6489,7 @@ msgstr "conteúdo que foi alterado"
 #: en/git-add.txt:386
 #, priority:300
 msgid "Modified content is represented by \"-\" lines (removing the old content)  followed by \"{plus}\" lines (adding the replacement content). You can prevent staging the modification by converting \"-\" lines to \" \", and removing \"{plus}\" lines. Beware that modifying only half of the pair is likely to introduce confusing changes to the index."
-msgstr ""
-"O conteúdo modificado é representado por linhas \"-\" (removendo o conteúdo "
-"antigo)  seguido por linhas \"{plus}\" (adicionando o conteúdo de reposição)"
-". Você pode impedir a preparação da modificação convertendo as linhas \"-\" "
-"para \" \" e removendo as linhas \"{plus}\". Lembre-se que alterar apenas a "
-"metade do par provavelmente introduzirá mudanças confusas ao índice."
+msgstr "O conteúdo modificado é representado por linhas \"-\" (removendo o conteúdo antigo)  seguido por linhas \"{plus}\" (adicionando o conteúdo de reposição). Você pode impedir a preparação da modificação convertendo as linhas \"-\" para \" \" e removendo as linhas \"{plus}\". Lembre-se que alterar apenas a metade do par provavelmente introduzirá mudanças confusas ao índice."
 
 #. type: Plain text
 #: en/git-add.txt:394
@@ -6962,7 +6564,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "modificando o conteúdo do contexto ou as linhas de remoção"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "VEJA TAMBÉM"
@@ -6974,13 +6576,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Parte do conjunto linkgit:git[1]"
@@ -7035,10 +6637,7 @@ msgstr "(<mbox>|<Maildir>)..."
 #: en/git-am.txt:33
 #, priority:100
 msgid "The list of mailbox files to read patches from. If you do not supply this argument, the command reads from the standard input.  If you supply directories, they will be treated as Maildirs."
-msgstr ""
-"A lista dos arquivos da caixa de correio para leitura dos patches. Caso você "
-"não utilize este argumento, o comando lê na entrada padrão.  Caso utilize os "
-"diretórios, eles serão tratados como caixas de correio."
+msgstr "A lista dos arquivos da caixa de correio para leitura dos patches. Caso você não utilize este argumento, o comando lê na entrada padrão.  Caso utilize os diretórios, eles serão tratados como caixas de correio."
 
 #. type: Labeled list
 #: en/git-am.txt:35 en/git-cherry-pick.txt:106 en/git-commit.txt:167 en/git-format-patch.txt:121 en/git-rebase.txt:476 en/git-revert.txt:101 en/merge-options.txt:80
@@ -7080,12 +6679,7 @@ msgstr "--[no-]keep-cr"
 #: en/git-am.txt:52
 #, priority:100
 msgid "With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1])  with the same option, to prevent it from stripping CR at the end of lines. `am.keepcr` configuration variable can be used to specify the default behaviour.  `--no-keep-cr` is useful to override `am.keepcr`."
-msgstr ""
-"Com `--keep-cr`, chame o comando 'git mailsplit' (consulte linkgit:git-"
-"mailsplit[1]) com a mesma opção para evitar que ele retire caractere `CR` do "
-"final das linhas. A variável de configuração `am.keepcr` pode ser utilizada "
-"para definir o comportamento predefinido.  O comando `--no-keep-cr` é útil "
-"para substituir a variável `am.keepcr`."
+msgstr "Com `--keep-cr`, chame o comando 'git mailsplit' (consulte linkgit:git-mailsplit[1]) com a mesma opção para evitar que ele retire caractere `CR` do final das linhas. A variável de configuração `am.keepcr` pode ser utilizada para definir o comportamento predefinido.  O comando `--no-keep-cr` é útil para substituir a variável `am.keepcr`."
 
 #. type: Labeled list
 #: en/git-am.txt:53 en/git-blame.txt:53 en/git-branch.txt:132 en/git-cvsexportcommit.txt:37 en/git-diff-files.txt:37 en/git-diff-tree.txt:88 en/git-grep.txt:219 en/git-help.txt:54 en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42 en/rev-list-options.txt:1130
@@ -7103,10 +6697,7 @@ msgstr "--scissors"
 #: en/git-am.txt:58
 #, priority:100
 msgid "Remove everything in body before a scissors line (see linkgit:git-mailinfo[1]). Can be activated by default using the `mailinfo.scissors` configuration variable."
-msgstr ""
-"Remova tudo no corpo antes de uma linha \"scissors\" (tesouras) (see linkgit"
-":git-mailinfo[1]). Pode ser ativada de fora predefinida ao utilizar a "
-"variável de configuração `mailinfo.scissors`."
+msgstr "Remova tudo no corpo antes de uma linha \"scissors\" (tesouras) (see linkgit:git-mailinfo[1]). Pode ser ativada de fora predefinida ao utilizar a variável de configuração `mailinfo.scissors`."
 
 #. type: Labeled list
 #: en/git-am.txt:59 en/git-mailinfo.txt:90
@@ -7136,11 +6727,7 @@ msgstr "--message-id"
 #: en/git-am.txt:68
 #, priority:100
 msgid "Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]), so that the Message-ID header is added to the commit message.  The `am.messageid` configuration variable can be used to specify the default behaviour."
-msgstr ""
-"Encaminha a opção `-m` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1]), para que o ID do cabeçalho seja adicionado na mensagem do "
-"commit.  A variável de configuração `am.messageid` pode ser utilizada para "
-"definir o comportamento predefinido."
+msgstr "Encaminha a opção `-m` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1]), para que o ID do cabeçalho seja adicionado na mensagem do commit.  A variável de configuração `am.messageid` pode ser utilizada para definir o comportamento predefinido."
 
 #. type: Labeled list
 #: en/git-am.txt:69
@@ -7170,12 +6757,7 @@ msgstr "--utf8"
 #: en/git-am.txt:84
 #, priority:100
 msgid "Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).  The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable `i18n.commitencoding` can be used to specify project's preferred encoding if it is not UTF-8)."
-msgstr ""
-"Repasse o comando `-u` para o comando 'git mailinfo' (consulte linkgit:git-"
-"mailinfo[1]).  A mensagem do registro log do proposto commit retirado da "
-"mensagem do e-mail é re-codificada com a codificação `UTF-8` (a variável de "
-"configuração `i18n.commitencoding` pode ser utilizada para definir a "
-"codificação preferida do projeto, caso não seja `UTF-8`)."
+msgstr "Repasse o comando `-u` para o comando 'git mailinfo' (consulte linkgit:git-mailinfo[1]).  A mensagem do registro log do proposto commit retirado da mensagem do e-mail é re-codificada com a codificação `UTF-8` (a variável de configuração `i18n.commitencoding` pode ser utilizada para definir a codificação preferida do projeto, caso não seja `UTF-8`)."
 
 #. type: Plain text
 #: en/git-am.txt:87
@@ -7239,9 +6821,7 @@ msgstr "--no-rerere-autoupdate"
 #: en/git-am.txt:106 en/git-cherry-pick.txt:163 en/git-merge.txt:89 en/git-rebase.txt:386 en/git-revert.txt:119
 #, priority:240
 msgid "Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible."
-msgstr ""
-"Permita que o mecanismo \"rerere\" atualize o índice com o resultado da "
-"resolução automática de conflitos, caso seja possível."
+msgstr "Permita que o mecanismo \"rerere\" atualize o índice com o resultado da resolução automática de conflitos, caso seja possível."
 
 #. type: Plain text
 #: en/git-am.txt:108 en/git-apply.txt:183 en/git-rebase.txt:461 en/git-rebase.txt:613
@@ -7307,11 +6887,7 @@ msgstr "--patch-format"
 #: en/git-am.txt:126
 #, priority:100
 msgid "By default the command will try to detect the patch format automatically. This option allows the user to bypass the automatic detection and specify the patch format that the patch(es) should be interpreted as. Valid formats are mbox, mboxrd, stgit, stgit-series and hg."
-msgstr ""
-"É predefinido que o comando tentará detectar o formato do patch "
-"automaticamente. Esta opção permite que o usuário ignore a detecção "
-"automática e determine como o formato do patch deve ser interpretados. Os "
-"formatos válidos são `mbox`, `mboxrd`, `stgit`, `stgit-series` e `hg`."
+msgstr "É predefinido que o comando tentará detectar o formato do patch automaticamente. Esta opção permite que o usuário ignore a detecção automática e determine como o formato do patch deve ser interpretados. Os formatos válidos são `mbox`, `mboxrd`, `stgit`, `stgit-series` e `hg`."
 
 #. type: Plain text
 #: en/git-am.txt:130
@@ -7377,12 +6953,7 @@ msgstr "--no-gpg-sign"
 #: en/git-am.txt:157 en/git-cherry-pick.txt:118 en/git-commit.txt:357 en/git-rebase.txt:395 en/git-revert.txt:99
 #, priority:280
 msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Commits assinados com o GPG O argumento `keyid` é opcional e a predefinição "
-"retorna para a identidade de quem fez o commit; caso seja utilizado, deve "
-"estar anexado a opção e sem espaço. A opção `--no-gpg-sign` é útil para "
-"revogar a variável de configuração `commit.gpgSign` e a anterior `--gpg-"
-"sign`."
+msgstr "Commits assinados com o GPG O argumento `keyid` é opcional e a predefinição retorna para a identidade de quem fez o commit; caso seja utilizado, deve estar anexado a opção e sem espaço. A opção `--no-gpg-sign` é útil para revogar a variável de configuração `commit.gpgSign` e a anterior `--gpg-sign`."
 
 #. type: Labeled list
 #: en/git-am.txt:158 en/git-merge.txt:116 en/git-rebase.txt:246 en/sequencer.txt:1
@@ -7454,11 +7025,7 @@ msgstr "--show-current-patch[=(diff|raw)]"
 #: en/git-am.txt:187
 #, priority:100
 msgid "Show the message at which `git am` has stopped due to conflicts.  If `raw` is specified, show the raw contents of the e-mail message; if `diff`, show the diff portion only.  Defaults to `raw`."
-msgstr ""
-"Exiba uma mensagem onde o `git am` tenha parado por causa dos conflitos.  "
-"Caso `raw` seja utilizado, exiba o conteúdo bruto da mensagem do e-mail; no "
-"caso do `diff`, exiba apenas a porção relacionada ao diff.  A predefinição "
-"retorna para \"raw\" (bruto/puro)."
+msgstr "Exiba uma mensagem onde o `git am` tenha parado por causa dos conflitos.  Caso `raw` seja utilizado, exiba o conteúdo bruto da mensagem do e-mail; no caso do `diff`, exiba apenas a porção relacionada ao diff.  A predefinição retorna para \"raw\" (bruto/puro)."
 
 #. type: Title -
 #: en/git-am.txt:189 en/git-commit.txt:501 en/git-format-patch.txt:386 en/git-fsck.txt:113 en/git-log.txt:180 en/git-merge-base.txt:76 en/git-notes.txt:218 en/git-remote.txt:200 en/git-rerere.txt:77 en/git-reset.txt:378 en/git-show.txt:81 en/git-stash.txt:245 en/git-tag.txt:231
@@ -7482,10 +7049,7 @@ msgstr "As linhas que iniciam com \"From:\" (De:), \"Date:\" (Data) e \"Subject:
 #: en/git-am.txt:205
 #, priority:100
 msgid "The commit message is formed by the title taken from the \"Subject: \", a blank line and the body of the message up to where the patch begins.  Excess whitespace at the end of each line is automatically stripped."
-msgstr ""
-"A mensagem do commit é formada pelo título obtido do \"Subject:\" (Assunto:)"
-", uma linha em branco e do corpo da mensagem até o início do patch.  O "
-"espaço em excesso no final de cada linha é removido automaticamente."
+msgstr "A mensagem do commit é formada pelo título obtido do \"Subject:\" (Assunto:), uma linha em branco e do corpo da mensagem até o início do patch.  O espaço em excesso no final de cada linha é removido automaticamente."
 
 #. type: Plain text
 #: en/git-am.txt:208
@@ -7587,9 +7151,7 @@ msgstr "'git annotate' [<opções>] <arquivo> [<revisão>]\n"
 #: en/git-annotate.txt:17
 #, priority:100
 msgid "Annotates each line in the given file with information from the commit which introduced the line. Optionally annotates from a given revision."
-msgstr ""
-"Anota cada linha no arquivo informado com as informações do commit que "
-"introduziu a linha. Anota opcionalmente em uma determinada revisão."
+msgstr "Anota cada linha no arquivo informado com as informações do commit que introduziu a linha. Anota opcionalmente em uma determinada revisão."
 
 #. type: Plain text
 #: en/git-annotate.txt:22
@@ -7653,9 +7215,7 @@ msgstr "<patch>..."
 #: en/git-apply.txt:40
 #, priority:100
 msgid "The files to read the patch from.  '-' can be used to read from the standard input."
-msgstr ""
-"Os arquivos que serão lidos do patch.  '-' pode ser utilizado para ler a "
-"entrada padrão."
+msgstr "Os arquivos que serão lidos do patch.  '-' pode ser utilizado para ler a entrada padrão."
 
 #. type: Labeled list
 #: en/git-apply.txt:41 en/git-rebase.txt:404 en/merge-options.txt:91
@@ -7721,13 +7281,7 @@ msgstr "Ao aplicar o patch apenas na árvore de trabalho, marque os novos arquiv
 #: en/git-apply.txt:93
 #, priority:100
 msgid "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to, and we have those blobs available locally, possibly leaving the conflict markers in the files in the working tree for the user to resolve.  This option implies the `--index` option, and is incompatible with the `--reject` and the `--cached` options."
-msgstr ""
-"Quando o patch não for aplicado corretamente, volte a mesclagem bidirecional "
-"caso o patch registre a identidade das bolhas aos quais ele deve se aplicar "
-"e tivermos estas bolhas disponíveis localmente, possivelmente deixando os "
-"marcadores de conflito nos arquivos da árvore de trabalho para que o usuário "
-"possa resolver.  Implica no uso da opção `--index` sendo incompatível com as "
-"opções `--reject` e `--cached`."
+msgstr "Quando o patch não for aplicado corretamente, volte a mesclagem bidirecional caso o patch registre a identidade das bolhas aos quais ele deve se aplicar e tivermos estas bolhas disponíveis localmente, possivelmente deixando os marcadores de conflito nos arquivos da árvore de trabalho para que o usuário possa resolver.  Implica no uso da opção `--index` sendo incompatível com as opções `--reject` e `--cached`."
 
 #. type: Labeled list
 #: en/git-apply.txt:94
@@ -7739,12 +7293,7 @@ msgstr "--build-fake-ancestor=<arquivo>"
 #: en/git-apply.txt:100
 #, priority:100
 msgid "Newer 'git diff' output has embedded 'index information' for each blob to help identify the original version that the patch applies to.  When this flag is given, and if the original versions of the blobs are available locally, builds a temporary index containing those blobs."
-msgstr ""
-"O 'git diff' mais recentemente gerado incorporou 'as informações do índice' "
-"para cada bolha para ajudar a identificar qual foi a versão original à qual "
-"o patch se aplica.  Quando esta opção for utilizada e caso as versões "
-"originais das bolhas estejam disponíveis localmente, crie um índice "
-"temporário contendo essas bolhas."
+msgstr "O 'git diff' mais recentemente gerado incorporou 'as informações do índice' para cada bolha para ajudar a identificar qual foi a versão original à qual o patch se aplica.  Quando esta opção for utilizada e caso as versões originais das bolhas estejam disponíveis localmente, crie um índice temporário contendo essas bolhas."
 
 #. type: Plain text
 #: en/git-apply.txt:103
@@ -7807,7 +7356,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr "Observe que pelas razões expostas acima, a utilização de patches sem contexto é desencorajado."
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7840,11 +7389,7 @@ msgstr "--allow-binary-replacement"
 #: en/git-apply.txt:165
 #, priority:100
 msgid "Historically we did not allow binary patch applied without an explicit permission from the user, and this flag was the way to do so.  Currently we always allow binary patch application, so this is a no-op."
-msgstr ""
-"Historicamente, não permitimos que um patch binário seja aplicado sem uma "
-"permissão explícita do usuário, esta opção era o caminho para fazê-lo.  "
-"Atualmente, nós sempre permitimos que os patches binários sejam aplicados, "
-"então isso não é operacional."
+msgstr "Historicamente, não permitimos que um patch binário seja aplicado sem uma permissão explícita do usuário, esta opção era o caminho para fazê-lo.  Atualmente, nós sempre permitimos que os patches binários sejam aplicados, então isso não é operacional."
 
 #. type: Labeled list
 #: en/git-apply.txt:166
@@ -7856,10 +7401,7 @@ msgstr "--exclude=<path-pattern>"
 #: en/git-apply.txt:170
 #, priority:100
 msgid "Don't apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to exclude certain files or directories."
-msgstr ""
-"Não aplique as alterações nos arquivos que coincidam com o padrão do caminho "
-"informado. Pode ser útil ao importar os conjuntos dos patches onde você "
-"queira que determinados arquivos ou diretórios sejam excluídos."
+msgstr "Não aplique as alterações nos arquivos que coincidam com o padrão do caminho informado. Pode ser útil ao importar os conjuntos dos patches onde você queira que determinados arquivos ou diretórios sejam excluídos."
 
 #. type: Labeled list
 #: en/git-apply.txt:171
@@ -7871,10 +7413,7 @@ msgstr "--include=<path-pattern>"
 #: en/git-apply.txt:175
 #, priority:100
 msgid "Apply changes to files matching the given path pattern. This can be useful when importing patchsets, where you want to include certain files or directories."
-msgstr ""
-"Aplique as alterações nos arquivos que coincidam com padrão do caminho "
-"informado. Pode ser útil ao importar os conjuntos dos patches, onde você "
-"queira incluir certos arquivos ou diretórios."
+msgstr "Aplique as alterações nos arquivos que coincidam com padrão do caminho informado. Pode ser útil ao importar os conjuntos dos patches, onde você queira incluir certos arquivos ou diretórios."
 
 #. type: Plain text
 #: en/git-apply.txt:181
@@ -7886,11 +7425,7 @@ msgstr "Quando os padrões `--exclude` e `--include` são utilizados, eles são
 #: en/git-apply.txt:189
 #, priority:100
 msgid "When applying a patch, ignore changes in whitespace in context lines if necessary.  Context lines will preserve their whitespace, and they will not undergo whitespace fixing regardless of the value of the `--whitespace` option. New lines will still be fixed, though."
-msgstr ""
-"Ao aplicar um patch, ignore as alterações no espaço das linhas do contexto, "
-"se necessário.  As linhas do contexto preservam os seus espaços e não serão "
-"corrigidas, independentemente do valor da opção `--whitespace`. No entanto, "
-"as novas linhas ainda serão corrigidas."
+msgstr "Ao aplicar um patch, ignore as alterações no espaço das linhas do contexto, se necessário.  As linhas do contexto preservam os seus espaços e não serão corrigidas, independentemente do valor da opção `--whitespace`. No entanto, as novas linhas ainda serão corrigidas."
 
 #. type: Labeled list
 #: en/git-apply.txt:190
@@ -7902,30 +7437,19 @@ msgstr "--whitespace=<ação>"
 #: en/git-apply.txt:198
 #, priority:100
 msgid "When applying a patch, detect a new or modified line that has whitespace errors.  What are considered whitespace errors is controlled by `core.whitespace` configuration.  By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors."
-msgstr ""
-"Ao aplicar um patch, detecte se há erros de espaço em uma nova linha ou em "
-"uma linha que foi modificada.  A configuração `core.whitespace` define o que "
-"são considerados erros de espaço.  É predefinido que os espaços à direita ("
-"incluindo as linhas que consistam apenas nos espaços) e um caractere de "
-"espaço que seja imediatamente seguido por um caractere de tabulação dentro "
-"do recuo inicial da linha, são considerados erros do espaço."
+msgstr "Ao aplicar um patch, detecte se há erros de espaço em uma nova linha ou em uma linha que foi modificada.  A configuração `core.whitespace` define o que são considerados erros de espaço.  É predefinido que os espaços à direita (incluindo as linhas que consistam apenas nos espaços) e um caractere de espaço que seja imediatamente seguido por um caractere de tabulação dentro do recuo inicial da linha, são considerados erros do espaço."
 
 #. type: Plain text
 #: en/git-apply.txt:202
 #, priority:100
 msgid "By default, the command outputs warning messages but applies the patch.  When `git-apply` is used for statistics and not applying a patch, it defaults to `nowarn`."
-msgstr ""
-"É predefinido que o comando gere mensagens de aviso, mas continue a aplicar "
-"o patch.  Quando o comando `git-apply` é utilizado para gerar as "
-"estatísticas e não para aplicar um patch, a predefinição retorna ao valor "
-"`nowarn`."
+msgstr "É predefinido que o comando gere mensagens de aviso, mas continue a aplicar o patch.  Quando o comando `git-apply` é utilizado para gerar as estatísticas e não para aplicar um patch, a predefinição retorna ao valor `nowarn`."
 
 #. type: Plain text
 #: en/git-apply.txt:205
 #, priority:100
 msgid "You can use different `<action>` values to control this behavior:"
-msgstr ""
-"Você pode utilizar valores diferentes valores de controle para `<ação>`:"
+msgstr "Você pode utilizar valores diferentes valores de controle para `<ação>`:"
 
 #. type: Plain text
 #: en/git-apply.txt:207
@@ -7943,11 +7467,7 @@ msgstr "`warn` envia avisos para alguns desses erros, mas aplica o patch como es
 #: en/git-apply.txt:213
 #, priority:100
 msgid "`fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the fix involved 'stripping' them, but modern Gits do more)."
-msgstr ""
-"`fix` gera os avisos para alguns destes erros e aplica o patch depois de "
-"corrigí-los (o `strip` é um sinônimo --- a ferramenta costumava considerar "
-"apenas os caracteres de espaço como erros e a correção envolvia em 'removê-"
-"los', porém os Gits mais modernos fazem mais que isso)."
+msgstr "`fix` gera os avisos para alguns destes erros e aplica o patch depois de corrigí-los (o `strip` é um sinônimo --- a ferramenta costumava considerar apenas os caracteres de espaço como erros e a correção envolvia em 'removê-los', porém os Gits mais modernos fazem mais que isso)."
 
 #. type: Plain text
 #: en/git-apply.txt:215
@@ -8019,11 +7539,7 @@ msgstr "--unsafe-paths"
 #: en/git-apply.txt:248
 #, priority:100
 msgid "By default, a patch that affects outside the working area (either a Git controlled working tree, or the current working directory when \"git apply\" is used as a replacement of GNU patch) is rejected as a mistake (or a mischief)."
-msgstr ""
-"É predefinido que um patch que tenha efeito fora da área de trabalho (uma "
-"árvore de trabalho controlada pelo Git ou um diretório de trabalho atual "
-"quando o \"git apply\" é utilizado como uma reposição do patch GNU) seja "
-"rejeitado como um erro (ou um dano)."
+msgstr "É predefinido que um patch que tenha efeito fora da área de trabalho (uma árvore de trabalho controlada pelo Git ou um diretório de trabalho atual quando o \"git apply\" é utilizado como uma reposição do patch GNU) seja rejeitado como um erro (ou um dano)."
 
 #. type: Plain text
 #: en/git-apply.txt:252
@@ -8047,10 +7563,7 @@ msgstr "apply.ignoreWhitespace"
 #: en/git-apply.txt:260
 #, priority:100
 msgid "Set to 'change' if you want changes in whitespace to be ignored by default.  Set to one of: no, none, never, false if you want changes in whitespace to be significant."
-msgstr ""
-"Defina como 'change' caso queira que as alterações no espaço sejam sempre "
-"ignoradas.  Defina com um dos valores entre: `no`, `none`, `never`, `false` "
-"caso queira que as alterações no espaço sejam feitas de forma significativa."
+msgstr "Defina como 'change' caso queira que as alterações no espaço sejam sempre ignoradas.  Defina com um dos valores entre: `no`, `none`, `never`, `false` caso queira que as alterações no espaço sejam feitas de forma significativa."
 
 #. type: Labeled list
 #: en/git-apply.txt:260
@@ -8080,12 +7593,7 @@ msgstr "Caso um patch contenha alguma alteração nos submódulos, o comando 'gi
 #: en/git-apply.txt:274
 #, priority:100
 msgid "If `--index` is specified (explicitly or implicitly), then the submodule commits must match the index exactly for the patch to apply.  If any of the submodules are checked-out, then these check-outs are completely ignored, i.e., they are not required to be up to date or clean and they are not updated."
-msgstr ""
-"Caso `--index` seja utilizado (explícita ou implicitamente), o commit do "
-"submódulo deverá coincidir de forma exata ao índice para que o patch possa "
-"ser aplicado.  Não serão atualizados qualquer um dos submódulos que tenha "
-"uma averiguação, estes check-outs serão completamente ignorados, ou seja, "
-"eles não precisam estar atualizados ou limpos."
+msgstr "Caso `--index` seja utilizado (explícita ou implicitamente), o commit do submódulo deverá coincidir de forma exata ao índice para que o patch possa ser aplicado.  Não serão atualizados qualquer um dos submódulos que tenha uma averiguação, estes check-outs serão completamente ignorados, ou seja, eles não precisam estar atualizados ou limpos."
 
 #. type: Plain text
 #: en/git-apply.txt:278
@@ -8125,13 +7633,7 @@ msgstr ""
 #: en/git-archimport.txt:23
 #, priority:100
 msgid "Imports a project from one or more GNU Arch repositories.  It will follow branches and repositories within the namespaces defined by the <archive/branch> parameters supplied. If it cannot find the remote branch a merge comes from it will just import it as a regular commit. If it can find it, it will mark it as a merge whenever possible (see discussion below)."
-msgstr ""
-"Importa um projeto de um ou mais repositórios do GNU Arch.  Ele seguirá as "
-"ramificações e repositórios dentro dos espaço de nomes definidos através do "
-"parâmetro <arquivo/ramo> informado. Caso ele não consiga encontrar o ramo "
-"remoto, a mesclagem será importada apenas como um commit normal. Caso possa "
-"localizá-lo, será marcado como uma mesclagem sempre que for possível ("
-"consulte a discussão abaixo)."
+msgstr "Importa um projeto de um ou mais repositórios do GNU Arch.  Ele seguirá as ramificações e repositórios dentro dos espaço de nomes definidos através do parâmetro <arquivo/ramo> informado. Caso ele não consiga encontrar o ramo remoto, a mesclagem será importada apenas como um commit normal. Caso possa localizá-lo, será marcado como uma mesclagem sempre que for possível (consulte a discussão abaixo)."
 
 #. type: Plain text
 #: en/git-archimport.txt:27
@@ -8301,10 +7803,7 @@ msgstr ""
 #: en/git-archive.txt:23
 #, priority:100
 msgid "Creates an archive of the specified format containing the tree structure for the named tree, and writes it out to the standard output.  If <prefix> is specified it is prepended to the filenames in the archive."
-msgstr ""
-"Cria um arquivo no formato informado que contenha uma estrutura de "
-"determinada árvore e grava na saída padrão.  Caso o `<prefixo>` seja "
-"utilizado, ele será anexado aos nomes dos arquivos no arquivo."
+msgstr "Cria um arquivo no formato informado que contenha uma estrutura de determinada árvore e grava na saída padrão.  Caso o `<prefixo>` seja utilizado, ele será anexado aos nomes dos arquivos no arquivo."
 
 #. type: Plain text
 #: en/git-archive.txt:32
@@ -8388,9 +7887,7 @@ msgstr "<extra>"
 #: en/git-archive.txt:65
 #, priority:100
 msgid "This can be any options that the archiver backend understands.  See next section."
-msgstr ""
-"Pode ser qualquer opção que seja compatível com a estrutura do arquivador.  "
-"Consulte a próxima seção."
+msgstr "Pode ser qualquer opção que seja compatível com a estrutura do arquivador.  Consulte a próxima seção."
 
 #. type: Labeled list
 #: en/git-archive.txt:66
@@ -8438,10 +7935,7 @@ msgstr "<caminho>"
 #: en/git-archive.txt:84
 #, priority:100
 msgid "Without an optional path parameter, all files and subdirectories of the current working directory are included in the archive.  If one or more paths are specified, only these are included."
-msgstr ""
-"Sem um parâmetro opcional do caminho, todos os arquivos e os subdiretórios "
-"do diretório de trabalho atual serão incluídos no arquivo.  Caso um ou mais "
-"caminhos sejam informados, apenas estes, serão incluídos."
+msgstr "Sem um parâmetro opcional do caminho, todos os arquivos e os subdiretórios do diretório de trabalho atual serão incluídos no arquivo.  Caso um ou mais caminhos sejam informados, apenas estes, serão incluídos."
 
 #. type: Title -
 #: en/git-archive.txt:86
@@ -8456,7 +7950,7 @@ msgid "zip"
 msgstr "zip"
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -8501,13 +7995,7 @@ msgstr "tar.<formato>.comando"
 #: en/git-archive.txt:117
 #, priority:100
 msgid "This variable specifies a shell command through which the tar output generated by `git archive` should be piped. The command is executed using the shell with the generated tar file on its standard input, and should produce the final output on its standard output. Any compression-level options will be passed to the command (e.g., \"-9\"). An output file with the same extension as `<format>` will be use this format if no other format is given."
-msgstr ""
-"Esta variável define um comando shell por onde o tar será gerado pelo `git "
-"archive` através de um \"pipe\". O comando é executado utilizando o shell "
-"com o arquivo tar gerado na sua entrada padrão e deve produzir a saída final "
-"na sua saída padrão. Quaisquer opções do nível de compressão serão passadas "
-"ao comando (\"-9\" por exemplo). Um arquivo gerado com a mesma extensão que "
-"`<formato>`, este será utilizado caso nenhum outro seja informado."
+msgstr "Esta variável define um comando shell por onde o tar será gerado pelo `git archive` através de um \"pipe\". O comando é executado utilizando o shell com o arquivo tar gerado na sua entrada padrão e deve produzir a saída final na sua saída padrão. Quaisquer opções do nível de compressão serão passadas ao comando (\"-9\" por exemplo). Um arquivo gerado com a mesma extensão que `<formato>`, este será utilizado caso nenhum outro seja informado."
 
 #. type: Plain text
 #: en/git-archive.txt:120
@@ -8525,11 +8013,7 @@ msgstr "tar.<formato>.remoto"
 #: en/git-archive.txt:126
 #, priority:100
 msgid "If true, enable `<format>` for use by remote clients via linkgit:git-upload-archive[1]. Defaults to false for user-defined formats, but true for the \"tar.gz\" and \"tgz\" formats."
-msgstr ""
-"Caso seja 'true', ative o `<formato>` para que seja utilizado por clientes "
-"remotos através do linkgit:git-upload-archive[1]. A predefinição retorna "
-"para 'false' nos formatos definidos pelo usuário, mas 'true' para os "
-"formatos \"tar.gz\" e \"tgz\"."
+msgstr "Caso seja 'true', ative o `<formato>` para que seja utilizado por clientes remotos através do linkgit:git-upload-archive[1]. A predefinição retorna para 'false' nos formatos definidos pelo usuário, mas 'true' para os formatos \"tar.gz\" e \"tgz\"."
 
 #. type: Title -
 #: en/git-archive.txt:129
@@ -8727,15 +8211,7 @@ msgstr ""
 #: en/git-bisect.txt:40
 #, priority:100
 msgid "This command uses a binary search algorithm to find which commit in your project's history introduced a bug. You use it by first telling it a \"bad\" commit that is known to contain the bug, and a \"good\" commit that is known to be before the bug was introduced. Then `git bisect` picks a commit between those two endpoints and asks you whether the selected commit is \"good\" or \"bad\". It continues narrowing down the range until it finds the exact commit that introduced the change."
-msgstr ""
-"Este comando utiliza um algoritmo de pesquisa binária para descobrir qual o "
-"commit no histórico do seu projeto introduziu um \"bug\" (problema). Você o "
-"utiliza informando primeiro a um commit \"bad\" (ruim) que é informado por "
-"conter o bug e um commit \"good\" (bom) informado antes da introdução do "
-"bug. Então o comando `git bisect` seleciona um commit entre estes dois "
-"pontos extremos e pergunta se o commit selecionado é \"bom\" ou \"ruim\". "
-"Continua estreitando o intervalo até encontrar o commit exato responsável "
-"pela introdução da alteração."
+msgstr "Este comando utiliza um algoritmo de pesquisa binária para descobrir qual o commit no histórico do seu projeto introduziu um \"bug\" (problema). Você o utiliza informando primeiro a um commit \"bad\" (ruim) que é informado por conter o bug e um commit \"good\" (bom) informado antes da introdução do bug. Então o comando `git bisect` seleciona um commit entre estes dois pontos extremos e pergunta se o commit selecionado é \"bom\" ou \"ruim\". Continua estreitando o intervalo até encontrar o commit exato responsável pela introdução da alteração."
 
 #. type: Plain text
 #: en/git-bisect.txt:47
@@ -8771,10 +8247,7 @@ msgstr ""
 #: en/git-bisect.txt:64
 #, priority:100
 msgid "Once you have specified at least one bad and one good commit, `git bisect` selects a commit in the middle of that range of history, checks it out, and outputs something similar to the following:"
-msgstr ""
-"Uma vez que você tenha utilizado pelo menos um commit ruim e um commit bom, "
-"o comando `git bisect` seleciona um commit no meio deste intervalo do "
-"histórico, faz a averiguação e produz algo como por exemplo:"
+msgstr "Uma vez que você tenha utilizado pelo menos um commit ruim e um commit bom, o comando `git bisect` seleciona um commit no meio deste intervalo do histórico, faz a averiguação e produz algo como por exemplo:"
 
 #. type: delimited block -
 #: en/git-bisect.txt:67
@@ -9220,16 +8693,7 @@ msgstr "Qualquer outro código gerado interromperá o processo bisect. Deve ser
 #: en/git-bisect.txt:340
 #, priority:100
 msgid "The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current revision will be skipped (see `git bisect skip` above). 125 was chosen as the highest sensible value to use for this purpose, because 126 and 127 are used by POSIX shells to signal specific error status (127 is for command not found, 126 is for command found but not executable--these details do not matter, as they are normal errors in the script, as far as `bisect run` is concerned)."
-msgstr ""
-"O código especial 125 da saída deve ser utilizado quando o código-fonte "
-"atual não puder ser testado. Caso o script encerre com este código, a "
-"revisão atual será ignorada (consulte o comando `git bisect skip` acima). O "
-"125 foi selecionado como o maior valor a ser utilizado para esta finalidade, "
-"pois 126 e 127 são utilizandos pelos shells POSIX para sinalizar uma "
-"condição de erro específica (127 é utilizado para o comando não encontrado, "
-"126 é para o comando que foi encontrado, mas não é executável - estes "
-"detalhes não são importantes, pois são erros normais do script, no que diz "
-"respeito ao comando `bisect run`)."
+msgstr "O código especial 125 da saída deve ser utilizado quando o código-fonte atual não puder ser testado. Caso o script encerre com este código, a revisão atual será ignorada (consulte o comando `git bisect skip` acima). O 125 foi selecionado como o maior valor a ser utilizado para esta finalidade, pois 126 e 127 são utilizandos pelos shells POSIX para sinalizar uma condição de erro específica (127 é utilizado para o comando não encontrado, 126 é para o comando que foi encontrado, mas não é executável - estes detalhes não são importantes, pois são erros normais do script, no que diz respeito ao comando `bisect run`)."
 
 #. type: Plain text
 #: en/git-bisect.txt:346
@@ -9253,10 +8717,7 @@ msgstr "--no-checkout"
 #: en/git-bisect.txt:362
 #, priority:100
 msgid "Do not checkout the new working tree at each iteration of the bisection process. Instead just update a special reference named `BISECT_HEAD` to make it point to the commit that should be tested."
-msgstr ""
-"Não faça a averiguação da nova árvore de trabalho em cada iteração do "
-"processo de bisseção. Em vez disso, atualize apenas uma referência especial "
-"chamada `BISECT_HEAD` indicando o commit que deve ser testado."
+msgstr "Não faça a averiguação da nova árvore de trabalho em cada iteração do processo de bisseção. Em vez disso, atualize apenas uma referência especial chamada `BISECT_HEAD` indicando o commit que deve ser testado."
 
 #. type: Plain text
 #: en/git-bisect.txt:365
@@ -9438,9 +8899,7 @@ msgstr "Isso exibe o que você pode fazer sem executar um script caso escreva o
 #: en/git-bisect.txt:453
 #, priority:100
 msgid "Locate a good region of the object graph in a damaged repository"
-msgstr ""
-"Localize uma boa região do grafo dos objetos em um repositório que foi "
-"danificado"
+msgstr "Localize uma boa região do grafo dos objetos em um repositório que foi danificado"
 
 #. type: delimited block -
 #: en/git-bisect.txt:463
@@ -9474,10 +8933,7 @@ msgstr "$ git bisect reset                   # encerra a seção bisect\n"
 #: en/git-bisect.txt:470
 #, priority:100
 msgid "In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that has at least one parent whose reachable graph is fully traversable in the sense required by 'git pack objects'."
-msgstr ""
-"Neste caso, quando 'git bisect run' encerra, o bisect/bad (ruim) irá apontar "
-"para um commit que tenha pelo menos uma origem cujo grafo seja completamente "
-"cruzado no sentido requerido pelo comando 'git pack objects'."
+msgstr "Neste caso, quando 'git bisect run' encerra, o bisect/bad (ruim) irá apontar para um commit que tenha pelo menos uma origem cujo grafo seja completamente cruzado no sentido requerido pelo comando 'git pack objects'."
 
 #. type: Plain text
 #: en/git-bisect.txt:472
@@ -9565,18 +9021,13 @@ msgstr ""
 #: en/git-blame.txt:22
 #, priority:100
 msgid "Annotates each line in the given file with information from the revision which last modified the line. Optionally, start annotating from the given revision."
-msgstr ""
-"Anota cada linha no arquivo informado com informações da revisão que "
-"modificou a linha pela última vez. Opcionalmente, comece a anotar a partir "
-"da revisão informada."
+msgstr "Anota cada linha no arquivo informado com informações da revisão que modificou a linha pela última vez. Opcionalmente, comece a anotar a partir da revisão informada."
 
 #. type: Plain text
 #: en/git-blame.txt:25
 #, priority:100
 msgid "When specified one or more times, `-L` restricts annotation to the requested lines."
-msgstr ""
-"Quando informado uma ou mais vezes, a opção `-L` limita a anotação às linhas "
-"solicitadas."
+msgstr "Quando informado uma ou mais vezes, a opção `-L` limita a anotação às linhas solicitadas."
 
 #. type: Plain text
 #: en/git-blame.txt:31
@@ -9672,9 +9123,7 @@ msgstr "Exiba o endereço e-mail do autor em vez do se nome (Predefinição: des
 #: en/git-blame.txt:87
 #, priority:100
 msgid "Ignore whitespace when comparing the parent's version and the child's to find where the lines came from."
-msgstr ""
-"Ignore os espaços durante a comparação da versão das origens e seus "
-"herdeiros para descobrir de onde vieram as linhas."
+msgstr "Ignore os espaços durante a comparação da versão das origens e seus herdeiros para descobrir de onde vieram as linhas."
 
 #. type: Labeled list
 #: en/git-blame.txt:88 en/git-describe.txt:65
@@ -9952,13 +9401,29 @@ msgstr "git-branch - Lista, cria ou exclui ramificações"
 
 #. type: Plain text
 #: en/git-branch.txt:26
-#, ignore-ellipsis, no-wrap, priority:240
+#, fuzzy, ignore-ellipsis, no-wrap, priority:240
+#| msgid ""
+#| "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
+#| "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
+#| "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
+#| "\t[(--merged | --no-merged) [<commit>]]\n"
+#| "\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+#| "\t[--points-at <object>] [--format=<format>]\n"
+#| "\t[(-r | --remotes) | (-a | --all)]\n"
+#| "\t[--list] [<pattern>...]\n"
+#| "'git branch' [--track | --no-track] [-f] <branchname> [<start-point>]\n"
+#| "'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]\n"
+#| "'git branch' --unset-upstream [<branchname>]\n"
+#| "'git branch' (-m | -M) [<oldbranch>] <newbranch>\n"
+#| "'git branch' (-c | -C) [<oldbranch>] <newbranch>\n"
+#| "'git branch' (-d | -D) [-r] <branchname>...\n"
+#| "'git branch' --edit-description [<branchname>]\n"
 msgid ""
 "'git branch' [--color[=<when>] | --no-color] [--show-current]\n"
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9978,10 +9443,8 @@ msgstr ""
 "\t[--points-at <objeto>] [--format=<formato>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<padrão>...]\n"
-"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]"
-"\n"
-"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]"
-"\n"
+"'git branch' [--track | --no-track] [-f] <nome-do-ramo> [<ponto-de-partida>]\n"
+"'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<nome-do-ramo>]\n"
 "'git branch' --unset-upstream [<nome-do-ramo>]\n"
 "'git branch' (-m | -M) [<ramo-antigo>] <nome-do-ramo>\n"
 "'git branch' (-c | -C) [<ramo-antigo>] <novo-ramo>\n"
@@ -9998,11 +9461,7 @@ msgstr "Caso a opção `--list` seja utilizada ou caso não haja argumentos não
 #: en/git-branch.txt:41
 #, priority:240
 msgid "If a `<pattern>` is given, it is used as a shell wildcard to restrict the output to matching branches. If multiple patterns are given, a branch is shown if it matches any of the patterns."
-msgstr ""
-"Caso um `<padrão>` seja informado, ele será utilizado como um curinga do "
-"shell para restringir a saída das ramificações correspondentes. Caso vários "
-"padrões sejam informados, um ramo será exibido caso coincida com qualquer um "
-"dos padrões."
+msgstr "Caso um `<padrão>` seja informado, ele será utilizado como um curinga do shell para restringir a saída das ramificações correspondentes. Caso vários padrões sejam informados, um ramo será exibido caso coincida com qualquer um dos padrões."
 
 #. type: Plain text
 #: en/git-branch.txt:45
@@ -10014,29 +9473,13 @@ msgstr "Note que ao fornecer um `<padrão>` você deve utilizar `--list`; caso c
 #: en/git-branch.txt:54
 #, priority:240
 msgid "With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the named commit), `--no-contains` inverts it. With `--merged`, only branches merged into the named commit (i.e. the branches whose tip commits are reachable from the named commit) will be listed.  With `--no-merged` only branches not merged into the named commit will be listed.  If the <commit> argument is missing it defaults to `HEAD` (i.e. the tip of the current branch)."
-msgstr ""
-"Com a opção `--contains`, exibe apenas os ramos que contenham o commit "
-"informado (em outras palavras, os ramos cujos commits do topo sejam os "
-"descendentes do commit informado),`--no-contains` funciona ao contrário. Com "
-"a opção `--merged`, apenas as ramificações mescladas no commit informado "
-"serão listados (ou seja, os ramos cujos commits do cume esteja acessível a "
-"partir do commit informado).  Com `--no-merged', serão listados apenas as "
-"ramificações não mescladas do commit informado.  Caso o argumento `<commit>` "
-"esteja ausente, a predefinição retorna para `HEAD` (ou seja, o  do ramo "
-"atual)."
+msgstr "Com a opção `--contains`, exibe apenas os ramos que contenham o commit informado (em outras palavras, os ramos cujos commits do topo sejam os descendentes do commit informado),`--no-contains` funciona ao contrário. Com a opção `--merged`, apenas as ramificações mescladas no commit informado serão listados (ou seja, os ramos cujos commits do cume esteja acessível a partir do commit informado).  Com `--no-merged', serão listados apenas as ramificações não mescladas do commit informado.  Caso o argumento `<commit>` esteja ausente, a predefinição retorna para `HEAD` (ou seja, o  do ramo atual)."
 
 #. type: Plain text
 #: en/git-branch.txt:61
 #, ignore-ellipsis, priority:240
 msgid "The command's second form creates a new branch head named <branchname> which points to the current `HEAD`, or <start-point> if given. As a special case, for <start-point>, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr ""
-"O segundo formulário do comando cria um novo cabeçalho do ramo informado "
-"`<nome-do-ramo>` (nome do ramo0), que aponta para o `HEAD` atual, ou o "
-"`<ponto-de-partida>` caso seja utilizado. Como um caso especial, para o "
-"`<ponto-de-partida>`, utilize `\"A...B\"` como um atalho para a base da "
-"mesclagem de `A` e `B` caso sejam exatamente uma base para ser mesclada. "
-"Você pode deixar de fora no máximo um de `A` e `B`, caso onde a predefinição "
-"retorna para `HEAD`."
+msgstr "O segundo formulário do comando cria um novo cabeçalho do ramo informado `<nome-do-ramo>` (nome do ramo0), que aponta para o `HEAD` atual, ou o `<ponto-de-partida>` caso seja utilizado. Como um caso especial, para o `<ponto-de-partida>`, utilize `\"A...B\"` como um atalho para a base da mesclagem de `A` e `B` caso sejam exatamente uma base para ser mesclada. Você pode deixar de fora no máximo um de `A` e `B`, caso onde a predefinição retorna para `HEAD`."
 
 #. type: Plain text
 #: en/git-branch.txt:65
@@ -10048,27 +9491,13 @@ msgstr "Observe que isso criará a nova ramificação mas não mudará a árvore
 #: en/git-branch.txt:73
 #, priority:240
 msgid "When a local branch is started off a remote-tracking branch, Git sets up the branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` configuration entries) so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autoSetupMerge` configuration flag. That setting can be overridden by using the `--track` and `--no-track` options, and changed later using `git branch --set-upstream-to`."
-msgstr ""
-"Quando uma ramificação local é iniciada em uma ramificação remotamente "
-"monitorada, o Git define a ramificação (especificamente as entradas da "
-"configuração `branch.<nome>.remote` e `branch.<nome>.merge`) para que o "
-"comando 'git pull' mescle adequadamente a partir do ramo monitorado "
-"remotamente. Este comportamento pode ser alterado através da variável de "
-"configuração global `branch.autoSetupMerge`. Esta configuração pode ser "
-"substituída utilizando as opções `--track` e `--no-track`, podendo ser "
-"alterada posteriormente utilizando o comando `git branch --set-upstream-to`."
+msgstr "Quando uma ramificação local é iniciada em uma ramificação remotamente monitorada, o Git define a ramificação (especificamente as entradas da configuração `branch.<nome>.remote` e `branch.<nome>.merge`) para que o comando 'git pull' mescle adequadamente a partir do ramo monitorado remotamente. Este comportamento pode ser alterado através da variável de configuração global `branch.autoSetupMerge`. Esta configuração pode ser substituída utilizando as opções `--track` e `--no-track`, podendo ser alterada posteriormente utilizando o comando `git branch --set-upstream-to`."
 
 #. type: Plain text
 #: en/git-branch.txt:79
 #, priority:240
 msgid "With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>.  If <oldbranch> had a corresponding reflog, it is renamed to match <newbranch>, and a reflog entry is created to remember the branch renaming. If <newbranch> exists, -M must be used to force the rename to happen."
-msgstr ""
-"Com uma opção `-m` ou `-M`, o ramo antigo `<ramo-antigo>` será renomeado "
-"para o novo ramo `<novo-ramo>`.  Caso o `<ramo-antigo>` tenha um reflog "
-"correspondente, ele será renomeado para coincidir com o `<novo-ramo>`, uma "
-"entrada de reflog será criada para lembrar da renomeação do ramo. Caso "
-"`<novo-ramo>` exista, -M deve ser utilizado para impor que a renomeação "
-"aconteça."
+msgstr "Com uma opção `-m` ou `-M`, o ramo antigo `<ramo-antigo>` será renomeado para o novo ramo `<novo-ramo>`.  Caso o `<ramo-antigo>` tenha um reflog correspondente, ele será renomeado para coincidir com o `<novo-ramo>`, uma entrada de reflog será criada para lembrar da renomeação do ramo. Caso `<novo-ramo>` exista, -M deve ser utilizado para impor que a renomeação aconteça."
 
 #. type: Plain text
 #: en/git-branch.txt:83
@@ -10080,10 +9509,7 @@ msgstr "As opções `-c` e `-C` possuem exatamente a mesma semântica que `-m` e
 #: en/git-branch.txt:87
 #, priority:240
 msgid "With a `-d` or `-D` option, `<branchname>` will be deleted.  You may specify more than one branch for deletion.  If the branch currently has a reflog then the reflog will also be deleted."
-msgstr ""
-"Com uma opção `-d` ou `-D`, o `<nome-do-ramo>` será excluído.  Você pode "
-"informar mais de uma ramificação para ser excluído.  Caso o ramo tiver "
-"atualmente um reflog, este também será excluído."
+msgstr "Com uma opção `-d` ou `-D`, o `<nome-do-ramo>` será excluído.  Você pode informar mais de uma ramificação para ser excluído.  Caso o ramo tiver atualmente um reflog, este também será excluído."
 
 #. type: Plain text
 #: en/git-branch.txt:93
@@ -10125,26 +9551,13 @@ msgstr "--create-reflog"
 #: en/git-branch.txt:115
 #, priority:240
 msgid "Create the branch's reflog.  This activates recording of all changes made to the branch ref, enabling use of date based sha1 expressions such as \"<branchname>@\\{yesterday}\".  Note that in non-bare repositories, reflogs are usually enabled by default by the `core.logAllRefUpdates` config option.  The negated form `--no-create-reflog` only overrides an earlier `--create-reflog`, but currently does not negate the setting of `core.logAllRefUpdates`."
-msgstr ""
-"Crie o reflog do ramo.  Ativa a gravação de todas as alterações feitas no "
-"\"ref\" do ramo, permitindo a utilização de expressões sha1 baseadas na "
-"data, como `<nome-do-ramo>@\\{yesterday}`.  Observe que nos repositórios que "
-"não estiverem vazios, é predefinido que os reflogs geralmente sejam ativados "
-"através da variável de configuração `core.logAllRefUpdates`.  A forma negada "
-"o comando `--no-create-reflog` substitui apenas um `--create-reflog` "
-"anterior, mas atualmente não nega a configuração do `core.logAllRefUpdates`."
+msgstr "Crie o reflog do ramo.  Ativa a gravação de todas as alterações feitas no \"ref\" do ramo, permitindo a utilização de expressões sha1 baseadas na data, como `<nome-do-ramo>@\\{yesterday}`.  Observe que nos repositórios que não estiverem vazios, é predefinido que os reflogs geralmente sejam ativados através da variável de configuração `core.logAllRefUpdates`.  A forma negada o comando `--no-create-reflog` substitui apenas um `--create-reflog` anterior, mas atualmente não nega a configuração do `core.logAllRefUpdates`."
 
 #. type: Plain text
 #: en/git-branch.txt:124
 #, priority:240
 msgid "Reset <branchname> to <startpoint>, even if <branchname> exists already. Without `-f`, 'git branch' refuses to change an existing branch.  In combination with `-d` (or `--delete`), allow deleting the branch irrespective of its merged status. In combination with `-m` (or `--move`), allow renaming the branch even if the new branch name already exists, the same applies for `-c` (or `--copy`)."
-msgstr ""
-"Redefina o `<nome-do-ramo>` para `<startpoint>`, mesmo se o `<nome-do-ramo>` "
-"já existir. Sem o `-f`, o comando 'git branch' se recusa a alterar uma "
-"ramificação já existente.  Em combinação com `-d` (ou `--delete`), permita "
-"excluir a ramificação, independentemente da sua condição de mesclagem. Em "
-"combinação com `-m` (ou `--move`), permita renomear a ramificação, mesmo que "
-"o novo nome do ramo já exista, o mesmo se aplica com `-c` (ou `--copy`)."
+msgstr "Redefina o `<nome-do-ramo>` para `<startpoint>`, mesmo se o `<nome-do-ramo>` já existir. Sem o `-f`, o comando 'git branch' se recusa a alterar uma ramificação já existente.  Em combinação com `-d` (ou `--delete`), permita excluir a ramificação, independentemente da sua condição de mesclagem. Em combinação com `-m` (ou `--move`), permita renomear a ramificação, mesmo que o novo nome do ramo já exista, o mesmo se aplica com `-c` (ou `--copy`)."
 
 #. type: Labeled list
 #: en/git-branch.txt:126
@@ -10234,11 +9647,7 @@ msgstr "--no-column"
 #: en/git-branch.txt:158
 #, priority:240
 msgid "Display branch listing in columns. See configuration variable column.branch for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"Exibir a lista das ramificações em colunas. Consulte a variável de "
-"configuração `column.branch` para conhecer a sintaxe da opção. As opções "
-"`--column` e `--no-column` sem nenhum argumento são equivalentes a 'always' "
-"e 'never' respectivamente."
+msgstr "Exibir a lista das ramificações em colunas. Consulte a variável de configuração `column.branch` para conhecer a sintaxe da opção. As opções `--column` e `--no-column` sem nenhum argumento são equivalentes a 'always' e 'never' respectivamente."
 
 #. type: Plain text
 #: en/git-branch.txt:160
@@ -10280,9 +9689,7 @@ msgstr "--show-current"
 #: en/git-branch.txt:180
 #, priority:240
 msgid "Print the name of the current branch. In detached HEAD state, nothing is printed."
-msgstr ""
-"Exiba o nome do ramo atual. Na condição onde `HEAD` esteja desanexado, nada "
-"é impresso."
+msgstr "Exiba o nome do ramo atual. Na condição onde `HEAD` esteja desanexado, nada é impresso."
 
 #. type: Labeled list
 #: en/git-branch.txt:182
@@ -10294,14 +9701,7 @@ msgstr "-vv"
 #: en/git-branch.txt:191
 #, priority:240
 msgid "When in list mode, show sha1 and commit subject line for each head, along with relationship to upstream branch (if any). If given twice, print the path of the linked worktree (if any) and the name of the upstream branch, as well (see also `git remote show <remote>`).  Note that the current worktree's HEAD will not have its path printed (it will always be your current directory)."
-msgstr ""
-"Quando estiver no modo de listagem, exiba o sha1 e confirme a linha do "
-"assunto para cada cabeçalho, juntamente com o relacionamento com o ramo "
-"\"upstream\" (caso haja). Se utilizado duas vezes, exiba a vinculação do "
-"caminho da árvore de trabalho (caso haja) e o nome do ramo \"upstream\" ("
-"consulte também `git remote show <remoto>`).  Observe que o `HEAD` da árvore "
-"de trabalho atual não terá o seu caminho mostrado (sempre será seu diretório "
-"atual)."
+msgstr "Quando estiver no modo de listagem, exiba o sha1 e confirme a linha do assunto para cada cabeçalho, juntamente com o relacionamento com o ramo \"upstream\" (caso haja). Se utilizado duas vezes, exiba a vinculação do caminho da árvore de trabalho (caso haja) e o nome do ramo \"upstream\" (consulte também `git remote show <remoto>`).  Observe que o `HEAD` da árvore de trabalho atual não terá o seu caminho mostrado (sempre será seu diretório atual)."
 
 #. type: Plain text
 #: en/git-branch.txt:196
@@ -10319,10 +9719,7 @@ msgstr "--abrev=<comprimento>"
 #: en/git-branch.txt:201
 #, priority:240
 msgid "Alter the sha1's minimum display length in the output listing.  The default value is 7 and can be overridden by the `core.abbrev` config option."
-msgstr ""
-"Altere o comprimento mínimo da exibição do sha1 na listagem de saída.  O "
-"valor predefinido é 7, pode ser substituído através da variável de "
-"configuração `core.abbrev`."
+msgstr "Altere o comprimento mínimo da exibição do sha1 na listagem de saída.  O valor predefinido é 7, pode ser substituído através da variável de configuração `core.abbrev`."
 
 #. type: Labeled list
 #: en/git-branch.txt:202
@@ -10352,13 +9749,7 @@ msgstr "Ao criar uma nova ramificação, configure as entradas da configuração
 #: en/git-branch.txt:220
 #, priority:240
 msgid "This behavior is the default when the start point is a remote-tracking branch.  Set the branch.autoSetupMerge configuration variable to `false` if you want `git switch`, `git checkout` and `git branch` to always behave as if `--no-track` were given. Set it to `always` if you want this behavior when the start-point is either a local or remote-tracking branch."
-msgstr ""
-"Este é o comportamento predefinido quando o ponto inicial for uma "
-"ramificação rastreada remotamente.  Defina a variável de configuração `branch"
-".autoSetupMerge` como `false` caso queira que o `git switch`, `git checkout` "
-"e o `git branch` sempre se comportem como se a opção `--no-track` fosse "
-"utilizada. Defina-o como `always` caso queira que este comportamento quando "
-"o ponto de partida for uma ramificação local ou rastreada remotamente."
+msgstr "Este é o comportamento predefinido quando o ponto inicial for uma ramificação rastreada remotamente.  Defina a variável de configuração `branch.autoSetupMerge` como `false` caso queira que o `git switch`, `git checkout` e o `git branch` sempre se comportem como se a opção `--no-track` fosse utilizada. Defina-o como `always` caso queira que este comportamento quando o ponto de partida for uma ramificação local ou rastreada remotamente."
 
 #. type: Labeled list
 #: en/git-branch.txt:221 en/git-checkout.txt:172 en/git-switch.txt:167
@@ -10370,9 +9761,7 @@ msgstr "--no-track"
 #: en/git-branch.txt:224
 #, priority:240
 msgid "Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge configuration variable is true."
-msgstr ""
-"Não configure o \"upstream\", ainda que a variável de configuração `branch."
-"autoSetupMerge` seja verdadeira."
+msgstr "Não configure o \"upstream\", ainda que a variável de configuração `branch.autoSetupMerge` seja verdadeira."
 
 #. type: Plain text
 #: en/git-branch.txt:228
@@ -10396,11 +9785,7 @@ msgstr "--set-upstream-to=<upstream>"
 #: en/git-branch.txt:234
 #, priority:240
 msgid "Set up <branchname>'s tracking information so <upstream> is considered <branchname>'s upstream branch. If no <branchname> is specified, then it defaults to the current branch."
-msgstr ""
-"Configure as informações do monitoramento do `<nome-do-ramo>` para que o "
-"`<upstream>` seja considerado o ramo \"upstream\" do `<nome-do-ramo>`. Caso "
-"nenhum `<nome-do-ramo>` seja utilizado, então a predefinição retorna para o "
-"ramo atual."
+msgstr "Configure as informações do monitoramento do `<nome-do-ramo>` para que o `<upstream>` seja considerado o ramo \"upstream\" do `<nome-do-ramo>`. Caso nenhum `<nome-do-ramo>` seja utilizado, então a predefinição retorna para o ramo atual."
 
 #. type: Labeled list
 #: en/git-branch.txt:235
@@ -10412,9 +9797,7 @@ msgstr "--unset-upstream"
 #: en/git-branch.txt:238
 #, priority:240
 msgid "Remove the upstream information for <branchname>. If no branch is specified it defaults to the current branch."
-msgstr ""
-"Remova as informações \"upstream\" para o `<nome-do-ramo>`. Caso nenhuma "
-"ramificação seja utilizada, a predefinição retorna para a ramificação atual."
+msgstr "Remova as informações \"upstream\" para o `<nome-do-ramo>`. Caso nenhuma ramificação seja utilizada, a predefinição retorna para a ramificação atual."
 
 #. type: Labeled list
 #: en/git-branch.txt:239
@@ -10438,9 +9821,7 @@ msgstr "--contains [<commit>]"
 #: en/git-branch.txt:248
 #, priority:240
 msgid "Only list branches which contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Listar apenas as ramificações que contenham o commit informado (`HEAD`, caso "
-"nenhum seja informado). Implica no uso da opção `--list`."
+msgstr "Listar apenas as ramificações que contenham o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`."
 
 #. type: Labeled list
 #: en/git-branch.txt:249 en/git-tag.txt:146
@@ -10452,9 +9833,7 @@ msgstr "--no-contains [<commit>]"
 #: en/git-branch.txt:252
 #, priority:240
 msgid "Only list branches which don't contain the specified commit (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as ramificações que não contenha o commit informado (`HEAD`, "
-"caso nenhum seja informado). Implica no uso da opção `--list`."
+msgstr "Liste apenas as ramificações que não contenha o commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`."
 
 #. type: Labeled list
 #: en/git-branch.txt:253 en/git-tag.txt:150
@@ -10466,10 +9845,7 @@ msgstr "--merged [<commit>]"
 #: en/git-branch.txt:257
 #, priority:240
 msgid "Only list branches whose tips are reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--no-merged`."
-msgstr ""
-"Liste apenas as ramificações cujas dicas são acessíveis a partir do commit "
-"informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção "
-"`--list`, é incompatível com a opção `--no-merged`."
+msgstr "Liste apenas as ramificações cujas dicas são acessíveis a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`, é incompatível com a opção `--no-merged`."
 
 #. type: Labeled list
 #: en/git-branch.txt:258 en/git-tag.txt:154
@@ -10481,10 +9857,7 @@ msgstr "--no-merged [<commit>]"
 #: en/git-branch.txt:262
 #, priority:240
 msgid "Only list branches whose tips are not reachable from the specified commit (HEAD if not specified). Implies `--list`, incompatible with `--merged`."
-msgstr ""
-"Liste apenas as ramificações cujas dicas não possam ser acessadas a partir "
-"do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da "
-"opção `--list`, é incompatível com `--merged`."
+msgstr "Liste apenas as ramificações cujas dicas não possam ser acessadas a partir do commit informado (`HEAD`, caso nenhum seja informado). Implica no uso da opção `--list`, é incompatível com `--merged`."
 
 #. type: Labeled list
 #: en/git-branch.txt:263
@@ -10532,9 +9905,7 @@ msgstr "<novo-ramo>"
 #: en/git-branch.txt:280
 #, priority:240
 msgid "The new name for an existing branch. The same restrictions as for <branchname> apply."
-msgstr ""
-"Um novo nome para um ramo já existente. Se aplicam as mesmas restrições para "
-"`<nome-do-ramo>`."
+msgstr "Um novo nome para um ramo já existente. Se aplicam as mesmas restrições para `<nome-do-ramo>`."
 
 #. type: Labeled list
 #: en/git-branch.txt:281 en/git-for-each-ref.txt:40 en/git-ls-remote.txt:65 en/git-tag.txt:112
@@ -10546,17 +9917,7 @@ msgstr "--sort=<chave>"
 #: en/git-branch.txt:291
 #, ignore-ellipsis, priority:240
 msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. The keys supported are the same as those in `git for-each-ref`. Sort order defaults to the value configured for the `branch.sort` variable if exists, or to sorting based on the full refname (including `refs/...` prefix). This lists detached HEAD (if present) first, then local branches and finally remote-tracking branches. See linkgit:git-config[1]."
-msgstr ""
-"Classifique com base na chave informada. O prefixo `-` é utilizado para "
-"classificar em ordem decrescente. Você pode utilizar a opção `--sort=<chave>`"
-" mais de uma vez; nesse caso, a última chave se torna a chave primária. As "
-"chaves compatíveis são as mesmas que as do `git for-each-ref`. A "
-"predefinição da ordem da classificação retorna para o valor configurado para "
-"a variável `branch.sort`, caso exista ou a classificação com base no nome "
-"completo da \"ref\" (incluindo o prefixo `refs/...`). Isso lista primeiro o "
-"`HEAD` desanexado (caso esteja presente), depois as ramificações locais e "
-"finalmente as ramificações monitoradas remotamente. Consulte linkgit:git-"
-"config[1]."
+msgstr "Classifique com base na chave informada. O prefixo `-` é utilizado para classificar em ordem decrescente. Você pode utilizar a opção `--sort=<chave>` mais de uma vez; nesse caso, a última chave se torna a chave primária. As chaves compatíveis são as mesmas que as do `git for-each-ref`. A predefinição da ordem da classificação retorna para o valor configurado para a variável `branch.sort`, caso exista ou a classificação com base no nome completo da \"ref\" (incluindo o prefixo `refs/...`). Isso lista primeiro o `HEAD` desanexado (caso esteja presente), depois as ramificações locais e finalmente as ramificações monitoradas remotamente. Consulte linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-branch.txt:293 en/git-tag.txt:158
@@ -10644,9 +10005,7 @@ msgstr "Exclua as ramificações rastreadas remotamente \"todo\", \"html\" e \"m
 #: en/git-branch.txt:336
 #, priority:240
 msgid "Delete the \"test\" branch even if the \"master\" branch (or whichever branch is currently checked out) does not have all commits from the test branch."
-msgstr ""
-"Exclua o ramo \"teste\", mesmo que o ramo \"principal\" (ou o ramo que está "
-"com a averiguação no momento) não tenha todos os commits do ramo do teste."
+msgstr "Exclua o ramo \"teste\", mesmo que o ramo \"principal\" (ou o ramo que está com a averiguação no momento) não tenha todos os commits do ramo do teste."
 
 #. type: Labeled list
 #: en/git-branch.txt:337
@@ -10668,9 +10027,7 @@ msgstr ""
 #: en/git-branch.txt:346
 #, priority:240
 msgid "Using `-a` would conflate <remote> with any local branches you happen to have been prefixed with the same <remote> pattern."
-msgstr ""
-"Utilizando a opção `-a` entraria em conflito com `<remoto>` em quaisquer "
-"ramificações locais que foram prefixadas com o mesmo padrão `<remoto>`."
+msgstr "Utilizando a opção `-a` entraria em conflito com `<remoto>` em quaisquer ramificações locais que foram prefixadas com o mesmo padrão `<remoto>`."
 
 #. type: Plain text
 #: en/git-branch.txt:347
@@ -10685,7 +10042,7 @@ msgid "Patterns will normally need quoting."
 msgstr "Os padrões normalmente precisam ser citados."
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr "OBSERVAÇÕES"
@@ -10712,9 +10069,7 @@ msgstr "`--contains <commit>` é utilizado para encontrar todas as ramificaçõe
 #: en/git-branch.txt:366
 #, priority:240
 msgid "`--no-contains <commit>` is the inverse of that, i.e. branches that don't contain the specified <commit>."
-msgstr ""
-"`--no-contains <commit>` é o inverso, isto é, as ramificações que não contêm "
-"o `<commit>` informado."
+msgstr "`--no-contains <commit>` é o inverso, isto é, as ramificações que não contêm o `<commit>` informado."
 
 #. type: Plain text
 #: en/git-branch.txt:369
@@ -10813,50 +10168,52 @@ msgid "A list of enabled hooks"
 msgstr "Uma lista com ganchos ativos"
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr "Essa ferramenta é chamada através do processo de configuração típica do Git que significa que, em alguns casos, talvez não seja possível iniciar caso um arquivo de configuração relevante estiver ilegível por exemplo. Nesse tipo de cenário, pode ser útil reunir manualmente o tipo de informação listado acima ao pedir ajuda manualmente."
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, no-wrap, priority:100
 msgid "-o <path>"
 msgstr "-o <caminho>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, no-wrap, priority:100
 msgid "--output-directory <path>"
 msgstr "--output-directory <caminho>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr "Coloque o arquivo do relatório dos erros resultantes em `<caminho>` em vez da raiz do repositório Git."
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "-s <formato>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, no-wrap, priority:100
 msgid "--suffix <format>"
 msgstr "--suffix <formato>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
-msgstr ""
-"Defina um sufixo alternativo para o nome do relatório de erros, para criar "
-"um arquivo com o nome de 'git-bugreport-<formatted suffix>'. Isso deve "
-"assumir a forma de um formato da cadeia de caracteres strftime(3); a hora "
-"local será utilizada."
+msgstr "Defina um sufixo alternativo para o nome do relatório de erros, para criar um arquivo com o nome de 'git-bugreport-<formatted suffix>'. Isso deve assumir a forma de um formato da cadeia de caracteres strftime(3); a hora local será utilizada."
 
 #. type: Title =
 #: en/git-bundle.txt:2
@@ -11014,16 +10371,7 @@ msgstr "ESPECIFICANDO AS REFERÊNCIAS"
 #: en/git-bundle.txt:121
 #, priority:100
 msgid "'git bundle' will only package references that are shown by 'git show-ref': this includes heads, tags, and remote heads.  References such as `master~1` cannot be packaged, but are perfectly suitable for defining the basis.  More than one reference may be packaged, and more than one basis can be specified.  The objects packaged are those not contained in the union of the given bases.  Each basis can be specified explicitly (e.g. `^master~10`), or implicitly (e.g.  `master~10..master`, `--since=10.days.ago master`)."
-msgstr ""
-"O comando 'git bundle' apenas empacotará as referências que são exibidas "
-"através do comando 'git show-ref': isso inclui os cabeçalhos, tags e "
-"cabeçalhos remotos.  As referências como `master~1` não podem ser "
-"empacotadas porém são perfeitamente adequadas para definir a base.  Mais de "
-"uma referência pode ser empacotada assim como mais de uma base pode ser "
-"definida.  Os objetos empacotados são aqueles que não estão existentes na "
-"união das bases informadas.  Cada base pode ser definida de forma explicita "
-"(`^master~10` por exemplo) ou de forma implícita (`master~10..master`, `--"
-"since=10.days.ago master` por exemplo)."
+msgstr "O comando 'git bundle' apenas empacotará as referências que são exibidas através do comando 'git show-ref': isso inclui os cabeçalhos, tags e cabeçalhos remotos.  As referências como `master~1` não podem ser empacotadas porém são perfeitamente adequadas para definir a base.  Mais de uma referência pode ser empacotada assim como mais de uma base pode ser definida.  Os objetos empacotados são aqueles que não estão existentes na união das bases informadas.  Cada base pode ser definida de forma explicita (`^master~10` por exemplo) ou de forma implícita (`master~10..master`, `--since=10.days.ago master` por exemplo)."
 
 #. type: Plain text
 #: en/git-bundle.txt:126
@@ -11035,13 +10383,7 @@ msgstr "É muito importante que a base utilizada seja mantida pelo destino.  É
 #: en/git-bundle.txt:134
 #, priority:100
 msgid "`git clone` can use any bundle created without negative refspecs (e.g., `new`, but not `old..new`).  If you want to match `git clone --mirror`, which would include your refs such as `refs/remotes/*`, use `--all`.  If you want to provide the same set of refs that a clone directly from the source repository would get, use `--branches --tags` for the `<git-rev-list-args>`."
-msgstr ""
-"O comando `git clone` pode utilizar qualquer pacote criado sem os \"refespecs"
-"\" negativos (`new`, mas não `old..new` por exemplo).  Caso queira combinar "
-"o comando `git clone --mirror`, que incluiria os seus refs como `refs/"
-"remotes/*`, utilize `--all`.  Caso queira informar o mesmo conjunto de "
-"referências que um clone vindo direto do repositório da origem teria, "
-"utilize `--branches --tags` para o `<git-rev-list-args>`."
+msgstr "O comando `git clone` pode utilizar qualquer pacote criado sem os \"refespecs\" negativos (`new`, mas não `old..new` por exemplo).  Caso queira combinar o comando `git clone --mirror`, que incluiria os seus refs como `refs/remotes/*`, utilize `--all`.  Caso queira informar o mesmo conjunto de referências que um clone vindo direto do repositório da origem teria, utilize `--branches --tags` para o `<git-rev-list-args>`."
 
 #. type: Plain text
 #: en/git-bundle.txt:143
@@ -11101,10 +10443,7 @@ msgstr ""
 #: en/git-bundle.txt:176
 #, priority:100
 msgid "To update the resulting mine.git repository, you can fetch or pull after replacing the bundle stored at /home/me/tmp/file.bundle with incremental updates."
-msgstr ""
-"Para atualizar o repositório `mine.git`, você pode capturar ou extrair após "
-"a reposição do pacote armazenado em `/home/me/tmp/file.bundle` com as "
-"atualizações incrementais."
+msgstr "Para atualizar o repositório `mine.git`, você pode capturar ou extrair após a reposição do pacote armazenado em `/home/me/tmp/file.bundle` com as atualizações incrementais."
 
 #. type: Plain text
 #: en/git-bundle.txt:179
@@ -11238,10 +10577,13 @@ msgstr "git-cat-file - Forneça as informações do conteúdo, tipo e do tamanho
 
 #. type: Plain text
 #: en/git-cat-file.txt:14
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
+#| "'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <tipo> | --textconv | --filters ) [--path=<caminho>] <objeto>\n"
 "'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
@@ -11256,14 +10598,7 @@ msgstr "Em sua primeira forma, o comando fornece o conteúdo ou o tipo de um obj
 #: en/git-cat-file.txt:28
 #, priority:100
 msgid "In the second form, a list of objects (separated by linefeeds) is provided on stdin, and the SHA-1, type, and size of each object is printed on stdout. The output format can be overridden using the optional `<format>` argument. If either `--textconv` or `--filters` was specified, the input is expected to list the object names followed by the path name, separated by a single whitespace, so that the appropriate drivers can be determined."
-msgstr ""
-"Em sua segunda forma, é oferecida uma lista de objetos (separados por linhas "
-"de alimentação) no \"stdin\", o SHA-1, o tipo e seu tamanho de cada objeto "
-"exibidos no \"stdout\". O formato de saída pode ser substituído utilizando a "
-"opção opcional `<formato>`. Caso a opção `--textconv` ou` --filters` foram "
-"sejam utilizados, espera-se que a entrada liste os nomes dos objetos "
-"seguidos pelo nome do caminho, separados por um único espaço, para que os "
-"devidos controladores ser determinados."
+msgstr "Em sua segunda forma, é oferecida uma lista de objetos (separados por linhas de alimentação) no \"stdin\", o SHA-1, o tipo e seu tamanho de cada objeto exibidos no \"stdout\". O formato de saída pode ser substituído utilizando a opção opcional `<formato>`. Caso a opção `--textconv` ou` --filters` foram sejam utilizados, espera-se que a entrada liste os nomes dos objetos seguidos pelo nome do caminho, separados por um único espaço, para que os devidos controladores ser determinados."
 
 #. type: Labeled list
 #: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:210 en/git.txt:339
@@ -11293,10 +10628,7 @@ msgstr "Em vez do conteúdo, exiba o tamanho do objeto identificado por `<objeto
 #: en/git-cat-file.txt:48
 #, priority:100
 msgid "Exit with zero status if <object> exists and is a valid object. If <object> is of an invalid format exit with non-zero and emits an error on stderr."
-msgstr ""
-"Encerre com a condição zero caso o `<objeto>` exista e seja um objeto "
-"válido. Caso o `<objeto>` tenha um formato inválido, encerre com um valor "
-"diferente de zero e emita uma mensagem de erro no \"stderr\"."
+msgstr "Encerre com a condição zero caso o `<objeto>` exista e seja um objeto válido. Caso o `<objeto>` tenha um formato inválido, encerre com um valor diferente de zero e emita uma mensagem de erro no \"stderr\"."
 
 #. type: Plain text
 #: en/git-cat-file.txt:51
@@ -11332,11 +10664,7 @@ msgstr "--filters"
 #: en/git-cat-file.txt:71
 #, priority:100
 msgid "Show the content as converted by the filters configured in the current working tree for the given <path> (i.e. smudge filters, end-of-line conversion, etc). In this case, <object> has to be of the form <tree-ish>:<path>, or :<path>."
-msgstr ""
-"Exiba o conteúdo conforme foi convertido pelos filtros configurados na "
-"árvore de trabalho atual para o `<caminho>` informado (por exemplo, filtros "
-"de manchas, conversão da quebra de linha, etc.). Nesse caso, o `<objeto>` "
-"deve estar no formato `<tree-ish>:<caminho>` ou `:<caminho>`."
+msgstr "Exiba o conteúdo conforme foi convertido pelos filtros configurados na árvore de trabalho atual para o `<caminho>` informado (por exemplo, filtros de manchas, conversão da quebra de linha, etc.). Nesse caso, o `<objeto>` deve estar no formato `<tree-ish>:<caminho>` ou `:<caminho>`."
 
 #. type: Labeled list
 #: en/git-cat-file.txt:72
@@ -11366,12 +10694,7 @@ msgstr "--batch=<formato>"
 #: en/git-cat-file.txt:84
 #, priority:100
 msgid "Print object information and contents for each object provided on stdin.  May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace.  See the section `BATCH OUTPUT` below for details."
-msgstr ""
-"Exiba a informação do objeto e seu conteúdo para cada objeto informado no "
-"stdin.  Talvez não possa ser combinado com nenhuma outra opção exceto "
-"`--textconv` ou `--filters`, neste caso, as linhas da entrada também "
-"precisam informar o caminho, separado por espaços.  Para mais detalhes "
-"consulte a seção `SAÍDA DO LOTE` abaixo."
+msgstr "Exiba a informação do objeto e seu conteúdo para cada objeto informado no stdin.  Talvez não possa ser combinado com nenhuma outra opção exceto `--textconv` ou `--filters`, neste caso, as linhas da entrada também precisam informar o caminho, separado por espaços.  Para mais detalhes consulte a seção `SAÍDA DO LOTE` abaixo."
 
 #. type: Labeled list
 #: en/git-cat-file.txt:85
@@ -11389,12 +10712,7 @@ msgstr "--batch-check=<formato>"
 #: en/git-cat-file.txt:92
 #, priority:100
 msgid "Print object information for each object provided on stdin.  May not be combined with any other options or arguments except `--textconv` or `--filters`, in which case the input lines also need to specify the path, separated by whitespace.  See the section `BATCH OUTPUT` below for details."
-msgstr ""
-"Exiba as informações do objeto para cada objeto informado no stdin.  Talvez "
-"não possa ser combinado com nenhuma outra opção exceto `--textconv` ou "
-"`--filters`, neste caso, as linhas da entrada também precisam informar o "
-"caminho, separado por espaços.  Para mais detalhes consulte a seção `SAÍDA "
-"DO LOTE` abaixo."
+msgstr "Exiba as informações do objeto para cada objeto informado no stdin.  Talvez não possa ser combinado com nenhuma outra opção exceto `--textconv` ou `--filters`, neste caso, as linhas da entrada também precisam informar o caminho, separado por espaços.  Para mais detalhes consulte a seção `SAÍDA DO LOTE` abaixo."
 
 #. type: Labeled list
 #: en/git-cat-file.txt:93
@@ -11406,13 +10724,7 @@ msgstr "--batch-all-objects"
 #: en/git-cat-file.txt:99
 #, priority:100
 msgid "Instead of reading a list of objects on stdin, perform the requested batch operation on all objects in the repository and any alternate object stores (not just reachable objects).  Requires `--batch` or `--batch-check` be specified. Note that the objects are visited in order sorted by their hashes."
-msgstr ""
-"Em vez de ler uma lista dos objetos no stdin, execute a operação em lote "
-"solicitada em todos os objetos no repositório e em quaisquer outros "
-"armazenamentos alternativos dos objetos (não apenas nos objetos que forem "
-"acessíveis).  Requer que o comando `--batch` ou `--batch-check` seja "
-"utilizado. Observe que os objetos são capturados através da ordem dos seus "
-"hashes."
+msgstr "Em vez de ler uma lista dos objetos no stdin, execute a operação em lote solicitada em todos os objetos no repositório e em quaisquer outros armazenamentos alternativos dos objetos (não apenas nos objetos que forem acessíveis).  Requer que o comando `--batch` ou `--batch-check` seja utilizado. Observe que os objetos são capturados através da ordem dos seus hashes."
 
 #. type: Labeled list
 #: en/git-cat-file.txt:100
@@ -11580,8 +10892,7 @@ msgstr "Caso a opção `-e` seja utilizada, nenhuma saída, a menos que o <objet
 #: en/git-cat-file.txt:185
 #, priority:100
 msgid "If `-p` is specified, the contents of <object> are pretty-printed."
-msgstr ""
-"Caso a opção `-p` seja utilizada, o conteúdo de <objeto> será bem impresso."
+msgstr "Caso a opção `-p` seja utilizada, o conteúdo de <objeto> será bem impresso."
 
 #. type: Plain text
 #: en/git-cat-file.txt:188
@@ -11835,13 +11146,7 @@ msgstr "RESSALVAS"
 #: en/git-cat-file.txt:312 en/git-for-each-ref.txt:383
 #, priority:100
 msgid "Note that the sizes of objects on disk are reported accurately, but care should be taken in drawing conclusions about which refs or objects are responsible for disk usage. The size of a packed non-delta object may be much larger than the size of objects which delta against it, but the choice of which object is the base and which is the delta is arbitrary and is subject to change during a repack."
-msgstr ""
-"Observe que os tamanhos dos objetos no disco são relatados com precisão, "
-"porém é preciso ter cuidado ao tirar conclusões sobre quais as refs ou os "
-"objetos sejam responsáveis pela utilização do disco. O tamanho de um objeto "
-"não delta compactado, pode ser muito maior do que o tamanho dos objetos onde "
-"o delta seja contra ele, porém a escolha de qual objeto é a base e qual é o "
-"delta é arbitrária e está sujeita a alterações durante um reempacotamento."
+msgstr "Observe que os tamanhos dos objetos no disco são relatados com precisão, porém é preciso ter cuidado ao tirar conclusões sobre quais as refs ou os objetos sejam responsáveis pela utilização do disco. O tamanho de um objeto não delta compactado, pode ser muito maior do que o tamanho dos objetos onde o delta seja contra ele, porém a escolha de qual objeto é a base e qual é o delta é arbitrária e está sujeita a alterações durante um reempacotamento."
 
 #. type: Plain text
 #: en/git-cat-file.txt:316 en/git-for-each-ref.txt:387
@@ -11905,18 +11210,13 @@ msgstr "--stdin"
 #: en/git-check-attr.txt:33 en/git-check-ignore.txt:46
 #, priority:100
 msgid "Read pathnames from the standard input, one per line, instead of from the command-line."
-msgstr ""
-"Leia os nomes do caminho na entrada padrão, um por linha, em vez da linha de "
-"comando."
+msgstr "Leia os nomes do caminho na entrada padrão, um por linha, em vez da linha de comando."
 
 #. type: Plain text
 #: en/git-check-attr.txt:38
 #, priority:100
 msgid "The output format is modified to be machine-parsable.  If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
-msgstr ""
-"O formato da saída é modificado para ser analisável por uma máquina.  Caso o "
-"`--stdin` também seja informado, os caminhos da entrada serão separados por "
-"um caractere `NUL` em vez de um caractere de avanço de linha."
+msgstr "O formato da saída é modificado para ser analisável por uma máquina.  Caso o `--stdin` também seja informado, os caminhos da entrada serão separados por um caractere `NUL` em vez de um caractere de avanço de linha."
 
 #. type: Plain text
 #: en/git-check-attr.txt:42
@@ -11946,9 +11246,7 @@ msgstr "a menos que `-z` esteja em vigor, no caso onde `NUL` é utilizado como u
 #: en/git-check-attr.txt:59
 #, priority:100
 msgid "<path> is the path of a file being queried, <attribute> is an attribute being queried and <info> can be either:"
-msgstr ""
-"`<caminho>` é o caminho de um arquivo sendo consultado, `<attribute>` é um "
-"atributo sendo consultado e <info> pode ser:"
+msgstr "`<caminho>` é o caminho de um arquivo sendo consultado, `<attribute>` é um atributo sendo consultado e <info> pode ser:"
 
 #. type: Labeled list
 #: en/git-check-attr.txt:60
@@ -12142,11 +11440,7 @@ msgstr ""
 #: en/git-check-ignore.txt:22
 #, priority:100
 msgid "For each pathname given via the command-line or from a file via `--stdin`, check whether the file is excluded by .gitignore (or other input files to the exclude mechanism) and output the path if it is excluded."
-msgstr ""
-"Para cada nome do caminho informado através da linha de comando ou de um "
-"arquivo via `--stdin`, verifique se o arquivo foi excluído por .gitignorar ("
-"ou outros arquivos de entrada para o mecanismo de exclusão) e imprima o "
-"caminho se ele for excluído."
+msgstr "Para cada nome do caminho informado através da linha de comando ou de um arquivo via `--stdin`, verifique se o arquivo foi excluído por .gitignorar (ou outros arquivos de entrada para o mecanismo de exclusão) e imprima o caminho se ele for excluído."
 
 #. type: Plain text
 #: en/git-check-ignore.txt:25
@@ -12188,10 +11482,7 @@ msgstr "Para as regras da precedência dentro e entre as fontes eliminadas, cons
 #: en/git-check-ignore.txt:51
 #, priority:100
 msgid "The output format is modified to be machine-parsable (see below).  If `--stdin` is also given, input paths are separated with a NUL character instead of a linefeed character."
-msgstr ""
-"O formato gerado é modificado para ser analisável pela máquina (veja abaixo)"
-".  Caso o `--stdin` também seja informado, os caminhos da entrada serão "
-"separados por um caractere `NUL` em vez de um caractere de avanço de linha."
+msgstr "O formato gerado é modificado para ser analisável pela máquina (veja abaixo).  Caso o `--stdin` também seja informado, os caminhos da entrada serão separados por um caractere `NUL` em vez de um caractere de avanço de linha."
 
 #. type: Labeled list
 #: en/git-check-ignore.txt:52
@@ -12203,10 +11494,7 @@ msgstr "-n, --non-matching"
 #: en/git-check-ignore.txt:57
 #, priority:100
 msgid "Show given paths which don't match any pattern.\t This only makes sense when `--verbose` is enabled, otherwise it would not be possible to distinguish between paths which match a pattern and those which don't."
-msgstr ""
-"Exiba os caminhos informados que não coincidam com qualquer padrão.\t Só faz "
-"sentido quando a opção `--verbose` está ativa, caso contrário não seria "
-"possível distinguir entre os caminhos que coincidem ou não com um padrão."
+msgstr "Exiba os caminhos informados que não coincidam com qualquer padrão.\t Só faz sentido quando a opção `--verbose` está ativa, caso contrário não seria possível distinguir entre os caminhos que coincidem ou não com um padrão."
 
 #. type: Labeled list
 #: en/git-check-ignore.txt:58 en/git-grep.txt:79
@@ -12224,11 +11512,7 @@ msgstr "Não procure no índice ao realizar as verificações. Pode ser utilizad
 #: en/git-check-ignore.txt:72
 #, priority:100
 msgid "By default, any of the given pathnames which match an ignore pattern will be output, one per line.  If no pattern matches a given path, nothing will be output for that path; this means that path will not be ignored."
-msgstr ""
-"É predefinido que será gerado qualquer um dos nomes do caminho informados "
-"que coincidam com um padrão para ser ignorado, um por linha.  Caso nenhum "
-"padrão coincida com um determinado caminho, nada será gerado; significa que "
-"o caminho não será ignorado."
+msgstr "É predefinido que será gerado qualquer um dos nomes do caminho informados que coincidam com um padrão para ser ignorado, um por linha.  Caso nenhum padrão coincida com um determinado caminho, nada será gerado; significa que o caminho não será ignorado."
 
 #. type: Plain text
 #: en/git-check-ignore.txt:74
@@ -12246,14 +11530,7 @@ msgstr "<fonte> <COLON> <linenum> <COLON> <padrão> <HT> <pathname>"
 #: en/git-check-ignore.txt:84
 #, priority:100
 msgid "<pathname> is the path of a file being queried, <pattern> is the matching pattern, <source> is the pattern's source file, and <linenum> is the line number of the pattern within that source.  If the pattern contained a `!` prefix or `/` suffix, it will be preserved in the output.  <source> will be an absolute path when referring to the file configured by `core.excludesFile`, or relative to the repository root when referring to `.git/info/exclude` or a per-directory exclude file."
-msgstr ""
-"<pathname> é o caminho de um arquivo que está sendo consultado, <padrão> é o "
-"padrão que será coincidido, <fonte> é o arquivo de origem do padrão e "
-"<linenum> é o número da linha do padrão nesta origem.  Caso o padrão "
-"contenha um prefixo `!` Ou um sufixo `/`, ele será preservado na saída.  "
-"<fonte> será um caminho absoluto ao se referir ao arquivo configurado por "
-"`core.excludesFile`, ou relativo à raiz do repositório ao se referir a um `."
-"git/info/exclude` ou a exclusão de um arquivo por diretório."
+msgstr "<pathname> é o caminho de um arquivo que está sendo consultado, <padrão> é o padrão que será coincidido, <fonte> é o arquivo de origem do padrão e <linenum> é o número da linha do padrão nesta origem.  Caso o padrão contenha um prefixo `!` Ou um sufixo `/`, ele será preservado na saída.  <fonte> será um caminho absoluto ao se referir ao arquivo configurado por `core.excludesFile`, ou relativo à raiz do repositório ao se referir a um `.git/info/exclude` ou a exclusão de um arquivo por diretório."
 
 #. type: Plain text
 #: en/git-check-ignore.txt:88
@@ -12343,30 +11620,19 @@ msgstr "'git check-mailmap' [<opções>] <contato>...\n"
 #: en/git-check-mailmap.txt:22
 #, priority:100
 msgid "For each ``Name $$<user@host>$$'' or ``$$<user@host>$$'' from the command-line or standard input (when using `--stdin`), look up the person's canonical name and email address (see \"Mapping Authors\" below). If found, print them; otherwise print the input as-is."
-msgstr ""
-"Para cada ``Name $$<user@host>$$'' ou ``$$<user@host>$$'' na linha de "
-"comando ou na entrada padrão (ao utilizar o `--stdin`), procure o nome "
-"canônico e o endereço do e-mail da pessoa (consulte \"Mapeando os autores\" "
-"logo abaixo). Se encontrado, exiba-os; caso contrário, exiba a entrada como "
-"estiver."
+msgstr "Para cada ``Name $$<user@host>$$'' ou ``$$<user@host>$$'' na linha de comando ou na entrada padrão (ao utilizar o `--stdin`), procure o nome canônico e o endereço do e-mail da pessoa (consulte \"Mapeando os autores\" logo abaixo). Se encontrado, exiba-os; caso contrário, exiba a entrada como estiver."
 
 #. type: Plain text
 #: en/git-check-mailmap.txt:29
 #, priority:100
 msgid "Read contacts, one per line, from the standard input after exhausting contacts provided on the command-line."
-msgstr ""
-"Leia os contatos, um por linha, a partir da entrada padrão depois de esgotar "
-"os contatos informados na linha de comando."
+msgstr "Leia os contatos, um por linha, a partir da entrada padrão depois de esgotar os contatos informados na linha de comando."
 
 #. type: Plain text
 #: en/git-check-mailmap.txt:37
 #, priority:100
 msgid "For each contact, a single line is output, terminated by a newline.  If the name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is printed; otherwise only ``$$<user@host>$$'' is printed."
-msgstr ""
-"Para cada contato, uma única linha é emitida, finalizada através de uma nova "
-"linha.  Caso um nome seja informado ou seja desconhecido ao 'mailmap', ``"
-"Name $$<user@host>$$'' é exibido; caso contrário será exibido apenas "
-"``$$<user@host>$$''."
+msgstr "Para cada contato, uma única linha é emitida, finalizada através de uma nova linha.  Caso um nome seja informado ou seja desconhecido ao 'mailmap', ``Name $$<user@host>$$'' é exibido; caso contrário será exibido apenas ``$$<user@host>$$''."
 
 #. type: Title =
 #: en/git-checkout-index.txt:2
@@ -12448,9 +11714,7 @@ msgstr "--prefix=<texto>"
 #: en/git-checkout-index.txt:51
 #, priority:100
 msgid "When creating files, prepend <string> (usually a directory including a trailing /)"
-msgstr ""
-"Ao criar os arquivos, anexe uma `<texto>` (geralmente um diretório incluindo "
-"uma barra `/`)"
+msgstr "Ao criar os arquivos, anexe uma `<texto>` (geralmente um diretório incluindo uma barra `/`)"
 
 #. type: Labeled list
 #: en/git-checkout-index.txt:52
@@ -12462,10 +11726,7 @@ msgstr "--stage=<número>|all"
 #: en/git-checkout-index.txt:56
 #, priority:100
 msgid "Instead of checking out unmerged entries, copy out the files from named stage.  <number> must be between 1 and 3.  Note: --stage=all automatically implies --temp."
-msgstr ""
-"Em vez de fazer a verificação das entradas que não foram mescladas, copie os "
-"arquivos do estágio informado.  <number> deve ser entre 1 e 3.  Observação: "
-"`--stage=all` automaticamente implica no uso da opção `--temp`."
+msgstr "Em vez de fazer a verificação das entradas que não foram mescladas, copie os arquivos do estágio informado.  <number> deve ser entre 1 e 3.  Observação: `--stage=all` automaticamente implica no uso da opção `--temp`."
 
 #. type: Labeled list
 #: en/git-checkout-index.txt:57
@@ -12483,10 +11744,7 @@ msgstr "Em vez de copiar os arquivos para o diretório de trabalho, grave o cont
 #: en/git-checkout-index.txt:66 en/git-update-index.txt:158
 #, priority:100
 msgid "Instead of taking list of paths from the command line, read list of paths from the standard input.  Paths are separated by LF (i.e. one path per line) by default."
-msgstr ""
-"Em vez de pegar a lista dos caminhos da linha de comando, leia a lista dos "
-"caminhos na entrada padrão.  É predefinido que os caminhos sejam separados "
-"por LF (ou seja, um caminho por linha)."
+msgstr "Em vez de pegar a lista dos caminhos da linha de comando, leia a lista dos caminhos na entrada padrão.  É predefinido que os caminhos sejam separados por LF (ou seja, um caminho por linha)."
 
 #. type: Plain text
 #: en/git-checkout-index.txt:70
@@ -12528,11 +11786,7 @@ msgstr "$ find . -name '*.h' -print0 | xargs -0 git checkout-index -f --\n"
 #: en/git-checkout-index.txt:92
 #, priority:100
 msgid "which will force all existing `*.h` files to be replaced with their cached copies. If an empty command line implied \"all\", then this would force-refresh everything in the index, which was not the point.  But since 'git checkout-index' accepts --stdin it would be faster to use:"
-msgstr ""
-"o que irá impor a reposição de todos os arquivos `* .h` pelas suas cópias no "
-"cache. Uma linha de comando vazia implica em \"all\", isso impõem que a "
-"renovação ocorra em tudo o que estava no índice, o que não era o caso.  Mas "
-"como 'git checkout-index' aceita `--stdin`, seria muito mais rápido utilizar:"
+msgstr "o que irá impor a reposição de todos os arquivos `* .h` pelas suas cópias no cache. Uma linha de comando vazia implica em \"all\", isso impõem que a renovação ocorra em tudo o que estava no índice, o que não era o caso.  Mas como 'git checkout-index' aceita `--stdin`, seria muito mais rápido utilizar:"
 
 #. type: delimited block -
 #: en/git-checkout-index.txt:95
@@ -12687,23 +11941,16 @@ msgstr ""
 "'git checkout' [-q] [-f] [-m] [<ramo>]\n"
 "'git checkout' [-q] [-f] [-m] --detach [<ramo>]\n"
 "'git checkout' [-q] [-f] [-m] [--detach] <commit>\n"
-"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo-ramo>] [<ponto-de-"
-"partida>]\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] "
-"<pathspec>...\n"
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] "
-"--pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
+"'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] <novo-ramo>] [<ponto-de-partida>]\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] <pathspec>...\n"
+"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] --pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
 "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]\n"
 
 #. type: Plain text
 #: en/git-checkout.txt:25
 #, priority:240
 msgid "Updates files in the working tree to match the version in the index or the specified tree.  If no pathspec was given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch."
-msgstr ""
-"Atualiza os arquivos na árvore de trabalho para coincidir com a versão no "
-"índice ou na árvore informada.  Se nenhum \"pathspec\" seja utilizado, o "
-"comando 'git checkout' também atualizará o `HEAD` para definir o ramo "
-"informado como o ramo atual."
+msgstr "Atualiza os arquivos na árvore de trabalho para coincidir com a versão no índice ou na árvore informada.  Se nenhum \"pathspec\" seja utilizado, o comando 'git checkout' também atualizará o `HEAD` para definir o ramo informado como o ramo atual."
 
 #. type: Labeled list
 #: en/git-checkout.txt:26
@@ -12745,20 +11992,13 @@ msgstr "'git checkout' -b|-B <new_branch> [<ponto de início>]"
 #: en/git-checkout.txt:54
 #, priority:240
 msgid "Specifying `-b` causes a new branch to be created as if linkgit:git-branch[1] were called and then checked out.  In this case you can use the `--track` or `--no-track` options, which will be passed to 'git branch'.  As a convenience, `--track` without `-b` implies branch creation; see the description of `--track` below."
-msgstr ""
-"Usando a opção `-b` faz com que um novo ramo seja criado como se o linkgit"
-":git-branch[1] fosse chamado e então averiguado.  Neste caso utilize as "
-"opções `--track` ou `--no-track`, para que sejam encaminhadas ao comando "
-"'git branch'.  Por questão de conveniência, a opção `--track` sem `-b` "
-"implica na criação do ramo; consulte a descrição da opção `--track` abaixo."
+msgstr "Usando a opção `-b` faz com que um novo ramo seja criado como se o linkgit:git-branch[1] fosse chamado e então averiguado.  Neste caso utilize as opções `--track` ou `--no-track`, para que sejam encaminhadas ao comando 'git branch'.  Por questão de conveniência, a opção `--track` sem `-b` implica na criação do ramo; consulte a descrição da opção `--track` abaixo."
 
 #. type: Plain text
 #: en/git-checkout.txt:57
 #, priority:240
 msgid "If `-B` is given, `<new_branch>` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of"
-msgstr ""
-"Caso a opção `-B` seja utilizada, então um `<novo-ramo>` é criado caso ainda "
-"não exista, senão, será redefinido. Este é o equivalente transacional do"
+msgstr "Caso a opção `-B` seja utilizada, então um `<novo-ramo>` é criado caso ainda não exista, senão, será redefinido. Este é o equivalente transacional do"
 
 #. type: delimited block -
 #: en/git-checkout.txt:61
@@ -12774,9 +12014,7 @@ msgstr ""
 #: en/git-checkout.txt:65
 #, priority:240
 msgid "that is to say, the branch is not reset/created unless \"git checkout\" is successful."
-msgstr ""
-"isto é, a ramificação não é redefinida/criada a menos que \"git checkout\" "
-"seja bem-sucedido."
+msgstr "isto é, a ramificação não é redefinida/criada a menos que \"git checkout\" seja bem-sucedido."
 
 #. type: Labeled list
 #: en/git-checkout.txt:66
@@ -12794,21 +12032,13 @@ msgstr "'git checkout' [--detach] <commit>"
 #: en/git-checkout.txt:75
 #, priority:240
 msgid "Prepare to work on top of `<commit>`, by detaching `HEAD` at it (see \"DETACHED HEAD\" section), and updating the index and the files in the working tree.  Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications."
-msgstr ""
-"Prepare-se para trabalhar em cima do `<commit>`, através da desanexação do "
-"`HEAD` (consulte a seção \"HEAD DESANEXADO\"), atualizando o índice e os "
-"arquivos na árvore de trabalho.  As alterações locais dos arquivos da árvore "
-"de trabalho são mantidas, para que a árvore de trabalho resultante seja a "
-"condição registrada no commit, incluindo as alterações locais."
+msgstr "Prepare-se para trabalhar em cima do `<commit>`, através da desanexação do `HEAD` (consulte a seção \"HEAD DESANEXADO\"), atualizando o índice e os arquivos na árvore de trabalho.  As alterações locais dos arquivos da árvore de trabalho são mantidas, para que a árvore de trabalho resultante seja a condição registrada no commit, incluindo as alterações locais."
 
 #. type: Plain text
 #: en/git-checkout.txt:79
 #, priority:240
 msgid "When the `<commit>` argument is a branch name, the `--detach` option can be used to detach `HEAD` at the tip of the branch (`git checkout <branch>` would check out that branch without detaching `HEAD`)."
-msgstr ""
-"Quando o argumento `<commit>` é um nome de ramificação a opção `--detach` "
-"pode ser utilizada para desanexar o `HEAD` na ponta do ramo (` git checkout "
-"<ramo>` verificaria aquela ramificação sem desanexar o `HEAD`)."
+msgstr "Quando o argumento `<commit>` é um nome de ramificação a opção `--detach` pode ser utilizada para desanexar o `HEAD` na ponta do ramo (` git checkout <ramo>` verificaria aquela ramificação sem desanexar o `HEAD`)."
 
 #. type: Plain text
 #: en/git-checkout.txt:81
@@ -12820,41 +12050,25 @@ msgstr "Ao omitir o `<ramo>` isso desanexa o `HEAD` na ponta do ramo atual."
 #: en/git-checkout.txt:82
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <pathspec>..."
-msgstr ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] "
-"<pathspec>..."
+msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] [--] <pathspec>..."
 
 #. type: Labeled list
 #: en/git-checkout.txt:83
 #, no-wrap, priority:240
 msgid "'git checkout' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] --pathspec-from-file=<file> [--pathspec-file-nul]"
-msgstr ""
-"'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] "
-"--pathspec-from-file=<arquivo> [--pathspec-file-nul]"
+msgstr "'git checkout' [-f|--ours|--theirs|-m|--conflict=<estilo>] [<tree-ish>] --pathspec-from-file=<arquivo> [--pathspec-file-nul]"
 
 #. type: Plain text
 #: en/git-checkout.txt:90
 #, priority:240
 msgid "Overwrite the contents of the files that match the pathspec.  When the `<tree-ish>` (most often a commit) is not given, overwrite working tree with the contents in the index.  When the `<tree-ish>` is given, overwrite both the index and the working tree with the contents at the `<tree-ish>`."
-msgstr ""
-"Substitua o conteúdo dos arquivos que correspondem ao `pathspec`.  Quando o "
-"`<tree-ish>` (na maioria das vezes um commit) não for informado, substitua a "
-"árvore de trabalho pelo conteúdo do índice.  Quando o `` for informado, "
-"substitua o índice e a árvore de trabalho pelo conteúdo em `<tree-ish>`."
+msgstr "Substitua o conteúdo dos arquivos que correspondem ao `pathspec`.  Quando o `<tree-ish>` (na maioria das vezes um commit) não for informado, substitua a árvore de trabalho pelo conteúdo do índice.  Quando o `` for informado, substitua o índice e a árvore de trabalho pelo conteúdo em `<tree-ish>`."
 
 #. type: Plain text
 #: en/git-checkout.txt:98
 #, priority:240
 msgid "The index may contain unmerged entries because of a previous failed merge.  By default, if you try to check out such an entry from the index, the checkout operation will fail and nothing will be checked out.  Using `-f` will ignore these unmerged entries.  The contents from a specific side of the merge can be checked out of the index by using `--ours` or `--theirs`.  With `-m`, changes made to the working tree file can be discarded to re-create the original conflicted merge result."
-msgstr ""
-"O índice pode conter lançamentos que não foram mesclados, por causa de uma "
-"falha durante a mesclagem anterior.  É predefinido que caso tente fazer uma "
-"averiguação deste lançamento no índice, a operação de averiguação irá falhar "
-"e nada será retirado.  A utilização da opção `-f` ignorará estes lançamentos "
-"que não foram mesclados.  O conteúdo de um lado específico da mesclagem pode "
-"ser retirado do índice através do uso da opção `--ours` ou `--theirs`.  Com "
-"a opção `-m`, as alterações feitas no arquivo da árvore de trabalho podem "
-"ser descartadas para recriar o resultado da mesclagem do conflito original."
+msgstr "O índice pode conter lançamentos que não foram mesclados, por causa de uma falha durante a mesclagem anterior.  É predefinido que caso tente fazer uma averiguação deste lançamento no índice, a operação de averiguação irá falhar e nada será retirado.  A utilização da opção `-f` ignorará estes lançamentos que não foram mesclados.  O conteúdo de um lado específico da mesclagem pode ser retirado do índice através do uso da opção `--ours` ou `--theirs`.  Com a opção `-m`, as alterações feitas no arquivo da árvore de trabalho podem ser descartadas para recriar o resultado da mesclagem do conflito original."
 
 #. type: Labeled list
 #: en/git-checkout.txt:99
@@ -12866,10 +12080,7 @@ msgstr "'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
 #: en/git-checkout.txt:104
 #, priority:240
 msgid "This is similar to the previous mode, but lets you use the interactive interface to show the \"diff\" output and choose which hunks to use in the result.  See below for the description of `--patch` option."
-msgstr ""
-"Isto é semelhante ao modo anterior, porém permite usar a interface "
-"interativa para exibir o \"diff\" gerado e escolher quais os blocos utilizar "
-"no resultado.  Veja abaixo a descrição da opção `--patch`."
+msgstr "Isto é semelhante ao modo anterior, porém permite usar a interface interativa para exibir o \"diff\" gerado e escolher quais os blocos utilizar no resultado.  Veja abaixo a descrição da opção `--patch`."
 
 #. type: Plain text
 #: en/git-checkout.txt:110 en/git-read-tree.txt:135 en/git-stash.txt:221 en/git-switch.txt:143
@@ -12887,11 +12098,7 @@ msgstr "--no-progress"
 #: en/git-checkout.txt:117 en/git-restore.txt:72 en/git-switch.txt:150
 #, priority:240
 msgid "Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not attached to a terminal, regardless of `--quiet`."
-msgstr ""
-"A condição do progresso é relatado no fluxo de erro predefinido ao estar "
-"conectado em um terminal, a menos que as opções `--quiet` seja utilizados. "
-"Esta opção ativa os relatórios de progresso, mesmo que não estejam anexados "
-"a um terminal, independentemente da opção `--quiet`."
+msgstr "A condição do progresso é relatado no fluxo de erro predefinido ao estar conectado em um terminal, a menos que as opções `--quiet` seja utilizados. Esta opção ativa os relatórios de progresso, mesmo que não estejam anexados a um terminal, independentemente da opção `--quiet`."
 
 #. type: Plain text
 #: en/git-checkout.txt:123
@@ -12933,16 +12140,7 @@ msgstr "Observe que durante o `git rebase` e o `git pull --rebase`, o 'ours' (no
 #: en/git-checkout.txt:146
 #, priority:240
 msgid "This is because `rebase` is used in a workflow that treats the history at the remote as the shared canonical one, and treats the work done on the branch you are rebasing as the third-party work to be integrated, and you are temporarily assuming the role of the keeper of the canonical history during the rebase.  As the keeper of the canonical history, you need to view the history from the remote as `ours` (i.e. \"our shared canonical history\"), while what you did on your side branch as `theirs` (i.e. \"one contributor's work on top of it\")."
-msgstr ""
-"Isso ocorre porque o `rebase` é usado em um fluxo de trabalho que trata o "
-"histórico no ramo remoto como o canônico compartilhado e trata o trabalho "
-"realizado no ramo que você está reconstruindo como o trabalho de terceiros "
-"que será integrado, e você está assumindo temporariamente o papel do "
-"detentor da história canônica durante o \"rebase\".  Como detentor da "
-"história canônica, você precisa ver a história do ramo remoto como `nossa` ("
-"ou seja, a \"nossa história canônica compartilhada\"), enquanto o que você "
-"fez do seu lado se ramifica como `deles` (ou seja, \"o trabalho de um "
-"colaborador no topo dela \")."
+msgstr "Isso ocorre porque o `rebase` é usado em um fluxo de trabalho que trata o histórico no ramo remoto como o canônico compartilhado e trata o trabalho realizado no ramo que você está reconstruindo como o trabalho de terceiros que será integrado, e você está assumindo temporariamente o papel do detentor da história canônica durante o \"rebase\".  Como detentor da história canônica, você precisa ver a história do ramo remoto como `nossa` (ou seja, a \"nossa história canônica compartilhada\"), enquanto o que você fez do seu lado se ramifica como `deles` (ou seja, \"o trabalho de um colaborador no topo dela \")."
 
 #. type: Labeled list
 #: en/git-checkout.txt:147
@@ -12966,41 +12164,25 @@ msgstr "-B <novo-ramo>"
 #: en/git-checkout.txt:156
 #, priority:240
 msgid "Creates the branch `<new_branch>` and start it at `<start_point>`; if it already exists, then reset it to `<start_point>`. This is equivalent to running \"git branch\" with \"-f\"; see linkgit:git-branch[1] for details."
-msgstr ""
-"Cria o `<novo-ramo>` e inicia no `<ponto-de-partida>`; caso já exista, "
-"redefina-o para o `<ponto-de-partida>`. É o mesmo que executar o comando "
-"\"git branch\" com a opção \"-f\"; para mais detalhes, consulte linkgit:git-"
-"branch[1]."
+msgstr "Cria o `<novo-ramo>` e inicia no `<ponto-de-partida>`; caso já exista, redefina-o para o `<ponto-de-partida>`. É o mesmo que executar o comando \"git branch\" com a opção \"-f\"; para mais detalhes, consulte linkgit:git-branch[1]."
 
 #. type: Plain text
 #: en/git-checkout.txt:161
 #, priority:240
 msgid "When creating a new branch, set up \"upstream\" configuration. See \"--track\" in linkgit:git-branch[1] for details."
-msgstr ""
-"Durante a criação de um novo ramo, defina a configuração do \"upstream\". "
-"Para mais detalhes, consulte \"--track\" em linkgit:git-branch[1]."
+msgstr "Durante a criação de um novo ramo, defina a configuração do \"upstream\". Para mais detalhes, consulte \"--track\" em linkgit:git-branch[1]."
 
 #. type: Plain text
 #: en/git-checkout.txt:171
 #, priority:240
 msgid "If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\".  This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`).  If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted.  You can explicitly give a name with `-b` in such a case."
-msgstr ""
-"Caso nenhuma opção `-b` seja utilizada, o nome do novo ramo será derivado do "
-"ramo monitorado remotamente, observando a parte local da \"refspec\" "
-"configurada para o ramo remoto correspondente e removendo a parte inicial em "
-"seguida para o \"*\".  Isso nos diria para usar um `hack` como um ramo local "
-"ao se ramificar do `origin/hack` (ou `remotes/origin/hack` ou até  mesmo do `"
-"refs/remotes/origin/hack`).  Caso o nome informado não tenha barra ou se a "
-"dedução acima resultar em um nome vazio, a dedução será abortada.  Em tais "
-"casos, é possível dar um nome diretamente usando a opção `-b`."
+msgstr "Caso nenhuma opção `-b` seja utilizada, o nome do novo ramo será derivado do ramo monitorado remotamente, observando a parte local da \"refspec\" configurada para o ramo remoto correspondente e removendo a parte inicial em seguida para o \"*\".  Isso nos diria para usar um `hack` como um ramo local ao se ramificar do `origin/hack` (ou `remotes/origin/hack` ou até  mesmo do `refs/remotes/origin/hack`).  Caso o nome informado não tenha barra ou se a dedução acima resultar em um nome vazio, a dedução será abortada.  Em tais casos, é possível dar um nome diretamente usando a opção `-b`."
 
 #. type: Plain text
 #: en/git-checkout.txt:175 en/git-switch.txt:170
 #, priority:240
 msgid "Do not set up \"upstream\" configuration, even if the `branch.autoSetupMerge` configuration variable is true."
-msgstr ""
-"Não configure \"upstream\" mesmo que a variável de configuração `branch."
-"autoSetupMerge` seja verdadeira."
+msgstr "Não configure \"upstream\" mesmo que a variável de configuração `branch.autoSetupMerge` seja verdadeira."
 
 #. type: Labeled list
 #: en/git-checkout.txt:176 en/git-switch.txt:87
@@ -13024,14 +12206,7 @@ msgstr "Caso o `<ramo>` não seja encontrado mas exista uma ramificação de ras
 #: en/git-checkout.txt:194 en/git-switch.txt:104 en/git-worktree.txt:71
 #, priority:240
 msgid "If the branch exists in multiple remotes and one of them is named by the `checkout.defaultRemote` configuration variable, we'll use that one for the purposes of disambiguation, even if the `<branch>` isn't unique across all remotes. Set it to e.g. `checkout.defaultRemote=origin` to always checkout remote branches from there if `<branch>` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]."
-msgstr ""
-"Caso o ramo exista em diversos ramos remotos e um deles seja nomeado pela "
-"variável de configuração `checkout.defaultRemote`, para propósitos de "
-"desambiguação, mesmo que `<ramo>` não seja o único em todos os outros ramos "
-"remotos. Defina como por exemplo, `checkout.defaultRemote=origin` para que "
-"sempre verifique as ramificações remotas de lá caso `<ramo>` seja ambíguo e "
-"ainda assim `origin` exista. Consulte também `checkout.defaultRemote` em "
-"linkgit:git-config[1]."
+msgstr "Caso o ramo exista em diversos ramos remotos e um deles seja nomeado pela variável de configuração `checkout.defaultRemote`, para propósitos de desambiguação, mesmo que `<ramo>` não seja o único em todos os outros ramos remotos. Defina como por exemplo, `checkout.defaultRemote=origin` para que sempre verifique as ramificações remotas de lá caso `<ramo>` seja ambíguo e ainda assim `origin` exista. Consulte também `checkout.defaultRemote` em linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-checkout.txt:196
@@ -13046,7 +12221,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr "Crie o reflog da nova ramificação; veja linkgit:git-branch[1] para detalhes."
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13055,11 +12230,7 @@ msgstr "--detach"
 #: en/git-checkout.txt:207
 #, priority:240
 msgid "Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments.  This is the default behavior of `git checkout <commit>` when `<commit>` is not a branch name.  See the \"DETACHED HEAD\" section below for details."
-msgstr ""
-"Em vez de averiguar um ramo para trabalhar nele, verifique um commit para a "
-"inspeção e para experimentos que sejam descartáveis.  Este é o comportamento "
-"predefinido do comando `git checkout` quando `<commit>`não for um nome do "
-"ramo.  Para obter mais detalhes, consulte a seção \"HEAD DESANEXADO\" abaixo."
+msgstr "Em vez de averiguar um ramo para trabalhar nele, verifique um commit para a inspeção e para experimentos que sejam descartáveis.  Este é o comportamento predefinido do comando `git checkout` quando `<commit>`não for um nome do ramo.  Para obter mais detalhes, consulte a seção \"HEAD DESANEXADO\" abaixo."
 
 #. type: Labeled list
 #: en/git-checkout.txt:208
@@ -13071,45 +12242,25 @@ msgstr "--orphan <novo-ramo>"
 #: en/git-checkout.txt:214
 #, priority:240
 msgid "Create a new 'orphan' branch, named `<new_branch>`, started from `<start_point>` and switch to it.  The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits."
-msgstr ""
-"Crie um novo ramo 'orphan', chamado `<novo-ramo>`, iniciado a partir do "
-"`<ponto-de-partida>` e alterne para ele.  O primeiro commit feito neste novo "
-"ramo não terá pais e será a raiz de um novo histórico totalmente "
-"desconectado de todos os outros ramos e commits."
+msgstr "Crie um novo ramo 'orphan', chamado `<novo-ramo>`, iniciado a partir do `<ponto-de-partida>` e alterne para ele.  O primeiro commit feito neste novo ramo não terá pais e será a raiz de um novo histórico totalmente desconectado de todos os outros ramos e commits."
 
 #. type: Plain text
 #: en/git-checkout.txt:219
 #, priority:240
 msgid "The index and the working tree are adjusted as if you had previously run `git checkout <start_point>`.  This allows you to start a new history that records a set of paths similar to `<start_point>` by easily running `git commit -a` to make the root commit."
-msgstr ""
-"O índice e a árvore de trabalho são ajustadas como se você tivesse rodado o "
-"comando `git checkout <ponto-de-partida>` antes.  Isto permite que você "
-"inicie um novo histórico que registra um conjunto dos caminhos semelhante ao "
-"`<ponto-de-partida>` através da execução do comando `git commit -a` para "
-"fazer o commit principal."
+msgstr "O índice e a árvore de trabalho são ajustadas como se você tivesse rodado o comando `git checkout <ponto-de-partida>` antes.  Isto permite que você inicie um novo histórico que registra um conjunto dos caminhos semelhante ao `<ponto-de-partida>` através da execução do comando `git commit -a` para fazer o commit principal."
 
 #. type: Plain text
 #: en/git-checkout.txt:225
 #, priority:240
 msgid "This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish an open source branch of a project whose current tree is \"clean\", but whose full history contains proprietary or otherwise encumbered bits of code."
-msgstr ""
-"Isso pode ser útil quando você quer publicar a árvore a partir de um commit "
-"sem expor o seu histórico completo. Você pode fazer isso para publicar um "
-"ramo de código aberto de um projeto cuja árvore atual esteja \"limpa\", mas "
-"cujo histórico completo contenha pequenos pedaços de código proprietário "
-"amontoados."
+msgstr "Isso pode ser útil quando você quer publicar a árvore a partir de um commit sem expor o seu histórico completo. Você pode fazer isso para publicar um ramo de código aberto de um projeto cuja árvore atual esteja \"limpa\", mas cujo histórico completo contenha pequenos pedaços de código proprietário amontoados."
 
 #. type: Plain text
 #: en/git-checkout.txt:232
 #, priority:240
 msgid "If you want to start a disconnected history that records a set of paths that is totally different from the one of `<start_point>`, then you should clear the index and the working tree right after creating the orphan branch by running `git rm -rf .` from the top level of the working tree.  Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc."
-msgstr ""
-"Caso queira iniciar um histórico desconectado que registre um conjunto dos "
-"caminhos totalmente diferentes de um dos `<ponto-de-partida>`, limpe o "
-"índice e a árvore de trabalho logo após criar o ramo órfão executando o "
-"comando `git rm -rf.` Do cume da árvore de trabalho.  Depois, você estará "
-"pronto para preparar os seus arquivos novos, populando novamente a árvore de "
-"trabalho, copiando-os dos outros lugares, extraindo um tarball, etc."
+msgstr "Caso queira iniciar um histórico desconectado que registre um conjunto dos caminhos totalmente diferentes de um dos `<ponto-de-partida>`, limpe o índice e a árvore de trabalho logo após criar o ramo órfão executando o comando `git rm -rf.` Do cume da árvore de trabalho.  Depois, você estará pronto para preparar os seus arquivos novos, populando novamente a árvore de trabalho, copiando-os dos outros lugares, extraindo um tarball, etc."
 
 #. type: Labeled list
 #: en/git-checkout.txt:233 en/git-restore.txt:100
@@ -13121,11 +12272,7 @@ msgstr "--ignore-skip-worktree-bits"
 #: en/git-checkout.txt:238
 #, priority:240
 msgid "In sparse checkout mode, `git checkout -- <paths>` would update only entries matched by `<paths>` and sparse patterns in `$GIT_DIR/info/sparse-checkout`. This option ignores the sparse patterns and adds back any files in `<paths>`."
-msgstr ""
-"É predefinido que no modo de averiguação esparsa, apenas as entradas que "
-"sejam coincidentes com `<pathspec>` e com os padrões esparsos em `$GIT_DIR/"
-"info/sparse-checkout`. Esta opção ignora os padrões esparsos e os adiciona "
-"de volta nos arquivos em `<pathspec>`."
+msgstr "É predefinido que no modo de averiguação esparsa, apenas as entradas que sejam coincidentes com `<pathspec>` e com os padrões esparsos em `$GIT_DIR/info/sparse-checkout`. Esta opção ignora os padrões esparsos e os adiciona de volta nos arquivos em `<pathspec>`."
 
 #. type: Labeled list
 #: en/git-checkout.txt:240 en/git-rebase.txt:347 en/git-rebase.txt:619 en/git-reset.txt:74 en/git-restore.txt:83 en/git-submodule.txt:365 en/git-svn.txt:676 en/git-switch.txt:119 en/rev-list-options.txt:299
@@ -13137,31 +12284,19 @@ msgstr "--merge"
 #: en/git-checkout.txt:249
 #, priority:240
 msgid "When switching branches, if you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context.  However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
-msgstr ""
-"Ao fazer a alternância das ramificações, caso haja alterações locais em um "
-"ou mais arquivos diferentes entre o ramo atual e o ramo para aonde você está "
-"alternando, o comando se recusará a alternar as ramificações, visando "
-"preservar as suas alterações dada a circunstância.  Contudo, com esta opção, "
-"é feita uma mesclagem de três vias entre o ramo atual, o conteúdo da árvore "
-"de trabalho e o novo ramo, fazendo com que você esteja neste novo ramo."
+msgstr "Ao fazer a alternância das ramificações, caso haja alterações locais em um ou mais arquivos diferentes entre o ramo atual e o ramo para aonde você está alternando, o comando se recusará a alternar as ramificações, visando preservar as suas alterações dada a circunstância.  Contudo, com esta opção, é feita uma mesclagem de três vias entre o ramo atual, o conteúdo da árvore de trabalho e o novo ramo, fazendo com que você esteja neste novo ramo."
 
 #. type: Plain text
 #: en/git-checkout.txt:254 en/git-switch.txt:132
 #, priority:240
 msgid "When a merge conflict happens, the index entries for conflicting paths are left unmerged, and you need to resolve the conflicts and mark the resolved paths with `git add` (or `git rm` if the merge should result in deletion of the path)."
-msgstr ""
-"Quando ocorre um conflito durante a mesclagem, as entradas do índice para os "
-"caminhos conflitantes não são mesclados, sendo necessário que você resolva "
-"os conflitos e marque os caminhos resolvidos com `git add` (ou `git rm` caso "
-"a mesclagem resulte na exclusão do caminho) ."
+msgstr "Quando ocorre um conflito durante a mesclagem, as entradas do índice para os caminhos conflitantes não são mesclados, sendo necessário que você resolva os conflitos e marque os caminhos resolvidos com `git add` (ou `git rm` caso a mesclagem resulte na exclusão do caminho) ."
 
 #. type: Plain text
 #: en/git-checkout.txt:257
 #, priority:240
 msgid "When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths."
-msgstr ""
-"Ao efetuar a averiguação dos caminhos do índice, essa opção permite recriar "
-"a mesclagem conflitante nos caminhos especificados."
+msgstr "Ao efetuar a averiguação dos caminhos do índice, essa opção permite recriar a mesclagem conflitante nos caminhos especificados."
 
 #. type: Plain text
 #: en/git-checkout.txt:259
@@ -13179,22 +12314,13 @@ msgstr "--conflict=<estilo>"
 #: en/git-checkout.txt:266 en/git-restore.txt:93 en/git-switch.txt:139
 #, priority:240
 msgid "The same as `--merge` option above, but changes the way the conflicting hunks are presented, overriding the `merge.conflictStyle` configuration variable.  Possible values are \"merge\" (default) and \"diff3\" (in addition to what is shown by \"merge\" style, shows the original contents)."
-msgstr ""
-"O mesmo que a opção `--merge` acima, porém altera a maneira como os blocos "
-"conflitantes são apresentados, ao substituir a variável de configuração "
-"`merge.conflictStyle`.  Os valores possíveis são `merge` (predefinido) e "
-"`diff3` (além do que é exibido através do estilo \"merge\", exibe os "
-"conteúdos originais)."
+msgstr "O mesmo que a opção `--merge` acima, porém altera a maneira como os blocos conflitantes são apresentados, ao substituir a variável de configuração `merge.conflictStyle`.  Os valores possíveis são `merge` (predefinido) e `diff3` (além do que é exibido através do estilo \"merge\", exibe os conteúdos originais)."
 
 #. type: Plain text
 #: en/git-checkout.txt:273
 #, priority:240
 msgid "Interactively select hunks in the difference between the `<tree-ish>` (or the index, if unspecified) and the working tree.  The chosen hunks are then applied in reverse to the working tree (and if a `<tree-ish>` was specified, the index)."
-msgstr ""
-"Selecione blocos de forma interativa com a diferença entre o `<tree-ish>` ("
-"ou o índice, caso não esteja definido) e a árvore de trabalho.  Os blocos "
-"escolhidos são então aplicados em ordem reversa na árvore de trabalho (e "
-"caso um `<tree-ish>` foi definido, o índice)."
+msgstr "Selecione blocos de forma interativa com a diferença entre o `<tree-ish>` (ou o índice, caso não esteja definido) e a árvore de trabalho.  Os blocos escolhidos são então aplicados em ordem reversa na árvore de trabalho (e caso um `<tree-ish>` foi definido, o índice)."
 
 #. type: Plain text
 #: en/git-checkout.txt:277
@@ -13218,11 +12344,7 @@ msgstr "--ignore-other-worktrees"
 #: en/git-checkout.txt:286
 #, priority:240
 msgid "`git checkout` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
-msgstr ""
-"O comando `git checkout` irá se recusar quando a \"ref\" desejada já tenha "
-"sido averiguada através de uma outra árvore de trabalho. Esta opção faz com "
-"que ele averigue a \"ref\" mesmo assim. Em outras palavras, a \"ref\" pode "
-"ser mantida por mais de uma árvore de trabalho."
+msgstr "O comando `git checkout` irá se recusar quando a \"ref\" desejada já tenha sido averiguada através de uma outra árvore de trabalho. Esta opção faz com que ele averigue a \"ref\" mesmo assim. Em outras palavras, a \"ref\" pode ser mantida por mais de uma árvore de trabalho."
 
 #. type: Labeled list
 #: en/git-checkout.txt:287 en/git-merge.txt:90
@@ -13252,14 +12374,7 @@ msgstr "--recurse-submodules"
 #: en/git-checkout.txt:302
 #, priority:240
 msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`)  is used, submodules working trees will not be updated.  Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"O uso da opção `--recurse-submodules` atualizará o conteúdo de todos os "
-"submódulos ativos de acordo com commit gravado no superprojeto. Caso as "
-"alterações locais em um submódulo forem sobrescritos, a averiguação falhará, "
-"a menos que a opção `-f` seja utilizado. Caso nada (ou a opção `--no-recurse-"
-"submodules`) seja utilizado, os submódulos que trabalham nas árvores não "
-"serão atualizados.  Assim como linkgit:git-submodule[1], isso faz com que o "
-"`HEAD` seja desanexando do submódulo."
+msgstr "O uso da opção `--recurse-submodules` atualizará o conteúdo de todos os submódulos ativos de acordo com commit gravado no superprojeto. Caso as alterações locais em um submódulo forem sobrescritos, a averiguação falhará, a menos que a opção `-f` seja utilizado. Caso nada (ou a opção `--no-recurse-submodules`) seja utilizado, os submódulos que trabalham nas árvores não serão atualizados.  Assim como linkgit:git-submodule[1], isso faz com que o `HEAD` seja desanexando do submódulo."
 
 #. type: Labeled list
 #: en/git-checkout.txt:303 en/git-restore.txt:118
@@ -13289,12 +12404,7 @@ msgstr "<ramo>"
 #: en/git-checkout.txt:330
 #, priority:240
 msgid "Branch to checkout; if it refers to a branch (i.e., a name that, when prepended with \"refs/heads/\", is a valid ref), then that branch is checked out. Otherwise, if it refers to a valid commit, your `HEAD` becomes \"detached\" and you are no longer on any branch (see below for details)."
-msgstr ""
-"O ramo que será averiguado; caso se referira a um ramo (ou seja, um nome "
-"que, quando anexado com \"refs/heads/\", seja uma \"ref\" válida), então "
-"este ramo será retirado. Caso contrário, caso tenha referência para um "
-"commit inválido, o seu `HEAD` se torna \"desanexado\" e você não estará mais "
-"em qualquer outro ramo (veja mais detalhes abaixo)."
+msgstr "O ramo que será averiguado; caso se referira a um ramo (ou seja, um nome que, quando anexado com \"refs/heads/\", seja uma \"ref\" válida), então este ramo será retirado. Caso contrário, caso tenha referência para um commit inválido, o seu `HEAD` se torna \"desanexado\" e você não estará mais em qualquer outro ramo (veja mais detalhes abaixo)."
 
 #. type: Plain text
 #: en/git-checkout.txt:334
@@ -13306,11 +12416,7 @@ msgstr "Você pode usar a sintaxe `@{- N}` para se referir ao último ramo/commi
 #: en/git-checkout.txt:338 en/git-switch.txt:58
 #, ignore-ellipsis, priority:240
 msgid "As a special case, you may use `A...B` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr ""
-"Como um caso especial, você pode usar `A...B` como um atalho para a "
-"mesclagem na base de `A` e` B` se houver exatamente uma base a ser mesclada. "
-"Você pode deixar de fora, no máximo, um de `A` e` B`, no caso, a "
-"predefinição retorna para `HEAD`."
+msgstr "Como um caso especial, você pode usar `A...B` como um atalho para a mesclagem na base de `A` e` B` se houver exatamente uma base a ser mesclada. Você pode deixar de fora, no máximo, um de `A` e` B`, no caso, a predefinição retorna para `HEAD`."
 
 #. type: Labeled list
 #: en/git-checkout.txt:339
@@ -13334,27 +12440,19 @@ msgstr "<ponto-de-partida>"
 #: en/git-checkout.txt:345
 #, priority:240
 msgid "The name of a commit at which to start the new branch; see linkgit:git-branch[1] for details. Defaults to `HEAD`."
-msgstr ""
-"O nome do commit onde o ramo deve iniciar; para mais detalhes consulte "
-"linkgit:git-branch[1]. A predefinição retorna para `HEAD`."
+msgstr "O nome do commit onde o ramo deve iniciar; para mais detalhes consulte linkgit:git-branch[1]. A predefinição retorna para `HEAD`."
 
 #. type: Plain text
 #: en/git-checkout.txt:349
 #, ignore-ellipsis, priority:240
 msgid "As a special case, you may use `\"A...B\"` as a shortcut for the merge base of `A` and `B` if there is exactly one merge base. You can leave out at most one of `A` and `B`, in which case it defaults to `HEAD`."
-msgstr ""
-"Como um caso especial, é possível utilizar `\"A...B\"` como um atalho como "
-"uma base para a mesclagem de `A` e `B` caso exista exatamente uma base de "
-"merge. Você pode deixar de fora, no máximo, um de `A` e` B`, caso onde a "
-"predefinição retorna para `HEAD`."
+msgstr "Como um caso especial, é possível utilizar `\"A...B\"` como um atalho como uma base para a mesclagem de `A` e `B` caso exista exatamente uma base de merge. Você pode deixar de fora, no máximo, um de `A` e` B`, caso onde a predefinição retorna para `HEAD`."
 
 #. type: Plain text
 #: en/git-checkout.txt:353
 #, priority:240
 msgid "Tree to checkout from (when paths are given). If not specified, the index will be used."
-msgstr ""
-"Árvore que será averiguada (quando os caminhos são informados). Caso não "
-"seja informado, o índice será usado."
+msgstr "Árvore que será averiguada (quando os caminhos são informados). Caso não seja informado, o índice será usado."
 
 #. type: Plain text
 #: en/git-checkout.txt:359 en/git-reset.txt:130 en/git-restore.txt:143
@@ -13378,11 +12476,7 @@ msgstr "HEAD DESANEXADO"
 #: en/git-checkout.txt:367
 #, priority:240
 msgid "`HEAD` normally refers to a named branch (e.g. `master`). Meanwhile, each branch refers to a specific commit. Let's look at a repo with three commits, one of them tagged, and with branch `master` checked out:"
-msgstr ""
-"O `HEAD` normalmente se refere a um determinado ramo (como por exemplo, "
-"`master`). Enquanto isso, cada ramo se refere a um commit em específico. "
-"Vejamos um repositório com três commits, um deles marcado e com o ramo "
-"`master` averiguado:"
+msgstr "O `HEAD` normalmente se refere a um determinado ramo (como por exemplo, `master`). Enquanto isso, cada ramo se refere a um commit em específico. Vejamos um repositório com três commits, um deles marcado e com o ramo `master` averiguado:"
 
 #. type: delimited block -
 #: en/git-checkout.txt:376
@@ -13408,12 +12502,7 @@ msgstr ""
 #: en/git-checkout.txt:383
 #, priority:240
 msgid "When a commit is created in this state, the branch is updated to refer to the new commit. Specifically, 'git commit' creates a new commit `d`, whose parent is commit `c`, and then updates branch `master` to refer to new commit `d`. `HEAD` still refers to branch `master` and so indirectly now refers to commit `d`:"
-msgstr ""
-"Quando um commit é criado nest condição, o ramo é atualizado para se referir "
-"ao novo commit. Em específico o comando 'git commit' que cria um novo commit "
-"`d`, cujo pai é o commit `c`, que atualiza o ramo `master` para ter "
-"referência com o novo commit `d`. O `HEAD` ainda se refere ao ramo `master` "
-"e agora indiretamente, refere ao commit `d`:"
+msgstr "Quando um commit é criado nest condição, o ramo é atualizado para se referir ao novo commit. Em específico o comando 'git commit' que cria um novo commit `d`, cujo pai é o commit `c`, que atualiza o ramo `master` para ter referência com o novo commit `d`. O `HEAD` ainda se refere ao ramo `master` e agora indiretamente, refere ao commit `d`:"
 
 #. type: delimited block -
 #: en/git-checkout.txt:386 en/git-checkout.txt:421 en/git-checkout.txt:438
@@ -13445,11 +12534,7 @@ msgstr ""
 #: en/git-checkout.txt:400
 #, priority:240
 msgid "It is sometimes useful to be able to checkout a commit that is not at the tip of any named branch, or even to create a new commit that is not referenced by a named branch. Let's look at what happens when we checkout commit `b` (here we show two ways this may be done):"
-msgstr ""
-"Às vezes, é útil poder fazer a averiguação de um commit que não está no topo "
-"de qualquer ramo conhecido ou mesmo para criar um novo commit que não seja "
-"referenciado por nenhum outro ramo conhecido. Vejamos o que acontece quando "
-"fazemos a averiguação do commit `b` (aqui exibimos duas maneiras de faze-lo):"
+msgstr "Às vezes, é útil poder fazer a averiguação de um commit que não está no topo de qualquer ramo conhecido ou mesmo para criar um novo commit que não seja referenciado por nenhum outro ramo conhecido. Vejamos o que acontece quando fazemos a averiguação do commit `b` (aqui exibimos duas maneiras de faze-lo):"
 
 #. type: delimited block -
 #: en/git-checkout.txt:404
@@ -13697,9 +12782,7 @@ msgstr "Observe as aspas em torno de `* .c`.  O arquivo `hello.c` também será
 #: en/git-checkout.txt:542
 #, priority:240
 msgid "If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch.  You should instead write:"
-msgstr ""
-"Caso tenha um ramo chamado `hello.c`, esta etapa será confundida como uma "
-"instrução para alternar para este ramo.  Você deve então escrever:"
+msgstr "Caso tenha um ramo chamado `hello.c`, esta etapa será confundida como uma instrução para alternar para este ramo.  Você deve então escrever:"
 
 #. type: delimited block -
 #: en/git-checkout.txt:545
@@ -13739,9 +12822,7 @@ msgstr ""
 #: en/git-checkout.txt:565 en/git-switch.txt:217
 #, priority:240
 msgid "You can give the `-m` flag to the command, which would try a three-way merge:"
-msgstr ""
-"Você pode repassar a opção`-m` ao comando, que tentaria uma mesclagem de "
-"três vias:"
+msgstr "Você pode repassar a opção`-m` ao comando, que tentaria uma mesclagem de três vias:"
 
 #. type: delimited block -
 #: en/git-checkout.txt:569
@@ -13783,11 +12864,7 @@ msgstr ""
 #: en/git-checkout.txt:589
 #, priority:240
 msgid "At this point, `git diff` shows the changes cleanly merged as in the previous example, as well as the changes in the conflicted files.  Edit and resolve the conflict and mark it resolved with `git add` as usual:"
-msgstr ""
-"Neste ponto, o comando `git diff` exibe as alterações mescladas de maneira "
-"limpa, como no exemplo anterior, bem como as alterações nos arquivos "
-"conflitantes.  Edite e resolva o conflito marcando-o como resolvido através "
-"do comando `git add` como de costume:"
+msgstr "Neste ponto, o comando `git diff` exibe as alterações mescladas de maneira limpa, como no exemplo anterior, bem como as alterações nos arquivos conflitantes.  Edite e resolva o conflito marcando-o como resolvido através do comando `git add` como de costume:"
 
 #. type: delimited block -
 #: en/git-checkout.txt:593
@@ -13815,8 +12892,7 @@ msgstr "git-check-ref-format(1)"
 #: en/git-check-ref-format.txt:7
 #, priority:100
 msgid "git-check-ref-format - Ensures that a reference name is well formed"
-msgstr ""
-"git-check-ref-format - Garanta que um nome da referência esteja bem formado"
+msgstr "git-check-ref-format - Garanta que um nome da referência esteja bem formado"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:15
@@ -13842,13 +12918,7 @@ msgstr "Verifica se um determinado 'refnome' é aceitável e sai com um status d
 #: en/git-check-ref-format.txt:27
 #, priority:100
 msgid "A reference is used in Git to specify branches and tags.  A branch head is stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
-msgstr ""
-"Uma referência é usada no Git para definir as ramificações e as tags.  Um "
-"cabeçalho de um ramo é armazenado dentro da hierarquia `refs/heads`, "
-"enquanto uma tag é armazenada na hierarquia `refs/tags` do espaço de nomes "
-"da ref (geralmente nos diretórios `$GIT_DIR/refs/heads` e no `$GIT_DIR/refs/"
-"tags` ou nas entradas do arquivo no `$GIT_DIR/packed-refs` caso a \"ref\" "
-"tenha sido empacotada através do comando `git gc`)."
+msgstr "Uma referência é usada no Git para definir as ramificações e as tags.  Um cabeçalho de um ramo é armazenado dentro da hierarquia `refs/heads`, enquanto uma tag é armazenada na hierarquia `refs/tags` do espaço de nomes da ref (geralmente nos diretórios `$GIT_DIR/refs/heads` e no `$GIT_DIR/refs/tags` ou nas entradas do arquivo no `$GIT_DIR/packed-refs` caso a \"ref\" tenha sido empacotada através do comando `git gc`)."
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:29
@@ -13866,10 +12936,7 @@ msgstr "Eles podem incluir slash `/` para agrupamento hierárquico (diretório),
 #: en/git-check-ref-format.txt:38
 #, priority:100
 msgid "They must contain at least one `/`. This enforces the presence of a category like `heads/`, `tags/` etc. but the actual names are not restricted.  If the `--allow-onelevel` option is used, this rule is waived."
-msgstr ""
-"Eles devem ter pelo menos um `/`. Isto reforça a presença de uma categoria "
-"como `heads/`, `tags/` etc. Porém os nomes reais não são restritos.  Caso a "
-"opção `--allow-onelevel` seja utilizada, esta regra será dispensada."
+msgstr "Eles devem ter pelo menos um `/`. Isto reforça a presença de uma categoria como `heads/`, `tags/` etc. Porém os nomes reais não são restritos.  Caso a opção `--allow-onelevel` seja utilizada, esta regra será dispensada."
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:40
@@ -13887,10 +12954,7 @@ msgstr "Eles não podem ter caracteres de controle ASCII (ou seja, bytes cujos v
 #: en/git-check-ref-format.txt:48
 #, priority:100
 msgid "They cannot have question-mark `?`, asterisk `*`, or open bracket `[` anywhere.  See the `--refspec-pattern` option below for an exception to this rule."
-msgstr ""
-"Eles não podem ter ponto de interrogação `?`, asterisco `*`, ou colchete "
-"aberto `[` em qualquer lugar.  Consulte a opção `--refspec-pattern` abaixo "
-"para uma exceção a esta regra."
+msgstr "Eles não podem ter ponto de interrogação `?`, asterisco `*`, ou colchete aberto `[` em qualquer lugar.  Consulte a opção `--refspec-pattern` abaixo para uma exceção a esta regra."
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:52
@@ -13944,11 +13008,7 @@ msgstr "Um til `~` e um caractere circunflexo `^` são utilizados para introduzi
 #: en/git-check-ref-format.txt:77
 #, priority:100
 msgid "A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and store it in dstref\" in fetch and push operations.  It may also be used to select a specific object such as with 'git cat-file': \"git cat-file blob v1.3.3:refs.c\"."
-msgstr ""
-"Os dois pontos `:` são usados no `srcref:dstref` no sentido de \"use o valor "
-"do srcref\\ e armazene-o no dstref\" nas operações \"fetch\" e \"push\".  "
-"Também para ser usado para selecionar um objeto em específico como com o "
-"comando `git cat-file`: \"git cat-file blob v1.3.3:refs.c\"."
+msgstr "Os dois pontos `:` são usados no `srcref:dstref` no sentido de \"use o valor do srcref\\ e armazene-o no dstref\" nas operações \"fetch\" e \"push\".  Também para ser usado para selecionar um objeto em específico como com o comando `git cat-file`: \"git cat-file blob v1.3.3:refs.c\"."
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:79
@@ -13972,10 +13032,7 @@ msgstr "--[no-]allow-onelevel"
 #: en/git-check-ref-format.txt:105
 #, priority:100
 msgid "Controls whether one-level refnames are accepted (i.e., refnames that do not contain multiple `/`-separated components).  The default is `--no-allow-onelevel`."
-msgstr ""
-"Controla se os refnames com um nível serão aceitos (isto é, refnames que não "
-"tenham vários componentes separados por `/`).  A predefinição é `--no-allow-"
-"onelevel`."
+msgstr "Controla se os refnames com um nível serão aceitos (isto é, refnames que não tenham vários componentes separados por `/`).  A predefinição é `--no-allow-onelevel`."
 
 #. type: Labeled list
 #: en/git-check-ref-format.txt:106
@@ -13987,11 +13044,7 @@ msgstr "--refspec-pattern"
 #: en/git-check-ref-format.txt:112
 #, priority:100
 msgid "Interpret <refname> as a reference name pattern for a refspec (as used with remote repositories).  If this option is enabled, <refname> is allowed to contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` but not `foo/bar*/baz*`)."
-msgstr ""
-"Interprete o <refname> como um padrão do nome para um refspec (conforme é "
-"utilizado com os repositórios remotos).  Caso esta opção esteja ativada, o "
-"<refname> poderá conter um único `*` no refspec (como por exemplo, `foo/"
-"bar*/baz` ou `foo/bar*baz/` mas não `foo/bar*/baz*`)."
+msgstr "Interprete o <refname> como um padrão do nome para um refspec (conforme é utilizado com os repositórios remotos).  Caso esta opção esteja ativada, o <refname> poderá conter um único `*` no refspec (como por exemplo, `foo/bar*/baz` ou `foo/bar*baz/` mas não `foo/bar*/baz*`)."
 
 #. type: Labeled list
 #: en/git-check-ref-format.txt:113
@@ -14003,13 +13056,7 @@ msgstr "--normalize"
 #: en/git-check-ref-format.txt:120
 #, priority:100
 msgid "Normalize 'refname' by removing any leading slash (`/`)  characters and collapsing runs of adjacent slashes between name components into a single slash.  If the normalized refname is valid then print it to standard output and exit with a status of 0, otherwise exit with a non-zero status.  (`--print` is a deprecated way to spell `--normalize`.)"
-msgstr ""
-"Normalize 'refname' removendo quaisquer caracteres iniciais com barra (`/`) "
-"e reduzindo as execuções das barras adjacentes entre os nomes dos "
-"componentes em uma única barra.  Caso o 'refname' normalizado seja válido, "
-"imprima-o na saída padrão e encerre com a condição 0, caso contrário encerre "
-"com uma condição diferente de zero.  (a opção `--print` é uma maneira "
-"obsoleta de soletrar `--normalize`.)"
+msgstr "Normalize 'refname' removendo quaisquer caracteres iniciais com barra (`/`) e reduzindo as execuções das barras adjacentes entre os nomes dos componentes em uma única barra.  Caso o 'refname' normalizado seja válido, imprima-o na saída padrão e encerre com a condição 0, caso contrário encerre com uma condição diferente de zero.  (a opção `--print` é uma maneira obsoleta de soletrar `--normalize`.)"
 
 #. type: Plain text
 #: en/git-check-ref-format.txt:126
@@ -14067,11 +13114,7 @@ msgstr ""
 #: en/git-cherry-pick.txt:21
 #, priority:100
 msgid "Given one or more existing commits, apply the change each one introduces, recording a new commit for each.  This requires your working tree to be clean (no modifications from the HEAD commit)."
-msgstr ""
-"Dado um ou mais commits existentes, aplique a alteração que cada um "
-"introduz, registrando um novo commit para cada um.  Isso requer que a sua "
-"árvore de trabalho esteja limpa (nenhuma alteração a partir do commit "
-"`HEAD`)."
+msgstr "Dado um ou mais commits existentes, aplique a alteração que cada um introduz, registrando um novo commit para cada um.  Isso requer que a sua árvore de trabalho esteja limpa (nenhuma alteração a partir do commit `HEAD`)."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:24
@@ -14101,11 +13144,7 @@ msgstr "Caminhos nos quais a mudança aplicada corretamente são atualizados no
 #: en/git-cherry-pick.txt:36
 #, priority:100
 msgid "For conflicting paths, the index file records up to three versions, as described in the \"TRUE MERGE\" section of linkgit:git-merge[1].  The working tree files will include a description of the conflict bracketed by the usual conflict markers `<<<<<<<` and `>>>>>>>`."
-msgstr ""
-"Para os caminhos conflitantes, o arquivo do índice registra até três "
-"versões, conforme descrito na seção \"MESCLAGEM REAL\" do linkgit:git-"
-"merge[1].  Os arquivos da árvore de trabalho incluirão uma descrição do "
-"conflito entre os marcadores de conflito habituais `<<<<<<<` e `>>>>>>>`."
+msgstr "Para os caminhos conflitantes, o arquivo do índice registra até três versões, conforme descrito na seção \"MESCLAGEM REAL\" do linkgit:git-merge[1].  Os arquivos da árvore de trabalho incluirão uma descrição do conflito entre os marcadores de conflito habituais `<<<<<<<` e `>>>>>>>`."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:37
@@ -14129,15 +13168,7 @@ msgstr "<commit>..."
 #: en/git-cherry-pick.txt:52
 #, ignore-ellipsis, priority:100
 msgid "Commits to cherry-pick.  For a more complete list of ways to spell commits, see linkgit:gitrevisions[7].  Sets of commits can be passed but no traversal is done by default, as if the `--no-walk` option was specified, see linkgit:git-rev-list[1]. Note that specifying a range will feed all <commit>... arguments to a single revision walk (see a later example that uses 'maint master..next')."
-msgstr ""
-"Faz o commit na escolha seletiva.  Para conhecer uma lista completa das "
-"diferentes maneiras de soletrar os nomes dos commits, consulte o comando "
-"linkgit:gitrevisions[7]  O conjunto dos commits também podem ser "
-"encaminhados porém é predefinido que nenhuma passagem seja feita, consulte o "
-"comando linkgit:git-rev-list[1] assim como a sua opção `--no-walk`. Observe "
-"que ao definir um argumento para o intervalo, este irá alimentar todos os "
-"<commit>... percorrendo apenas uma revisão (mais adiante, consulte um "
-"exemplo que utiliza 'maint master..next')."
+msgstr "Faz o commit na escolha seletiva.  Para conhecer uma lista completa das diferentes maneiras de soletrar os nomes dos commits, consulte o comando linkgit:gitrevisions[7]  O conjunto dos commits também podem ser encaminhados porém é predefinido que nenhuma passagem seja feita, consulte o comando linkgit:git-rev-list[1] assim como a sua opção `--no-walk`. Observe que ao definir um argumento para o intervalo, este irá alimentar todos os <commit>... percorrendo apenas uma revisão (mais adiante, consulte um exemplo que utiliza 'maint master..next')."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:57
@@ -14167,26 +13198,13 @@ msgstr "-x"
 #: en/git-cherry-pick.txt:78
 #, ignore-ellipsis, priority:100
 msgid "When recording the commit, append a line that says \"(cherry picked from commit ...)\" to the original commit message in order to indicate which commit this change was cherry-picked from.  This is done only for cherry picks without conflicts.  Do not use this option if you are cherry-picking from your private branch because the information is useless to the recipient.  If on the other hand you are cherry-picking between two publicly visible branches (e.g. backporting a fix to a maintenance branch for an older release from a development branch), adding this information can be useful."
-msgstr ""
-"Ao gravar o commit, acrescente uma linha que diz \"(cherry picked from "
-"commit ...)\" na mensagem do commit original, indicando de onde a escolha "
-"seletiva da alteração deste commit foi feito.  Isto é feito apenas para as "
-"escolhas seletivas sem conflitos.  Não use esta opção caso esteja fazendo "
-"uma escolha seletiva do seu ramo privado porque a informação é inútil para o "
-"destinatário.  No entanto, caso esteja fazendo uma escolha seletiva entre "
-"dois ramos publicamente visíveis (como por exemplo, fazendo a atualização "
-"retroativa de uma correção para um ramo de manutenção para uma versão de "
-"lançamento anterior de um ramo de desenvolvimento), pode ser útil adicionar "
-"esta informação."
+msgstr "Ao gravar o commit, acrescente uma linha que diz \"(cherry picked from commit ...)\" na mensagem do commit original, indicando de onde a escolha seletiva da alteração deste commit foi feito.  Isto é feito apenas para as escolhas seletivas sem conflitos.  Não use esta opção caso esteja fazendo uma escolha seletiva do seu ramo privado porque a informação é inútil para o destinatário.  No entanto, caso esteja fazendo uma escolha seletiva entre dois ramos publicamente visíveis (como por exemplo, fazendo a atualização retroativa de uma correção para um ramo de manutenção para uma versão de lançamento anterior de um ramo de desenvolvimento), pode ser útil adicionar esta informação."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:83
 #, priority:100
 msgid "It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it.  Now the default is not to do `-x` so this option is a no-op."
-msgstr ""
-"Costumava ser que o comando predefinia para fazer com a opção `-x` descrito "
-"acima, e a opção `-r` era para desativá-lo.  Agora a predefinição é não "
-"utilizar a opção `-x`, então esta opção não é operacional."
+msgstr "Costumava ser que o comando predefinia para fazer com a opção `-x` descrito acima, e a opção `-r` era para desativá-lo.  Agora a predefinição é não utilizar a opção `-x`, então esta opção não é operacional."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:84 en/git-revert.txt:50
@@ -14204,11 +13222,7 @@ msgstr "--mainline parent-number"
 #: en/git-cherry-pick.txt:91
 #, priority:100
 msgid "Usually you cannot cherry-pick a merge because you do not know which side of the merge should be considered the mainline.  This option specifies the parent number (starting from 1) of the mainline and allows cherry-pick to replay the change relative to the specified parent."
-msgstr ""
-"Geralmente você não pode fazer uma escolha seletiva de uma mesclagem porque "
-"você não sabe qual o lado da mesclagem principal deve ser considerada.  Esta "
-"opção determina o número da origem (a partir de 1) do principal e permite "
-"que a escolha seletiva repita a alteração em relação a origem informada."
+msgstr "Geralmente você não pode fazer uma escolha seletiva de uma mesclagem porque você não sabe qual o lado da mesclagem principal deve ser considerada.  Esta opção determina o número da origem (a partir de 1) do principal e permite que a escolha seletiva repita a alteração em relação a origem informada."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:93 en/git-revert.txt:78 en/merge-options.txt:2
@@ -14220,13 +13234,7 @@ msgstr "--no-commit"
 #: en/git-cherry-pick.txt:101
 #, priority:100
 msgid "Usually the command automatically creates a sequence of commits.  This flag applies the changes necessary to cherry-pick each named commit to your working tree and the index, without making any commit.  In addition, when this option is used, your index does not have to match the HEAD commit.  The cherry-pick is done against the beginning state of your index."
-msgstr ""
-"Normalmente, o comando cria automaticamente uma sequência de commits.  Esta "
-"opção aplica as alterações necessárias para selecionar cada commit informada "
-"na sua árvore de trabalho e o índice, sem fazer qualquer commit.  Além "
-"disso, quando esta opção é utilizada, o seu índice não precisa coincidir ao "
-"commit do `HEAD`. A escolha seletiva é feita contra a condição inicial do "
-"seu índice."
+msgstr "Normalmente, o comando cria automaticamente uma sequência de commits.  Esta opção aplica as alterações necessárias para selecionar cada commit informada na sua árvore de trabalho e o índice, sem fazer qualquer commit.  Além disso, quando esta opção é utilizada, o seu índice não precisa coincidir ao commit do `HEAD`. A escolha seletiva é feita contra a condição inicial do seu índice."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:104
@@ -14262,17 +13270,7 @@ msgstr "--allow-empty"
 #: en/git-cherry-pick.txt:136
 #, priority:100
 msgid "By default, cherry-picking an empty commit will fail, indicating that an explicit invocation of `git commit --allow-empty` is required. This option overrides that behavior, allowing empty commits to be preserved automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty commits that meet the \"fast-forward\" requirement will be kept even without this option.  Note also, that use of this option only keeps commits that were initially empty (i.e. the commit recorded the same tree as its parent).  Commits which are made empty due to a previous commit are dropped.  To force the inclusion of those commits use `--keep-redundant-commits`."
-msgstr ""
-"É predefinido que a escolha seletiva de um commit vazio falhará, indicando "
-"que é necessário uma chamada explícita do comando `git commit --allow-empty`"
-". Esta opção substitui este comportamento, permitindo que os commits vazios "
-"sejam preservados automaticamente em uma escolha seletiva. Observe que "
-"quando \"--ff\" estiver em vigor, os commits vazios que atendam ao requisito "
-"de \"avanço rápido\" serão mantidos mesmo sem esta opção.  Observe também "
-"que o uso desta opção mantém apenas os commits inicialmente estão vazios (ou "
-"seja, o commit registrou a mesma árvore que o seu pai).  Os commits que são "
-"tornados vazios devido a um commit anterior são descartados.  Para impor a "
-"inclusão destes commits, utilize a opção `--keke-redundant-commits`."
+msgstr "É predefinido que a escolha seletiva de um commit vazio falhará, indicando que é necessário uma chamada explícita do comando `git commit --allow-empty`. Esta opção substitui este comportamento, permitindo que os commits vazios sejam preservados automaticamente em uma escolha seletiva. Observe que quando \"--ff\" estiver em vigor, os commits vazios que atendam ao requisito de \"avanço rápido\" serão mantidos mesmo sem esta opção.  Observe também que o uso desta opção mantém apenas os commits inicialmente estão vazios (ou seja, o commit registrou a mesma árvore que o seu pai).  Os commits que são tornados vazios devido a um commit anterior são descartados.  Para impor a inclusão destes commits, utilize a opção `--keke-redundant-commits`."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:137 en/git-commit.txt:186 en/git-rebase.txt:327 en/git-rebase.txt:622
@@ -14284,11 +13282,7 @@ msgstr "--allow-empty-message"
 #: en/git-cherry-pick.txt:141
 #, priority:100
 msgid "By default, cherry-picking a commit with an empty message will fail.  This option overrides that behavior, allowing commits with empty messages to be cherry picked."
-msgstr ""
-"É predefinido que a escolha seletiva irá falhar quando houver um commit com "
-"uma mensagem sem nenhum conteúdo.  Esta opção substitui este comportamento, "
-"permitindo que os commits com mensagens sem nenhum conteúdo possam ser "
-"usados."
+msgstr "É predefinido que a escolha seletiva irá falhar quando houver um commit com uma mensagem sem nenhum conteúdo.  Esta opção substitui este comportamento, permitindo que os commits com mensagens sem nenhum conteúdo possam ser usados."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:142
@@ -14300,12 +13294,7 @@ msgstr "--keep-redundant-commits"
 #: en/git-cherry-pick.txt:148
 #, priority:100
 msgid "If a commit being cherry picked duplicates a commit already in the current history, it will become empty.  By default these redundant commits cause `cherry-pick` to stop so the user can examine the commit. This option overrides that behavior and creates an empty commit object.  Implies `--allow-empty`."
-msgstr ""
-"Caso um commit que esteja sendo escolhido seletivamente duplique um commit "
-"já no histórico atual, ele ficará vazio.  É predefinido que estes commits "
-"redundantes façam com que a escolha seletiva `cherry-pick` pare para que o "
-"usuário possa examinar o commit. Esta opção substitui esse comportamento e "
-"cria um objeto commit vazio.  implica no uso da opção `--allow-empty`."
+msgstr "Caso um commit que esteja sendo escolhido seletivamente duplique um commit já no histórico atual, ele ficará vazio.  É predefinido que estes commits redundantes façam com que a escolha seletiva `cherry-pick` pare para que o usuário possa examinar o commit. Esta opção substitui esse comportamento e cria um objeto commit vazio.  implica no uso da opção `--allow-empty`."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:149 en/git-notes.txt:184 en/git-rebase.txt:361 en/git-revert.txt:105 en/git-svn.txt:678 en/merge-options.txt:120
@@ -14389,11 +13378,7 @@ msgstr "`git cherry-pick maint master..próximo`"
 #: en/git-cherry-pick.txt:189
 #, priority:100
 msgid "Apply the changes introduced by all commits that are ancestors of maint or next, but not master or any of its ancestors.  Note that the latter does not mean `maint` and everything between `master` and `next`; specifically, `maint` will not be used if it is included in `master`."
-msgstr ""
-"Aplique as alterações introduzidas por todos os commits que sejam ancestrais "
-"do \"maint\" ou \"next\", porém não do \"master\" ou dos seus ancestrais.  "
-"Note que o último não significa que `maint` e tudo entre `master` e `next`; "
-"especificamente, `maint` não será usado caso esteja incluso no `master`."
+msgstr "Aplique as alterações introduzidas por todos os commits que sejam ancestrais do \"maint\" ou \"next\", porém não do \"master\" ou dos seus ancestrais.  Note que o último não significa que `maint` e tudo entre `master` e `next`; especificamente, `maint` não será usado caso esteja incluso no `master`."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:190
@@ -14417,11 +13402,7 @@ msgstr "`git cherry-pick -n master~1 next`"
 #: en/git-cherry-pick.txt:202
 #, priority:100
 msgid "Apply to the working tree and the index the changes introduced by the second last commit pointed to by master and by the last commit pointed to by next, but do not create any commit with these changes."
-msgstr ""
-"Aplique as alterações na árvore de trabalho e no índice que foram "
-"introduzidos pelo segundo último commit apontada pelo \"master\" e pelo "
-"último commit apontada pelo próximo, porém não crie nenhum commit com estas "
-"alterações."
+msgstr "Aplique as alterações na árvore de trabalho e no índice que foram introduzidos pelo segundo último commit apontada pelo \"master\" e pelo último commit apontada pelo próximo, porém não crie nenhum commit com estas alterações."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:203
@@ -14433,12 +13414,7 @@ msgstr "`git cherry-pick --ff ..next`"
 #: en/git-cherry-pick.txt:210
 #, priority:100
 msgid "If history is linear and HEAD is an ancestor of next, update the working tree and advance the HEAD pointer to match next.  Otherwise, apply the changes introduced by those commits that are in next but not HEAD to the current branch, creating a new commit for each new change."
-msgstr ""
-"Caso o histórico seja linear e `HEAD` seja um ancestral do próximo, atualize "
-"a árvore de trabalho e avance o ponteiro `HEAD` para que coincida com o "
-"próximo.  Caso contrário, aplique as alterações introduzidas pelos commits "
-"que estão na próxima, mas não o `HEAD`para o ramo atual, criando um novo "
-"commit para cada nova alteração."
+msgstr "Caso o histórico seja linear e `HEAD` seja um ancestral do próximo, atualize a árvore de trabalho e avance o ponteiro `HEAD` para que coincida com o próximo.  Caso contrário, aplique as alterações introduzidas pelos commits que estão na próxima, mas não o `HEAD`para o ramo atual, criando um novo commit para cada nova alteração."
 
 #. type: Labeled list
 #: en/git-cherry-pick.txt:211
@@ -14476,11 +13452,7 @@ msgstr ""
 #: en/git-cherry-pick.txt:232
 #, priority:100
 msgid "apply the change that would be shown by `git show topic^`.  In this example, the patch does not apply cleanly, so information about the conflict is written to the index and working tree and no new commit results."
-msgstr ""
-"aplique a alteração que seria exibido através do comando `git show topic^`.  "
-"Neste exemplo, o patch não se aplica de maneira limpa; portanto, as "
-"informações sobre os conflitos são gravadas no índice e na árvore de "
-"trabalho, sem nenhum resultado do novo commit."
+msgstr "aplique a alteração que seria exibido através do comando `git show topic^`.  Neste exemplo, o patch não se aplica de maneira limpa; portanto, as informações sobre os conflitos são gravadas no índice e na árvore de trabalho, sem nenhum resultado do novo commit."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:233
@@ -14492,10 +13464,7 @@ msgstr "resumir as alterações a serem reconciliadas"
 #: en/git-cherry-pick.txt:236
 #, priority:100
 msgid "cancel the cherry-pick.  In other words, return to the pre-cherry-pick state, preserving any local modifications you had in the working tree."
-msgstr ""
-"cancela a escolha seletiva.  Em outras palavras, retorne a condição de "
-"escolha seletiva anterior, preservando as alterações locais que você teve na "
-"árvore de trabalho."
+msgstr "cancela a escolha seletiva.  Em outras palavras, retorne a condição de escolha seletiva anterior, preservando as alterações locais que você teve na árvore de trabalho."
 
 #. type: Plain text
 #: en/git-cherry-pick.txt:239
@@ -14531,11 +13500,7 @@ msgstr "Determine se há commits em `<head>..<upstream>` que são equivalentes 
 #: en/git-cherry.txt:22
 #, priority:100
 msgid "The equivalence test is based on the diff, after removing whitespace and line numbers.  git-cherry therefore detects when commits have been \"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-rebase[1]."
-msgstr ""
-"O teste de equivalência tem como base no diff, depois de remover os espaços "
-"e os números da linha.  O comando 'git-cherry' portanto, detecta quando os "
-"commits foram \"copiados\" por meio do linkgit:git-cherry-pick[1], linkgit"
-":git-am[1] ou linkgit:git-rebase[1]."
+msgstr "O teste de equivalência tem como base no diff, depois de remover os espaços e os números da linha.  O comando 'git-cherry' portanto, detecta quando os commits foram \"copiados\" por meio do linkgit:git-cherry-pick[1], linkgit:git-am[1] ou linkgit:git-rebase[1]."
 
 #. type: Plain text
 #: en/git-cherry.txt:26
@@ -14559,9 +13524,7 @@ msgstr "<upstream>"
 #: en/git-cherry.txt:35
 #, priority:100
 msgid "Upstream branch to search for equivalent commits.  Defaults to the upstream branch of HEAD."
-msgstr ""
-"Ramo \"upstream\" para procurar os commits equivalentes.  A predefinição "
-"retorna para o ramo \"upstream\" do `HEAD`."
+msgstr "Ramo \"upstream\" para procurar os commits equivalentes.  A predefinição retorna para o ramo \"upstream\" do `HEAD`."
 
 #. type: Labeled list
 #: en/git-cherry.txt:36 en/git.txt:383
@@ -14591,11 +13554,7 @@ msgstr "Fluxos de trabalho de patch"
 #: en/git-cherry.txt:52
 #, priority:100
 msgid "git-cherry is frequently used in patch-based workflows (see linkgit:gitworkflows[7]) to determine if a series of patches has been applied by the upstream maintainer.  In such a workflow you might create and send a topic branch like this:"
-msgstr ""
-"A escolha seletiva é frequentemente utilizado nos fluxos de trabalho com "
-"base nos patches (consulte linkgit:gitworkflows[7]) para determinar se uma "
-"série de patches foi aplicada pelo mantenedor \"upstream\".  Neste fluxo de "
-"trabalho, você pode criar e enviar o tópico de um ramo como este:"
+msgstr "A escolha seletiva é frequentemente utilizado nos fluxos de trabalho com base nos patches (consulte linkgit:gitworkflows[7]) para determinar se uma série de patches foi aplicada pelo mantenedor \"upstream\".  Neste fluxo de trabalho, você pode criar e enviar o tópico de um ramo como este:"
 
 #. type: delimited block -
 #: en/git-cherry.txt:58
@@ -14703,10 +13662,7 @@ msgstr "Utilizando um limite"
 #: en/git-cherry.txt:110
 #, priority:100
 msgid "The optional <limit> is useful in cases where your topic is based on other work that is not in upstream.  Expanding on the previous example, this might look like:"
-msgstr ""
-"O <limite> opcional é útil nos casos onde o seu tópico é tem como base em "
-"outro trabalho que não está na \"upstream\".  Expandindo o exemplo anterior, "
-"isso pode se parecer com:"
+msgstr "O <limite> opcional é útil nos casos onde o seu tópico é tem como base em outro trabalho que não está na \"upstream\".  Expandindo o exemplo anterior, isso pode se parecer com:"
 
 #. type: delimited block -
 #: en/git-cherry.txt:126
@@ -14784,19 +13740,13 @@ msgstr "'git citool'\n"
 #: en/git-citool.txt:19
 #, priority:100
 msgid "A Tcl/Tk based graphical interface to review modified files, stage them into the index, enter a commit message and record the new commit onto the current branch.  This interface is an alternative to the less interactive 'git commit' program."
-msgstr ""
-"Uma interface gráfica com base em Tcl/Tk para revisar os arquivos que foram "
-"modificados, colocá-los no índice, inserir uma mensagem no commit e "
-"registrar o novo commit no ramo atual.  Essa interface é uma alternativa ao "
-"programa menos interativo 'git commit'."
+msgstr "Uma interface gráfica com base em Tcl/Tk para revisar os arquivos que foram modificados, colocá-los no índice, inserir uma mensagem no commit e registrar o novo commit no ramo atual.  Essa interface é uma alternativa ao programa menos interativo 'git commit'."
 
 #. type: Plain text
 #: en/git-citool.txt:22
 #, priority:100
 msgid "'git citool' is actually a standard alias for `git gui citool`.  See linkgit:git-gui[1] for more details."
-msgstr ""
-"O comando 'git citool' é um apelido predefinido para o comando `git gui "
-"citool`.  Para mais detalhes, consulte linkgit:git-gui[1]."
+msgstr "O comando 'git citool' é um apelido predefinido para o comando `git gui citool`.  Para mais detalhes, consulte linkgit:git-gui[1]."
 
 #. type: Title =
 #: en/git-clean.txt:2
@@ -14814,9 +13764,7 @@ msgstr "git-clean - Remove arquivos não rastreados da árvore de trabalho"
 #: en/git-clean.txt:12
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
-msgstr ""
-"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <padrão>] [-x | -X] [--] "
-"<caminho>...\n"
+msgstr "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <padrão>] [-x | -X] [--] <caminho>...\n"
 
 #. type: Plain text
 #: en/git-clean.txt:18
@@ -14828,42 +13776,25 @@ msgstr "Limpa a árvore de trabalho removendo recursivamente arquivos que não e
 #: en/git-clean.txt:22
 #, priority:100
 msgid "Normally, only files unknown to Git are removed, but if the `-x` option is specified, ignored files are also removed. This can, for example, be useful to remove all build products."
-msgstr ""
-"Normalmente, apenas os arquivos desconhecidos pelo Git são removidos, porém "
-"caso a opção `-x` seja utilizada, os arquivos ignorados também serão "
-"removidos. Isso pode, por exemplo, ser útil para remover todos os produtos "
-"da compilação."
+msgstr "Normalmente, apenas os arquivos desconhecidos pelo Git são removidos, porém caso a opção `-x` seja utilizada, os arquivos ignorados também serão removidos. Isso pode, por exemplo, ser útil para remover todos os produtos da compilação."
 
 #. type: Plain text
 #: en/git-clean.txt:25
 #, ignore-ellipsis, priority:100
 msgid "If any optional `<path>...` arguments are given, only those paths are affected."
-msgstr ""
-"Se algum argumento opcional `<caminho>...` for dado, somente esses caminhos "
-"serão afetados."
+msgstr "Se algum argumento opcional `<caminho>...` for dado, somente esses caminhos serão afetados."
 
 #. type: Plain text
 #: en/git-clean.txt:35
 #, priority:100
 msgid "Normally, when no <path> is specified, git clean will not recurse into untracked directories to avoid removing too much.  Specify -d to have it recurse into such directories as well.  If any paths are specified, -d is irrelevant; all untracked files matching the specified paths (with exceptions for nested git directories mentioned under `--force`) will be removed."
-msgstr ""
-"Normalmente, quando nenhum <caminho> for definido, o comando 'git clean' não "
-"retornará para os diretórios que não são  monitorados para evitar a remoção "
-"excessiva.  Utilize `-d` para que ele recorra a estes diretórios também.  "
-"Caso algum caminho seja utilizado, o '-d' é irrelevante; todos os arquivos "
-"coincidentes não monitorados nos caminhos informados (com exceções para os "
-"diretórios git aninhados mencionados sob `--force`) serão removidos."
+msgstr "Normalmente, quando nenhum <caminho> for definido, o comando 'git clean' não retornará para os diretórios que não são  monitorados para evitar a remoção excessiva.  Utilize `-d` para que ele recorra a estes diretórios também.  Caso algum caminho seja utilizado, o '-d' é irrelevante; todos os arquivos coincidentes não monitorados nos caminhos informados (com exceções para os diretórios git aninhados mencionados sob `--force`) serão removidos."
 
 #. type: Plain text
 #: en/git-clean.txt:43
 #, priority:100
 msgid "If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to delete files or directories unless given -f or -i.  Git will refuse to modify untracked nested git repositories (directories with a .git subdirectory)  unless a second -f is given."
-msgstr ""
-"Se a variável de configuração do Git `clean.requireForce` não estiver "
-"definida como 'false', o `git clean` recusará a exclusão de arquivos ou "
-"diretórios a menos que seja utilizado a opção `-f` ou `-i`.  O Git se "
-"recusará a modificar repositórios git aninhados e sem lastro (diretórios sem "
-"um subdiretório .git) a menos que seja dado um segundo -f."
+msgstr "Se a variável de configuração do Git `clean.requireForce` não estiver definida como 'false', o `git clean` recusará a exclusão de arquivos ou diretórios a menos que seja utilizado a opção `-f` ou `-i`.  O Git se recusará a modificar repositórios git aninhados e sem lastro (diretórios sem um subdiretório .git) a menos que seja dado um segundo -f."
 
 #. type: Plain text
 #: en/git-clean.txt:48
@@ -14899,9 +13830,7 @@ msgstr "--exclude=<padrão>"
 #: en/git-clean.txt:62
 #, priority:100
 msgid "Use the given exclude pattern in addition to the standard ignore rules (see linkgit:gitignore[5])."
-msgstr ""
-"Utilize o padrão de exclusão informado além das regras de exclusão "
-"predefinidas (consulte linkgit:gitignore[5])."
+msgstr "Utilize o padrão de exclusão informado além das regras de exclusão predefinidas (consulte linkgit:gitignore[5])."
 
 #. type: Plain text
 #: en/git-clean.txt:70
@@ -14919,10 +13848,7 @@ msgstr "-X"
 #: en/git-clean.txt:74
 #, priority:100
 msgid "Remove only files ignored by Git.  This may be useful to rebuild everything from scratch, but keep manually created files."
-msgstr ""
-"Remove apenas os arquivos ignorados pelo Git.  Isto pode ser útil para "
-"reconstruir tudo do zero, porém mantém os arquivos que foram criados "
-"manualmente."
+msgstr "Remove apenas os arquivos ignorados pelo Git.  Isto pode ser útil para reconstruir tudo do zero, porém mantém os arquivos que foram criados manualmente."
 
 #. type: Title -
 #: en/git-clean.txt:76
@@ -14946,8 +13872,7 @@ msgid ""
 "    What now> 1\n"
 msgstr ""
 "    *** Comandos ***\n"
-"\t1: limpa                2: filtra através de um padrão    3: seleciona "
-"através dos números\n"
+"\t1: limpa                2: filtra através de um padrão    3: seleciona através dos números\n"
 "\t4: pergunte a cada      5: encerra                        6: ajuda\n"
 "    Agora o quê> 1\n"
 
@@ -14985,14 +13910,7 @@ msgstr "filtrar por padrão"
 #: en/git-clean.txt:109
 #, priority:100
 msgid "This shows the files and directories to be deleted and issues an \"Input ignore patterns>>\" prompt. You can input space-separated patterns to exclude files and directories from deletion.  E.g. \"*.c *.h\" will excludes files end with \".c\" and \".h\" from deletion. When you are satisfied with the filtered result, press ENTER (empty) back to the main menu."
-msgstr ""
-"Exibe os arquivos e os diretórios que serão excluídos e emite uma mensagem "
-"\"Entre com os padrões que serão ignorados >>\". Você pode inserir os "
-"padrões separados por espaço para tirar os arquivos e os diretórios da "
-"exclusão.  Como por exemplo, \"*.c *.h\" removerá os arquivos que terminem "
-"com \".c\" e \".h\" do processo de exclusão. Quando estiver satisfeito com o "
-"resultado filtrado, pressione ENTER (e mais nada) para voltar ao menu "
-"principal."
+msgstr "Exibe os arquivos e os diretórios que serão excluídos e emite uma mensagem \"Entre com os padrões que serão ignorados >>\". Você pode inserir os padrões separados por espaço para tirar os arquivos e os diretórios da exclusão.  Como por exemplo, \"*.c *.h\" removerá os arquivos que terminem com \".c\" e \".h\" do processo de exclusão. Quando estiver satisfeito com o resultado filtrado, pressione ENTER (e mais nada) para voltar ao menu principal."
 
 #. type: Labeled list
 #: en/git-clean.txt:110
@@ -15016,10 +13934,7 @@ msgstr "pergunte a cada"
 #: en/git-clean.txt:127
 #, priority:100
 msgid "This will start to clean, and you must confirm one by one in order to delete items. Please note that this action is not as efficient as the above two actions."
-msgstr ""
-"Isso inicia a limpeza e você deve confirmar um por um para que os itens "
-"possam ser excluídos. Observe que esta ação não é tão eficiente quanto as "
-"duas ações acima."
+msgstr "Isso inicia a limpeza e você deve confirmar um por um para que os itens possam ser excluídos. Observe que esta ação não é tão eficiente quanto as duas ações acima."
 
 #. type: Labeled list
 #: en/git-clean.txt:128
@@ -15115,24 +14030,13 @@ msgstr "--local"
 #: en/git-clone.txt:53
 #, priority:300
 msgid "When the repository to clone from is on a local machine, this flag bypasses the normal \"Git aware\" transport mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories.  The files under `.git/objects/` directory are hardlinked to save space when possible."
-msgstr ""
-"Quando o repositório que será clonada está em uma máquina local, esta opção "
-"ignora o mecanismo de transporte \"compatível com Git\" normal e clona o "
-"repositório fazendo uma cópia do `HEAD` e tudo sob os diretórios dos objetos "
-"e das refs.  Os arquivos sob o diretório `.git / objects /` são vinculados "
-"para economizar espaço sempre que possível."
+msgstr "Quando o repositório que será clonada está em uma máquina local, esta opção ignora o mecanismo de transporte \"compatível com Git\" normal e clona o repositório fazendo uma cópia do `HEAD` e tudo sob os diretórios dos objetos e das refs.  Os arquivos sob o diretório `.git / objects /` são vinculados para economizar espaço sempre que possível."
 
 #. type: Plain text
 #: en/git-clone.txt:60
 #, priority:300
 msgid "If the repository is specified as a local path (e.g., `/path/to/repo`), this is the default, and --local is essentially a no-op.  If the repository is specified as a URL, then this flag is ignored (and we never use the local optimizations).  Specifying `--no-local` will override the default when `/path/to/repo` is given, using the regular Git transport instead."
-msgstr ""
-"É predefinido que caso o repositório seja definido como um caminho local (`/"
-"path/to/repo` por exemplo) e a opção `--local` não seja operacional.  Caso o "
-"repositório seja definido como uma URL, então a opção será ignorada (e as "
-"otimizações locais nunca serão utilizadas).  Utilizando a opção `--no-local` "
-"irá sobrescrever o valor predefinido quando `/path/to/repo` for informado em "
-"vez de utilizar o transporte regular do Git."
+msgstr "É predefinido que caso o repositório seja definido como um caminho local (`/path/to/repo` por exemplo) e a opção `--local` não seja operacional.  Caso o repositório seja definido como uma URL, então a opção será ignorada (e as otimizações locais nunca serão utilizadas).  Utilizando a opção `--no-local` irá sobrescrever o valor predefinido quando `/path/to/repo` for informado em vez de utilizar o transporte regular do Git."
 
 #. type: Labeled list
 #: en/git-clone.txt:61
@@ -15144,11 +14048,7 @@ msgstr "--no-hardlinks"
 #: en/git-clone.txt:66
 #, priority:300
 msgid "Force the cloning process from a repository on a local filesystem to copy the files under the `.git/objects` directory instead of using hardlinks. This may be desirable if you are trying to make a back-up of your repository."
-msgstr ""
-"Impõem o processo de clonagem a partir de um repositório em um sistema de "
-"arquivos local para copiar os arquivos no diretório `.git/objects` em vez de "
-"utilizar links físicos. Pode ser desejável caso esteja tentando fazer um "
-"backup do seu repositório."
+msgstr "Impõem o processo de clonagem a partir de um repositório em um sistema de arquivos local para copiar os arquivos no diretório `.git/objects` em vez de utilizar links físicos. Pode ser desejável caso esteja tentando fazer um backup do seu repositório."
 
 #. type: Labeled list
 #: en/git-clone.txt:68
@@ -15160,11 +14060,7 @@ msgstr "--shared"
 #: en/git-clone.txt:74
 #, priority:300
 msgid "When the repository to clone is on the local machine, instead of using hard links, automatically setup `.git/objects/info/alternates` to share the objects with the source repository.  The resulting repository starts out without any object of its own."
-msgstr ""
-"Quando o repositório que será clonado estiver na máquina local, em vez de "
-"utilizar links físicos, configure automaticamente o `.git/objetos/info/"
-"alternates` para compartilhar os objetos com o repositório da origem.  O "
-"repositório resultante é iniciado sem nenhum objeto próprio."
+msgstr "Quando o repositório que será clonado estiver na máquina local, em vez de utilizar links físicos, configure automaticamente o `.git/objetos/info/alternates` para compartilhar os objetos com o repositório da origem.  O repositório resultante é iniciado sem nenhum objeto próprio."
 
 #. type: Plain text
 #: en/git-clone.txt:84
@@ -15182,29 +14078,19 @@ msgid ""
 msgstr ""
 "*OBSERVAÇÃO*: provavelmente está uma operação muito perigosa; *não*\n"
 "utilize a menos que compreenda o que ela faz. Caso clone o seu\n"
-"repositório utilizando esta opção e em seguida exclua os ramos (ou use "
-"qualquer\n"
+"repositório utilizando esta opção e em seguida exclua os ramos (ou use qualquer\n"
 "outro comando Git que faz qualquer commit existente perder a referência) no\n"
-"repositório da origem, alguns objetos podem perder a referência (ou ficarem "
-"soltos).\n"
-"Estes objetos podem ser removidos através das operações normais do Git ("
-"como\n"
-"`git commit`) que chama automaticamente o comando `git gc --auto`. (Consulte "
-"linkgit:git-gc[1].)\n"
-"Caso estes objetos sejam removidos e foram referenciados pelo repositório "
-"clonado,\n"
+"repositório da origem, alguns objetos podem perder a referência (ou ficarem soltos).\n"
+"Estes objetos podem ser removidos através das operações normais do Git (como\n"
+"`git commit`) que chama automaticamente o comando `git gc --auto`. (Consulte linkgit:git-gc[1].)\n"
+"Caso estes objetos sejam removidos e foram referenciados pelo repositório clonado,\n"
 "o repositório clonado se tornará corrompido.\n"
 
 #. type: Plain text
 #: en/git-clone.txt:90
 #, priority:300
 msgid "Note that running `git repack` without the `--local` option in a repository cloned with `--shared` will copy objects from the source repository into a pack in the cloned repository, removing the disk space savings of `clone --shared`.  It is safe, however, to run `git gc`, which uses the `--local` option by default."
-msgstr ""
-"Observe que executar o comando `git repack` sem a opção `--local` em um "
-"repositório clonado com `--shared`, este irá copiar os objetos do "
-"repositório da origem em um pacote no repositório que foi clonado, removendo "
-"a economia de espaço em disco do `clone --shared`.  É seguro, no entanto, "
-"executar o comando `git gc`, que por predefinição utiliza a opção `--local`."
+msgstr "Observe que executar o comando `git repack` sem a opção `--local` em um repositório clonado com `--shared`, este irá copiar os objetos do repositório da origem em um pacote no repositório que foi clonado, removendo a economia de espaço em disco do `clone --shared`.  É seguro, no entanto, executar o comando `git gc`, que por predefinição utiliza a opção `--local`."
 
 #. type: Plain text
 #: en/git-clone.txt:94
@@ -15222,15 +14108,7 @@ msgstr "--reference[-if-able] <repositório>"
 #: en/git-clone.txt:105
 #, priority:300
 msgid "If the reference repository is on the local machine, automatically setup `.git/objects/info/alternates` to obtain objects from the reference repository.  Using an already existing repository as an alternate will require fewer objects to be copied from the repository being cloned, reducing network and local storage costs.  When using the `--reference-if-able`, a non existing directory is skipped with a warning instead of aborting the clone."
-msgstr ""
-"Caso o repositório de referência estiver na máquina local, configure "
-"automaticamente o arquivo de configuração `.git/objects/info/alternates` "
-"para obter os objetos do repositório de referência.  A utilização de um "
-"repositório já existente como alternativa, exigirá que menos objetos sejam "
-"copiados do repositório que está sendo clonado, reduzindo as despesas do "
-"armazenamento local e da rede.  Ao utilizar o comando `--reference-if-able`, "
-"um diretório não existente é ignorado com um aviso em vez de interromper a "
-"clonagem."
+msgstr "Caso o repositório de referência estiver na máquina local, configure automaticamente o arquivo de configuração `.git/objects/info/alternates` para obter os objetos do repositório de referência.  A utilização de um repositório já existente como alternativa, exigirá que menos objetos sejam copiados do repositório que está sendo clonado, reduzindo as despesas do armazenamento local e da rede.  Ao utilizar o comando `--reference-if-able`, um diretório não existente é ignorado com um aviso em vez de interromper a clonagem."
 
 #. type: Plain text
 #: en/git-clone.txt:108
@@ -15252,14 +14130,7 @@ msgstr "--dissociate"
 #: en/git-clone.txt:119
 #, priority:300
 msgid "Borrow the objects from reference repositories specified with the `--reference` options only to reduce network transfer, and stop borrowing from them after a clone is made by making necessary local copies of borrowed objects.  This option can also be used when cloning locally from a repository that already borrows objects from another repository--the new repository will borrow objects from the same repository, and this option can be used to stop the borrowing."
-msgstr ""
-"Emprestar os objetos dos repositórios a partir da referência utilizada com "
-"as opções `--reference` apenas para reduzir a transferência de rede e parar "
-"de tomar emprestado deles após a clonagem, fazendo cópias locais necessárias "
-"dos objetos emprestados.  Esta opção também pode ser usada na clonagem local "
-"a partir de um repositório que já toma emprestado os objetos de um outro "
-"repositório--o novo repositório pegará emprestado os objetos do mesmo "
-"repositório, e esta opção pode ser usada para interromper o empréstimo."
+msgstr "Emprestar os objetos dos repositórios a partir da referência utilizada com as opções `--reference` apenas para reduzir a transferência de rede e parar de tomar emprestado deles após a clonagem, fazendo cópias locais necessárias dos objetos emprestados.  Esta opção também pode ser usada na clonagem local a partir de um repositório que já toma emprestado os objetos de um outro repositório--o novo repositório pegará emprestado os objetos do mesmo repositório, e esta opção pode ser usada para interromper o empréstimo."
 
 #. type: Plain text
 #: en/git-clone.txt:124
@@ -15286,7 +14157,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr "Nenhum checkout de HEAD é executado após o clone estar completo."
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -15295,16 +14166,7 @@ msgstr "--bare"
 #: en/git-clone.txt:159
 #, priority:300
 msgid "Make a 'bare' Git repository.  That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `--no-checkout` because there is nowhere to check out the working tree.  Also the branch heads at the remote are copied directly to corresponding local branch heads, without mapping them to `refs/remotes/origin/`.  When this option is used, neither remote-tracking branches nor the related configuration variables are created."
-msgstr ""
-"Faça um repositório Git 'vazio'.  Ou seja, em vez de criar o `<diretório>` e "
-"colocar os arquivos administrativos dentro do `<diretório>/.git`, faça com "
-"que o próprio `<diretório>` seja o `$ GIT_DIR`. Por questões óbvias, há a "
-"obrigatoriedade da utilização da opção `--no-checkout` porque não há onde "
-"averiguar a árvore de trabalho.  Além disso os cabeçalhos do ramo remoto são "
-"copiados diretamente para os cabeçalhos locais correspondentes, sem mapeá-"
-"los para `refs/remotes/origin/`.  Quando essa opção é utilizada, nem as "
-"ramificações monitoradas remotamente tão pouco as variáveis de configuração "
-"relacionadas à elas são criadas."
+msgstr "Faça um repositório Git 'vazio'.  Ou seja, em vez de criar o `<diretório>` e colocar os arquivos administrativos dentro do `<diretório>/.git`, faça com que o próprio `<diretório>` seja o `$ GIT_DIR`. Por questões óbvias, há a obrigatoriedade da utilização da opção `--no-checkout` porque não há onde averiguar a árvore de trabalho.  Além disso os cabeçalhos do ramo remoto são copiados diretamente para os cabeçalhos locais correspondentes, sem mapeá-los para `refs/remotes/origin/`.  Quando essa opção é utilizada, nem as ramificações monitoradas remotamente tão pouco as variáveis de configuração relacionadas à elas são criadas."
 
 #. type: Labeled list
 #: en/git-clone.txt:160 en/git-show-branch.txt:67 en/rev-list-options.txt:358 en/rev-list-options.txt:491
@@ -15316,11 +14178,7 @@ msgstr "--sparse"
 #: en/git-clone.txt:165
 #, priority:300
 msgid "Initialize the sparse-checkout file so the working directory starts with only the files in the root of the repository. The sparse-checkout file can be modified to grow the working directory as needed."
-msgstr ""
-"Inicialize a averiguação esparsa para que o diretório de trabalho comece "
-"apenas com os arquivos na raiz do repositório. O arquivo \"checkout esparso\""
-" pode ser modificado para aumentar o diretório de trabalho conforme a "
-"necessidade."
+msgstr "Inicialize a averiguação esparsa para que o diretório de trabalho comece apenas com os arquivos na raiz do repositório. O arquivo \"checkout esparso\" pode ser modificado para aumentar o diretório de trabalho conforme a necessidade."
 
 #. type: Labeled list
 #: en/git-clone.txt:166 en/git-pack-objects.txt:260 en/rev-list-options.txt:870
@@ -15332,16 +14190,7 @@ msgstr "--filter=<filter-spec>"
 #: en/git-clone.txt:175
 #, priority:300
 msgid "Use the partial clone feature and request that the server sends a subset of reachable objects according to a given object filter.  When using `--filter`, the supplied `<filter-spec>` is used for the partial clone filter. For example, `--filter=blob:none` will filter out all blobs (file contents) until needed by Git. Also, `--filter=blob:limit=<size>` will filter out all blobs of size at least `<size>`. For more details on filter specifications, see the `--filter` option in linkgit:git-rev-list[1]."
-msgstr ""
-"Utilize o recurso parcial de clonagem e solicite que o servidor envie um "
-"subconjunto de objetos acessíveis de acordo com determinados filtros do "
-"objeto.  Ao utilizar a opção `--filter`, o `<filter-spec>` fornecido é usado "
-"para o filtro de clonagem parcial. Como, por exemplo, a opção "
-"`--filter=blob:none` irá filtrar todas as bolhas (conteúdo dos arquivos) até "
-"que sejam requisitados pelo Git. A opção `--filter=blob:limit=<tamanho>` "
-"também filtrará todas as bolhas com o tamanho de pelo menos `<tamanho>`. "
-"Para mais detalhes sobre as especificações dos filtros, consulte a opção "
-"`--filter` no linkgit:git-rev-list[1]."
+msgstr "Utilize o recurso parcial de clonagem e solicite que o servidor envie um subconjunto de objetos acessíveis de acordo com determinados filtros do objeto.  Ao utilizar a opção `--filter`, o `<filter-spec>` fornecido é usado para o filtro de clonagem parcial. Como, por exemplo, a opção `--filter=blob:none` irá filtrar todas as bolhas (conteúdo dos arquivos) até que sejam requisitados pelo Git. A opção `--filter=blob:limit=<tamanho>` também filtrará todas as bolhas com o tamanho de pelo menos `<tamanho>`. Para mais detalhes sobre as especificações dos filtros, consulte a opção `--filter` no linkgit:git-rev-list[1]."
 
 #. type: Labeled list
 #: en/git-clone.txt:176 en/git-push.txt:161
@@ -15353,13 +14202,7 @@ msgstr "--mirror"
 #: en/git-clone.txt:183
 #, priority:300
 msgid "Set up a mirror of the source repository.  This implies `--bare`.  Compared to `--bare`, `--mirror` not only maps local branches of the source to local branches of the target, it maps all refs (including remote-tracking branches, notes etc.) and sets up a refspec configuration such that all these refs are overwritten by a `git remote update` in the target repository."
-msgstr ""
-"Configure um espelho do repositório de origem.  Implica no uso da opção "
-"`--bare`.  Comparado com a opção `--bare`, `--mirror` não apenas mapeia as "
-"ramificações locais da origem para as ramificações locais do destino, ele "
-"mapeia todas as refs (incluindo as ramificações monitoradas remotamente, "
-"anotações, etc.) e define uma configuração `refspec` onde todas estas `refs` "
-"sejam substituídas através um `git remote update` no repositório do destino."
+msgstr "Configure um espelho do repositório de origem.  Implica no uso da opção `--bare`.  Comparado com a opção `--bare`, `--mirror` não apenas mapeia as ramificações locais da origem para as ramificações locais do destino, ele mapeia todas as refs (incluindo as ramificações monitoradas remotamente, anotações, etc.) e define uma configuração `refspec` onde todas estas `refs` sejam substituídas através um `git remote update` no repositório do destino."
 
 #. type: Labeled list
 #: en/git-clone.txt:184
@@ -15395,12 +14238,7 @@ msgstr "--branch <nome>"
 #: en/git-clone.txt:197
 #, priority:300
 msgid "Instead of pointing the newly created HEAD to the branch pointed to by the cloned repository's HEAD, point to `<name>` branch instead. In a non-bare repository, this is the branch that will be checked out.  `--branch` can also take tags and detaches the HEAD at that commit in the resulting repository."
-msgstr ""
-"Em vez de apontar o recém-criado `HEAD` para um ramo apontado pelo `HEAD` do "
-"repositório clonado, em vez disso, aponte para o ramo `<nome>`. Em um "
-"repositório não vazio, esse é o ramo que será averiguado.  A opção `--branch`"
-" também pode pegar as tags e desanexar o `HEAD` daquele commit no "
-"repositório resultante."
+msgstr "Em vez de apontar o recém-criado `HEAD` para um ramo apontado pelo `HEAD` do repositório clonado, em vez disso, aponte para o ramo `<nome>`. Em um repositório não vazio, esse é o ramo que será averiguado.  A opção `--branch` também pode pegar as tags e desanexar o `HEAD` daquele commit no repositório resultante."
 
 #. type: Labeled list
 #: en/git-clone.txt:198
@@ -15412,12 +14250,10 @@ msgstr "-u <upload-pack>"
 #: en/git-clone.txt:203
 #, priority:300
 msgid "When given, and the repository to clone from is accessed via ssh, this specifies a non-default path for the command run on the other end."
-msgstr ""
-"Quando informado e o repositório a ser clonado for acessível através do ssh, "
-"determina que seja executado um caminho fora do padrão na outra extremidade."
+msgstr "Quando informado e o repositório a ser clonado for acessível através do ssh, determina que seja executado um caminho fora do padrão na outra extremidade."
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template=<diretório-modelo>"
@@ -15444,25 +14280,13 @@ msgstr "--config <chave>=<valor>"
 #: en/git-clone.txt:218
 #, priority:300
 msgid "Set a configuration variable in the newly-created repository; this takes effect immediately after the repository is initialized, but before the remote history is fetched or any files checked out.  The key is in the same format as expected by linkgit:git-config[1] (e.g., `core.eol=true`). If multiple values are given for the same key, each value will be written to the config file. This makes it safe, for example, to add additional fetch refspecs to the origin remote."
-msgstr ""
-"Define uma variável de configuração no repositório recém-criado; isso entra "
-"em vigor imediatamente após a inicialização do repositório, antes da captura "
-"remota do histórico ou da averiguação de quaisquer arquivos.  Como é "
-"esperado, a chave está no mesmo formato de linkgit:git-config[1] (ou seja, "
-"`core.eol=true`). Caso vários valores sejam informados para a mesma chave, "
-"cada valor será gravado no arquivo de configuração. Isso o torna mais seguro "
-"para incluir \"fetch refspecs\" adicionais ao \"origin\" remoto por exemplo."
+msgstr "Define uma variável de configuração no repositório recém-criado; isso entra em vigor imediatamente após a inicialização do repositório, antes da captura remota do histórico ou da averiguação de quaisquer arquivos.  Como é esperado, a chave está no mesmo formato de linkgit:git-config[1] (ou seja, `core.eol=true`). Caso vários valores sejam informados para a mesma chave, cada valor será gravado no arquivo de configuração. Isso o torna mais seguro para incluir \"fetch refspecs\" adicionais ao \"origin\" remoto por exemplo."
 
 #. type: Plain text
 #: en/git-clone.txt:224
 #, priority:300
 msgid "Due to limitations of the current implementation, some configuration variables do not take effect until after the initial fetch and checkout.  Configuration variables known to not take effect are: `remote.<name>.mirror` and `remote.<name>.tagOpt`.  Use the corresponding `--mirror` and `--no-tags` options instead."
-msgstr ""
-"Devido as limitações da implementação atual, algumas variáveis de "
-"configuração não entram em vigor até o próximo \"fetch\" e \"checkout\".  As "
-"variáveis de configuração que são conhecidas por não terem efeito são: "
-"`remote.<nome>.mirror` and `remote.<nome>.tagOpt`.  Em vez disso, utilize as "
-"opções correspondentes `--mirror` e `--no-tags`."
+msgstr "Devido as limitações da implementação atual, algumas variáveis de configuração não entram em vigor até o próximo \"fetch\" e \"checkout\".  As variáveis de configuração que são conhecidas por não terem efeito são: `remote.<nome>.mirror` and `remote.<nome>.tagOpt`.  Em vez disso, utilize as opções correspondentes `--mirror` e `--no-tags`."
 
 #. type: Labeled list
 #: en/git-clone.txt:225
@@ -15486,10 +14310,7 @@ msgstr "Crie um clone superficial com um histórico após o tempo especificado."
 #: en/git-clone.txt:239
 #, priority:300
 msgid "Create a shallow clone with a history, excluding commits reachable from a specified remote branch or tag.  This option can be specified multiple times."
-msgstr ""
-"Crie um clone superficial com um histórico, excluindo os commits acessíveis "
-"a partir de um ramo remoto ou tag específica.  Esta opção pode ser utilizada "
-"várias vezes."
+msgstr "Crie um clone superficial com um histórico, excluindo os commits acessíveis a partir de um ramo remoto ou tag específica.  Esta opção pode ser utilizada várias vezes."
 
 #. type: Labeled list
 #: en/git-clone.txt:240 en/git-submodule.txt:433
@@ -15507,11 +14328,7 @@ msgstr "Clone apenas o histórico que leva à ponta de uma única ramificação,
 #: en/git-clone.txt:256
 #, priority:300
 msgid "Don't clone any tags, and set `remote.<remote>.tagOpt=--no-tags` in the config, ensuring that future `git pull` and `git fetch` operations won't follow any tags. Subsequent explicit tag fetches will still work, (see linkgit:git-fetch[1])."
-msgstr ""
-"Não clone nenhuma tag e defina `remote.<remoto>.tagOpt=--no-tags` na "
-"configuração, garantindo que futuras operações do comando `git pull` e do "
-"comando `git fetch` não sigam nenhuma tag. As buscas explícitas subsequentes "
-"das tags ainda funcionarão (consulte linkgit:git-fetch[1])."
+msgstr "Não clone nenhuma tag e defina `remote.<remoto>.tagOpt=--no-tags` na configuração, garantindo que futuras operações do comando `git pull` e do comando `git fetch` não sigam nenhuma tag. As buscas explícitas subsequentes das tags ainda funcionarão (consulte linkgit:git-fetch[1])."
 
 #. type: Plain text
 #: en/git-clone.txt:261
@@ -15521,33 +14338,22 @@ msgstr "Pode ser utilizado em conjunto com o `--single-branch` para clonar e man
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<pathspec]"
 
 #. type: Plain text
 #: en/git-clone.txt:270
 #, priority:300
 msgid "After the clone is created, initialize and clone submodules within based on the provided pathspec.  If no pathspec is provided, all submodules are initialized and cloned.  This option can be given multiple times for pathspecs consisting of multiple entries.  The resulting clone has `submodule.active` set to the provided pathspec, or \".\" (meaning all submodules) if no pathspec is provided."
-msgstr ""
-"Depois que o clone é criado, inicialize e clone os submódulos com base no "
-"`pathspec` informado.  Caso nenhum `pathspec` seja informado, todos serão "
-"inicializados e clonados.  Esta opção pode ser utilizada várias vezes para a "
-"consulta de diversas entradas `pathspec`.  O clone resultante de `submodule."
-"active` define o pathspec informado ou \".\" (significa todos os submódulos) "
-"caso nenhum pathspec seja provido."
+msgstr "Depois que o clone é criado, inicialize e clone os submódulos com base no `pathspec` informado.  Caso nenhum `pathspec` seja informado, todos serão inicializados e clonados.  Esta opção pode ser utilizada várias vezes para a consulta de diversas entradas `pathspec`.  O clone resultante de `submodule.active` define o pathspec informado ou \".\" (significa todos os submódulos) caso nenhum pathspec seja provido."
 
 #. type: Plain text
 #: en/git-clone.txt:277
 #, priority:300
 msgid "Submodules are initialized and cloned using their default settings. This is equivalent to running `git submodule update --init --recursive <pathspec>` immediately after the clone is finished. This option is ignored if the cloned repository does not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)"
-msgstr ""
-"Os submódulos são inicializados e clonados utilizando as suas respectivas "
-"configurações predefinidas. Este é o equivalente a executar o comando `git "
-"submodule update --init --recursive <pathspec>` imediatamente após que a "
-"clonagem for finalizada. Esta opção é ignorada caso o repositório clonado "
-"não tenha uma árvore de trabalho/verificação (ou seja quaisquer dos comandos "
-"`--no-checkout`/`-n`, `--bare`, ou `--mirror` seja utilizado)"
+msgstr "Os submódulos são inicializados e clonados utilizando as suas respectivas configurações predefinidas. Este é o equivalente a executar o comando `git submodule update --init --recursive <pathspec>` imediatamente após que a clonagem for finalizada. Esta opção é ignorada caso o repositório clonado não tenha uma árvore de trabalho/verificação (ou seja quaisquer dos comandos `--no-checkout`/`-n`, `--bare`, ou `--mirror` seja utilizado)"
 
 #. type: Labeled list
 #: en/git-clone.txt:278
@@ -15574,7 +14380,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr "Todos os submódulos que forem clonados, para realizar a atualização os submódulos usarão a condição remota do ramo do submódulo de rastreamento em vez do SHA-1 registrado no superprojeto. Equivale encaminhar `--remote` para `git submodule update`."
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<dir git>"
@@ -15601,9 +14407,7 @@ msgstr "--jobs <n>"
 #: en/git-clone.txt:298
 #, priority:300
 msgid "The number of submodules fetched at the same time.  Defaults to the `submodule.fetchJobs` option."
-msgstr ""
-"A quantidade de submódulos que foram recuperados ao mesmo tempo.  A "
-"predefinição retorna para a opção `submodule.fetchJobs`."
+msgstr "A quantidade de submódulos que foram recuperados ao mesmo tempo.  A predefinição retorna para a opção `submodule.fetchJobs`."
 
 #. 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
@@ -15627,12 +14431,7 @@ msgstr "<diretório>"
 #: en/git-clone.txt:310
 #, priority:300
 msgid "The name of a new directory to clone into.  The \"humanish\" part of the source repository is used if no directory is explicitly given (`repo` for `/path/to/repo.git` and `foo` for `host.xz:foo/.git`).  Cloning into an existing directory is only allowed if the directory is empty."
-msgstr ""
-"O nome de um novo diretório que será clonado.  A parte \"humanística\" do "
-"repositório de origem é utilizada caso nenhum diretório seja explicitamente "
-"informado (`repo` para `/path/to/repo.git` e `foo` para `host.xz:foo/.git`)"
-".  A clonagem em um diretório existente é permitida apenas caso o diretório "
-"esteja vazio."
+msgstr "O nome de um novo diretório que será clonado.  A parte \"humanística\" do repositório de origem é utilizada caso nenhum diretório seja explicitamente informado (`repo` para `/path/to/repo.git` e `foo` para `host.xz:foo/.git`).  A clonagem em um diretório existente é permitida apenas caso o diretório esteja vazio."
 
 #. type: Plain text
 #: en/git-clone.txt:318
@@ -15656,9 +14455,7 @@ msgstr ""
 #: en/git-clone.txt:327
 #, priority:300
 msgid "Make a local clone that borrows from the current directory, without checking things out:"
-msgstr ""
-"Faça uma clonagem local que pegue emprestado do diretório atual sem realizar "
-"uma averiguação:"
+msgstr "Faça uma clonagem local que pegue emprestado do diretório atual sem realizar uma averiguação:"
 
 #. type: delimited block -
 #: en/git-clone.txt:332
@@ -15676,9 +14473,7 @@ msgstr ""
 #: en/git-clone.txt:336
 #, priority:300
 msgid "Clone from upstream while borrowing from an existing local directory:"
-msgstr ""
-"Clone a partir de um \"upstream\" enquanto pega emprestado de um diretório "
-"local já existente:"
+msgstr "Clone a partir de um \"upstream\" enquanto pega emprestado de um diretório local já existente:"
 
 #. type: delimited block -
 #: en/git-clone.txt:342
@@ -15698,8 +14493,7 @@ msgstr ""
 #: en/git-clone.txt:346
 #, priority:300
 msgid "Create a bare repository to publish your changes to the public:"
-msgstr ""
-"Crie um repositório simples para publicar as suas alterações para o público:"
+msgstr "Crie um repositório simples para publicar as suas alterações para o público:"
 
 #. type: delimited block -
 #: en/git-clone.txt:349
@@ -15745,9 +14539,7 @@ msgstr "--command=<nome>"
 #: en/git-column.txt:26
 #, priority:100
 msgid "Look up layout mode using configuration variable column.<name> and column.ui."
-msgstr ""
-"Consulta o modo de layout utilizando a coluna da variável de configuração "
-"column.<nome> e column.ui."
+msgstr "Consulta o modo de layout utilizando a coluna da variável de configuração column.<nome> e column.ui."
 
 #. type: Labeled list
 #: en/git-column.txt:27
@@ -15759,9 +14551,7 @@ msgstr "--mode=<modo>"
 #: en/git-column.txt:30
 #, priority:100
 msgid "Specify layout mode. See configuration variable column.ui for option syntax in linkgit:git-config[1]."
-msgstr ""
-"Especifica o modo de layout. Veja a variável de configuração `column.ui` "
-"para a sintaxe da opção em linkgit:git-config[1]."
+msgstr "Especifica o modo de layout. Veja a variável de configuração `column.ui` para a sintaxe da opção em linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-column.txt:31
@@ -15919,29 +14709,19 @@ msgstr "Normalmente não é o que um usuário final gostaria de usar diretamente
 #: en/git-commit-tree.txt:25
 #, priority:100
 msgid "Creates a new commit object based on the provided tree object and emits the new commit object id on stdout. The log message is read from the standard input, unless `-m` or `-F` options are given."
-msgstr ""
-"Cria um novo objeto commit com base no objeto da árvore informada e emite a "
-"nova ID do objeto commit no stdout. A mensagem do registro log é lido na "
-"entrada padrão a não ser que as opções `-m` ou `-F` sejam utilizadas."
+msgstr "Cria um novo objeto commit com base no objeto da árvore informada e emite a nova ID do objeto commit no stdout. A mensagem do registro log é lido na entrada padrão a não ser que as opções `-m` ou `-F` sejam utilizadas."
 
 #. type: Plain text
 #: en/git-commit-tree.txt:29
 #, priority:100
 msgid "The `-m` and `-F` options can be given any number of times, in any order. The commit log message will be composed in the order in which the options are given."
-msgstr ""
-"As opções `-m` e `-F` podem ser utilizadas várias vezes e em qualquer ordem. "
-"A mensagem do registro log do commit será composta na ordem em que as opções "
-"forem utilizadas."
+msgstr "As opções `-m` e `-F` podem ser utilizadas várias vezes e em qualquer ordem. A mensagem do registro log do commit será composta na ordem em que as opções forem utilizadas."
 
 #. type: Plain text
 #: en/git-commit-tree.txt:34
 #, priority:100
 msgid "A commit object may have any number of parents. With exactly one parent, it is an ordinary commit. Having more than one parent makes the commit a merge between several lines of history. Initial (root)  commits have no parents."
-msgstr ""
-"Um objeto commit pode ter uma quantidade qualquer de pais. Com exatamente um "
-"pai, é um commit comum. Ter mais de um pai torna o commit uma mesclagem "
-"entre as várias linhas do histórico. As confirmações iniciais (raiz) não têm "
-"pais."
+msgstr "Um objeto commit pode ter uma quantidade qualquer de pais. Com exatamente um pai, é um commit comum. Ter mais de um pai torna o commit uma mesclagem entre as várias linhas do histórico. As confirmações iniciais (raiz) não têm pais."
 
 #. type: Plain text
 #: en/git-commit-tree.txt:38
@@ -15989,9 +14769,7 @@ msgstr "-m <mensagem>"
 #: en/git-commit-tree.txt:56
 #, priority:100
 msgid "A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph."
-msgstr ""
-"Um parágrafo no registro log da mensagem de commit. Isto pode ser usado mais "
-"de uma vez, e cada <mensagem> se torna o seu próprio parágrafo."
+msgstr "Um parágrafo no registro log da mensagem de commit. Isto pode ser usado mais de uma vez, e cada <mensagem> se torna o seu próprio parágrafo."
 
 #. 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
@@ -16003,20 +14781,13 @@ msgstr "-F <arquivo>"
 #: en/git-commit-tree.txt:61
 #, priority:100
 msgid "Read the commit log message from the given file. Use `-` to read from the standard input. This can be given more than once and the content of each file becomes its own paragraph."
-msgstr ""
-"Leia a mensagem do registro log do commit de um arquivo informado. Utilize "
-"`-` para ler a entrada padrão. Isso pode ser dado mais de uma vez e o "
-"conteúdo de cada arquivo se torna seu próprio parágrafo."
+msgstr "Leia a mensagem do registro log do commit de um arquivo informado. Utilize `-` para ler a entrada padrão. Isso pode ser dado mais de uma vez e o conteúdo de cada arquivo se torna seu próprio parágrafo."
 
 #. type: Plain text
 #: en/git-commit-tree.txt:69
 #, priority:100
 msgid "GPG-sign commits. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
-msgstr ""
-"Commits assinados com o GPG O argumento `keyid` é opcional e a predefinição "
-"retorna para a identidade de quem fez o commit; se utilizado, deve estar "
-"anexado a opção sem espaço. `--no-gpg-sign` is useful to countermand a "
-"`--gpg-sign` option given earlier on the command line."
+msgstr "Commits assinados com o GPG O argumento `keyid` é opcional e a predefinição retorna para a identidade de quem fez o commit; se utilizado, deve estar anexado a opção sem espaço. `--no-gpg-sign` is useful to countermand a `--gpg-sign` option given earlier on the command line."
 
 #. type: Title -
 #: en/git-commit-tree.txt:71
@@ -16052,10 +14823,7 @@ msgstr "nome e o endereço de email da pessoa que faz o commit e o momento em qu
 #: en/git-commit-tree.txt:82
 #, priority:100
 msgid "A commit comment is read from stdin. If a changelog entry is not provided via \"<\" redirection, 'git commit-tree' will just wait for one to be entered and terminated with ^D."
-msgstr ""
-"Um comentário de um commit é lido no stdin. Se uma entrada no changelog não "
-"for informada através do redirecionamento \"<\", o comando `git commit-tree` "
-"esperará apenas que um seja inserido e termine com um '^D'."
+msgstr "Um comentário de um commit é lido no stdin. Se uma entrada no changelog não for informada através do redirecionamento \"<\", o comando `git commit-tree` esperará apenas que um seja inserido e termine com um '^D'."
 
 #. type: Title -
 #: en/git-commit-tree.txt:86
@@ -16117,13 +14885,7 @@ msgstr ""
 #: en/git-commit.txt:27
 #, priority:280
 msgid "Create a new commit containing the current contents of the index and the given log message describing the changes. The new commit is a direct child of HEAD, usually the tip of the current branch, and the branch is updated to point to it (unless no branch is associated with the working tree, in which case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
-msgstr ""
-"Cria um novo commit que tenha todos os conteúdos atuais do índice e a "
-"mensagem informada no registro log descrevendo as alterações. Um novo commit "
-"é um herdeiro direto do `HEAD` que em geral é o topo do ramo atual e o ramo "
-"é atualizado para apontar para ele (a menos que nenhum ramo seja associado "
-"com a árvore de trabalho onde no caso o `HEAD` esteja desanexado como "
-"descrito em linkgit:git-checkout[1])."
+msgstr "Cria um novo commit que tenha todos os conteúdos atuais do índice e a mensagem informada no registro log descrevendo as alterações. Um novo commit é um herdeiro direto do `HEAD` que em geral é o topo do ramo atual e o ramo é atualizado para apontar para ele (a menos que nenhum ramo seja associado com a árvore de trabalho onde no caso o `HEAD` esteja desanexado como descrito em linkgit:git-checkout[1])."
 
 #. type: Plain text
 #: en/git-commit.txt:29
@@ -16147,32 +14909,19 @@ msgstr "ao usar linkgit:git-rm[1] para remover os arquivos da árvore de trabalh
 #: en/git-commit.txt:42
 #, priority:280
 msgid "by listing files as arguments to the 'commit' command (without --interactive or --patch switch), in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already be known to Git);"
-msgstr ""
-"ao listar os arquivos como argumentos para o comando 'commit' (sem usar as "
-"opções --interactive ou --patch), nesse caso, o commit ignorará as "
-"alterações organizadas no índice e em vez disso registrará o conteúdo atual "
-"dos arquivos listados (que já devem ser informados pelo Git );"
+msgstr "ao listar os arquivos como argumentos para o comando 'commit' (sem usar as opções --interactive ou --patch), nesse caso, o commit ignorará as alterações organizadas no índice e em vez disso registrará o conteúdo atual dos arquivos listados (que já devem ser informados pelo Git );"
 
 #. type: Plain text
 #: en/git-commit.txt:48
 #, priority:280
 msgid "by using the -a switch with the 'commit' command to automatically \"add\" changes from all known files (i.e. all files that are already listed in the index) and to automatically \"rm\" files in the index that have been removed from the working tree, and then perform the actual commit;"
-msgstr ""
-"ao usar a opção -a com o comando 'commit' para \"adicionar\" automaticamente "
-"as alterações de todos os arquivos informados (ou seja, todos os arquivos "
-"que já estão listados no índice) e \"rm\" para remover os arquivos "
-"automaticamente da árvore de trabalho e assim executar o commit de fato;"
+msgstr "ao usar a opção -a com o comando 'commit' para \"adicionar\" automaticamente as alterações de todos os arquivos informados (ou seja, todos os arquivos que já estão listados no índice) e \"rm\" para remover os arquivos automaticamente da árvore de trabalho e assim executar o commit de fato;"
 
 #. type: Plain text
 #: en/git-commit.txt:54
 #, priority:280
 msgid "by using the --interactive or --patch switches with the 'commit' command to decide one by one which files or hunks should be part of the commit in addition to contents in the index, before finalizing the operation. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate these modes."
-msgstr ""
-"usando as opções `--interactive` ou `--patch` com o comando 'commit' para "
-"decidir um por um quais os arquivos ou os blocos devem fazer parte do commit "
-"além do conteúdo do índice, antes de finalizar a operação. Consulte a seção "
-"``Modo Interativo'' do linkgit:git-add[1] para aprender como operar estes "
-"modos."
+msgstr "usando as opções `--interactive` ou `--patch` com o comando 'commit' para decidir um por um quais os arquivos ou os blocos devem fazer parte do commit além do conteúdo do índice, antes de finalizar a operação. Consulte a seção ``Modo Interativo'' do linkgit:git-add[1] para aprender como operar estes modos."
 
 #. type: Plain text
 #: en/git-commit.txt:58
@@ -16196,9 +14945,7 @@ msgstr "Diz ao comando para preparar automaticamente os arquivos que foram modif
 #: en/git-commit.txt:76
 #, priority:280
 msgid "Use the interactive patch selection interface to chose which changes to commit. See linkgit:git-add[1] for details."
-msgstr ""
-"Utilize a interface interativa do patch para selecionar quais as alterações "
-"serão aplicadas ao commit. Para mais detalhes, consulte linkgit:git-add[1]."
+msgstr "Utilize a interface interativa do patch para selecionar quais as alterações serão aplicadas ao commit. Para mais detalhes, consulte linkgit:git-add[1]."
 
 #. type: Labeled list
 #: en/git-commit.txt:77
@@ -16246,11 +14993,7 @@ msgstr "--fixup=<commit>"
 #: en/git-commit.txt:93
 #, priority:280
 msgid "Construct a commit message for use with `rebase --autosquash`.  The commit message will be the subject line from the specified commit with a prefix of \"fixup! \".  See linkgit:git-rebase[1] for details."
-msgstr ""
-"Constrói a mensagem de um commit para utilizar com `rebase --autosquash`.  A "
-"mensagem do commit será o assunt da linha a partir de um determinado commit "
-"com um prefixo \"fixup! \".  Para mais detalhes, consulte linkgit:git-"
-"rebase[1]."
+msgstr "Constrói a mensagem de um commit para utilizar com `rebase --autosquash`.  A mensagem do commit será o assunt da linha a partir de um determinado commit com um prefixo \"fixup! \".  Para mais detalhes, consulte linkgit:git-rebase[1]."
 
 #. type: Labeled list
 #: en/git-commit.txt:94
@@ -16262,12 +15005,7 @@ msgstr "--squash=<commit>"
 #: en/git-commit.txt:100
 #, priority:280
 msgid "Construct a commit message for use with `rebase --autosquash`.  The commit message subject line is taken from the specified commit with a prefix of \"squash! \".  Can be used with additional commit message options (`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
-msgstr ""
-"Constrói a mensagem de um commit para utilizar com `rebase --autosquash`.  A "
-"linha do assunto da mensagem do commit é retirada de um determinado commit "
-"com um prefixo \"squash! \".  Pode ser usado com as opções adicionais das "
-"mensagens dos commits (`-m`/`-c`/`-C`/`-F`). Para mais detalhes, consulte "
-"linkgit:git-rebase[1]."
+msgstr "Constrói a mensagem de um commit para utilizar com `rebase --autosquash`.  A linha do assunto da mensagem do commit é retirada de um determinado commit com um prefixo \"squash! \".  Pode ser usado com as opções adicionais das mensagens dos commits (`-m`/`-c`/`-C`/`-F`). Para mais detalhes, consulte linkgit:git-rebase[1]."
 
 #. type: Labeled list
 #: en/git-commit.txt:101
@@ -16279,11 +15017,7 @@ msgstr "--reset-author"
 #: en/git-commit.txt:106
 #, priority:280
 msgid "When used with -C/-c/--amend options, or when committing after a conflicting cherry-pick, declare that the authorship of the resulting commit now belongs to the committer. This also renews the author timestamp."
-msgstr ""
-"Quando utilizado com as opções '-C/-c/--amend', ou ao fazer o commit após "
-"uma escolha seletiva conflitante, declare que a autoria do commit resultante "
-"agora pertence a quem fez o commit. Isso também renova o registro de data e "
-"hora do autor."
+msgstr "Quando utilizado com as opções '-C/-c/--amend', ou ao fazer o commit após uma escolha seletiva conflitante, declare que a autoria do commit resultante agora pertence a quem fez o commit. Isso também renova o registro de data e hora do autor."
 
 #. type: Labeled list
 #: en/git-commit.txt:107 en/git-status.txt:28 en/git-symbolic-ref.txt:45
@@ -16295,9 +15029,7 @@ msgstr "--short"
 #: en/git-commit.txt:110
 #, priority:280
 msgid "When doing a dry-run, give the output in the short-format. See linkgit:git-status[1] for details. Implies `--dry-run`."
-msgstr ""
-"Ao executar um ensaio, informe a saída no formato curto. Para mais detalhes, "
-"consulte linkgit:git-status[1]. Implica no uso da opção `--dry-run`."
+msgstr "Ao executar um ensaio, informe a saída no formato curto. Para mais detalhes, consulte linkgit:git-status[1]. Implica no uso da opção `--dry-run`."
 
 #. type: Labeled list
 #: en/git-commit.txt:111 en/git-status.txt:32
@@ -16315,10 +15047,7 @@ msgstr "Exibe o ramo e a informação de rastreio quando estiver em formato curt
 #: en/git-commit.txt:118
 #, priority:280
 msgid "When doing a dry-run, give the output in a porcelain-ready format. See linkgit:git-status[1] for details. Implies `--dry-run`."
-msgstr ""
-"Ao executar um ensaio, informe a saída no formato porcelana. Para mais "
-"detalhes, consulte linkgit:git-status[1]. Implica no uso da opção `--dry-"
-"run`."
+msgstr "Ao executar um ensaio, informe a saída no formato porcelana. Para mais detalhes, consulte linkgit:git-status[1]. Implica no uso da opção `--dry-run`."
 
 #. type: Labeled list
 #: en/git-commit.txt:119 en/git-describe.txt:87 en/git-ls-tree.txt:52 en/git-status.txt:47
@@ -16330,9 +15059,7 @@ msgstr "--long"
 #: en/git-commit.txt:122
 #, priority:280
 msgid "When doing a dry-run, give the output in the long-format.  Implies `--dry-run`."
-msgstr ""
-"Ao executar um ensaio, informe a saída no formato curto.  Implica no uso da "
-"opção `--dry-run`."
+msgstr "Ao executar um ensaio, informe a saída no formato curto.  Implica no uso da opção `--dry-run`."
 
 #. type: Labeled list
 #: en/git-commit.txt:124 en/git-config.txt:207 en/git-grep.txt:208
@@ -16344,13 +15071,7 @@ msgstr "--null"
 #: en/git-commit.txt:131
 #, priority:280
 msgid "When showing `short` or `porcelain` status output, print the filename verbatim and terminate the entries with NUL, instead of LF.  If no format is given, implies the `--porcelain` output format.  Without the `-z` option, filenames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Ao exibir a condição de saída `short` ou `porcelain`, imprima o nome do "
-"arquivo literalmente e termine as entradas com um `NUL`, em vez do `LF`.  "
-"Caso nenhum formato de saída seja informado, implica no uso da opção "
-"`--porcelain`.  Sem a opção `-z`, os nomes dos arquivos com caracteres "
-"\"incomuns\" serão citados conforme explicado nas variáveis de configuração "
-"`core.quotePath` (consulte linkgit:git-config[1])."
+msgstr "Ao exibir a condição de saída `short` ou `porcelain`, imprima o nome do arquivo literalmente e termine as entradas com um `NUL`, em vez do `LF`.  Caso nenhum formato de saída seja informado, implica no uso da opção `--porcelain`.  Sem a opção `-z`, os nomes dos arquivos com caracteres \"incomuns\" serão citados conforme explicado nas variáveis de configuração `core.quotePath` (consulte linkgit:git-config[1])."
 
 #. type: Labeled list
 #: en/git-commit.txt:133 en/git-merge.txt:78 en/git-notes.txt:141 en/git-tag.txt:171
@@ -16362,9 +15083,7 @@ msgstr "--file=<arquivo>"
 #: en/git-commit.txt:136
 #, priority:280
 msgid "Take the commit message from the given file.  Use '-' to read the message from the standard input."
-msgstr ""
-"Pega a mensagem de commit vindo de um determinado arquivo.  Utilize '-' para "
-"ler a mensagem da entrada padrão."
+msgstr "Pega a mensagem de commit vindo de um determinado arquivo.  Utilize '-' para ler a mensagem da entrada padrão."
 
 #. type: Labeled list
 #: en/git-commit.txt:137
@@ -16376,13 +15095,7 @@ msgstr "--author=<autor>"
 #: en/git-commit.txt:143
 #, priority:280
 msgid "Override the commit author. Specify an explicit author using the standard `A U Thor <author@example.com>` format. Otherwise <author> is assumed to be a pattern and is used to search for an existing commit by that author (i.e. rev-list --all -i --author=<author>); the commit author is then copied from the first such commit found."
-msgstr ""
-"Sobrescreva o commit do autor. Defina o autor de forma explicita usando o "
-"formato padrão `Chiquinha <chiquinha@examplo.com>`. Caso contrário, assume-"
-"se que a predefinição seja <autor> que é usado para localizar um commit já "
-"existente feito através deste autor (ou seja, `rev-list --all -i "
-"--author=<autor>`); o autor do commit é copiado a partir do primeiro commit "
-"que for encontrado."
+msgstr "Sobrescreva o commit do autor. Defina o autor de forma explicita usando o formato padrão `Chiquinha <chiquinha@examplo.com>`. Caso contrário, assume-se que a predefinição seja <autor> que é usado para localizar um commit já existente feito através deste autor (ou seja, `rev-list --all -i --author=<autor>`); o autor do commit é copiado a partir do primeiro commit que for encontrado."
 
 #. type: Labeled list
 #: en/git-commit.txt:144
@@ -16436,15 +15149,7 @@ msgstr "--template=<arquivo>"
 #: en/git-commit.txt:165
 #, priority:280
 msgid "When editing the commit message, start the editor with the contents in the given file.  The `commit.template` configuration variable is often used to give this option implicitly to the command.  This mechanism can be used by projects that want to guide participants with some hints on what to write in the message in what order.  If the user exits the editor without editing the message, the commit is aborted.  This has no effect when a message is given by other means, e.g. with the `-m` or `-F` options."
-msgstr ""
-"Ao editar a mensagem do commit, inicie o editor com o conteúdo do arquivo "
-"informado.  A variável de configuração `commit.template` é frequentemente "
-"utilizada para fornecer esta opção de forma implícita ao comando.  Esse "
-"mecanismo pode ser utilizado por projetos que desejam orientar os "
-"participantes com algumas dicas sobre o que escrever na mensagem e em qual "
-"ordem.  Aborte o commit caso o usuário saia do editor sem editar a "
-"mensagem.  Não qualquer efeito quando uma mensagem é dada por outros meios, "
-"por exemplo, com as opções `-m` ou `-F`."
+msgstr "Ao editar a mensagem do commit, inicie o editor com o conteúdo do arquivo informado.  A variável de configuração `commit.template` é frequentemente utilizada para fornecer esta opção de forma implícita ao comando.  Esse mecanismo pode ser utilizado por projetos que desejam orientar os participantes com algumas dicas sobre o que escrever na mensagem e em qual ordem.  Aborte o commit caso o usuário saia do editor sem editar a mensagem.  Não qualquer efeito quando uma mensagem é dada por outros meios, por exemplo, com as opções `-m` ou `-F`."
 
 #. type: Plain text
 #: en/git-commit.txt:174 en/merge-options.txt:88
@@ -16468,21 +15173,13 @@ msgstr "Esta opção ignora os ganchos dos commits anteriores e os ganchos das m
 #: en/git-commit.txt:185
 #, priority:280
 msgid "Usually recording a commit that has the exact same tree as its sole parent commit is a mistake, and the command prevents you from making such a commit.  This option bypasses the safety, and is primarily for use by foreign SCM interface scripts."
-msgstr ""
-"Geralmente, ao gravar um commit que tenha exatamente a mesma árvore como se "
-"fosse a sua origem, é um erro, o comando impede que você faça um commit "
-"desta natureza.  Esta opção ignora a segurança e deve ser utilizada "
-"principalmente por scripts SCM externos."
+msgstr "Geralmente, ao gravar um commit que tenha exatamente a mesma árvore como se fosse a sua origem, é um erro, o comando impede que você faça um commit desta natureza.  Esta opção ignora a segurança e deve ser utilizada principalmente por scripts SCM externos."
 
 #. type: Plain text
 #: en/git-commit.txt:191
 #, priority:280
 msgid "Like --allow-empty this command is primarily for use by foreign SCM interface scripts. It allows you to create a commit with an empty commit message without using plumbing commands like linkgit:git-commit-tree[1]."
-msgstr ""
-"Como a opção `--allow-empty`, este comando é principalmente para uso por "
-"scripts de interface SCM externos. Permite criar um commit com uma mensagem "
-"vazia sem usar os comandos de \"encanamento\" como linkgit:git-commit-"
-"tree[1]."
+msgstr "Como a opção `--allow-empty`, este comando é principalmente para uso por scripts de interface SCM externos. Permite criar um commit com uma mensagem vazia sem usar os comandos de \"encanamento\" como linkgit:git-commit-tree[1]."
 
 #. type: Plain text
 #: en/git-commit.txt:196
@@ -16500,9 +15197,7 @@ msgstr "strip (tirar/remover)"
 #: en/git-commit.txt:201
 #, priority:280
 msgid "Strip leading and trailing empty lines, trailing whitespace, commentary and collapse consecutive empty lines."
-msgstr ""
-"Retira as linhas vazias no inicio e no final, e os rastros dos espaços "
-"finais, os comentários e reduza as linhas vazias consecutivamente."
+msgstr "Retira as linhas vazias no inicio e no final, e os rastros dos espaços finais, os comentários e reduza as linhas vazias consecutivamente."
 
 #. type: Labeled list
 #: en/git-commit.txt:201
@@ -16538,10 +15233,7 @@ msgstr "scissors (tesouras)"
 #: en/git-commit.txt:209
 #, priority:280
 msgid "Same as `whitespace` except that everything from (and including)  the line found below is truncated, if the message is to be edited.  \"`#`\" can be customized with core.commentChar."
-msgstr ""
-"O mesmo que `whitespace` (espaço), exceto que tudo incluindo a linha "
-"encontrada abaixo seja truncada caso a mensagem precise ser editada.  \"`#`\""
-" pode ser personalizada com `core.commentChar`."
+msgstr "O mesmo que `whitespace` (espaço), exceto que tudo incluindo a linha encontrada abaixo seja truncada caso a mensagem precise ser editada.  \"`#`\" pode ser personalizada com `core.commentChar`."
 
 #. type: Plain text
 #: en/git-commit.txt:211
@@ -16553,17 +15245,13 @@ msgstr "# ------------------------ >8 ------------------------\n"
 #: en/git-commit.txt:215
 #, priority:280
 msgid "Same as `strip` if the message is to be edited.  Otherwise `whitespace`."
-msgstr ""
-"O mesmo que `strip` caso a mensagem esteja para ser editada.  Caso "
-"contrário, `whitespace` (espaço)."
+msgstr "O mesmo que `strip` caso a mensagem esteja para ser editada.  Caso contrário, `whitespace` (espaço)."
 
 #. type: Plain text
 #: en/git-commit.txt:219
 #, priority:280
 msgid "The default can be changed by the `commit.cleanup` configuration variable (see linkgit:git-config[1])."
-msgstr ""
-"A predefinição pode ser alterada através da variável de configuração `commit."
-"cleanup` (consulte linkgit:git-config[1])."
+msgstr "A predefinição pode ser alterada através da variável de configuração `commit.cleanup` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-commit.txt:226
@@ -16659,17 +15347,7 @@ msgstr "--only"
 #: en/git-commit.txt:281
 #, priority:280
 msgid "Make a commit by taking the updated working tree contents of the paths specified on the command line, disregarding any contents that have been staged for other paths. This is the default mode of operation of 'git commit' if any paths are given on the command line, in which case this option can be omitted.  If this option is specified together with `--amend`, then no paths need to be specified, which can be used to amend the last commit without committing changes that have already been staged. If used together with `--allow-empty` paths are also not required, and an empty commit will be created."
-msgstr ""
-"Faça um commit utilizando o conteúdo atualizado da árvore de trabalho dos "
-"caminhos definidos na linha de comando, desconsiderando qualquer outro "
-"conteúdo que tenha sido preparado para os outros caminhos. Essa é a maneira "
-"predefinida de operação do comando `git commit` caso algum outro caminho "
-"tenha sido informado na linha de comando; nesse caso, essa opção poderá ser "
-"omitida.  Caso esta opção seja utilizada junto com `--amend`, nenhum outro "
-"caminho precisará ser informado, o que pode ser utilizado para alterar o "
-"último commit sem confirmar as alterações que já foram preparadas. Se "
-"utilizado junto com a opção`--allow empty` também não são necessários e um "
-"commit vazio será criado."
+msgstr "Faça um commit utilizando o conteúdo atualizado da árvore de trabalho dos caminhos definidos na linha de comando, desconsiderando qualquer outro conteúdo que tenha sido preparado para os outros caminhos. Essa é a maneira predefinida de operação do comando `git commit` caso algum outro caminho tenha sido informado na linha de comando; nesse caso, essa opção poderá ser omitida.  Caso esta opção seja utilizada junto com `--amend`, nenhum outro caminho precisará ser informado, o que pode ser utilizado para alterar o último commit sem confirmar as alterações que já foram preparadas. Se utilizado junto com a opção`--allow empty` também não são necessários e um commit vazio será criado."
 
 #. type: Labeled list
 #: en/git-commit.txt:295 en/git-status.txt:58
@@ -16693,11 +15371,7 @@ msgstr "Exibe arquivos sem rastreamento."
 #: en/git-commit.txt:303
 #, priority:280
 msgid "The mode parameter is optional (defaults to 'all'), and is used to specify the handling of untracked files; when -u is not used, the default is 'normal', i.e. show untracked files and directories."
-msgstr ""
-"O parâmetro `<modo>` é opcional, a predefinição retorna para `all` (todos), "
-"sendo utilizado para determinar a manipulação dos arquivos que não foram "
-"rastreados; quando a opção `-u` não é utilizada a predefinição retorna para "
-"`normal`, ou seja, exibe os arquivos e diretórios que não foram rastreados."
+msgstr "O parâmetro `<modo>` é opcional, a predefinição retorna para `all` (todos), sendo utilizado para determinar a manipulação dos arquivos que não foram rastreados; quando a opção `-u` não é utilizada a predefinição retorna para `normal`, ou seja, exibe os arquivos e diretórios que não foram rastreados."
 
 #. type: Plain text
 #: en/git-commit.txt:305 en/git-status.txt:68 en/git-status.txt:110
@@ -16727,9 +15401,7 @@ msgstr "'all'    - Exibe todos os arquivos individualmente nos diretórios não
 #: en/git-commit.txt:312 en/git-status.txt:85
 #, priority:280
 msgid "The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]."
-msgstr ""
-"A predefinição pode ser alterada utilizando a variável de configuração "
-"`status.showUntrackedFiles` documentada em linkgit:git-config[1]."
+msgstr "A predefinição pode ser alterada utilizando a variável de configuração `status.showUntrackedFiles` documentada em linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-commit.txt:324
@@ -16753,10 +15425,7 @@ msgstr "Suprimir a mensagem de resumo do commit."
 #: en/git-commit.txt:337
 #, priority:280
 msgid "Do not create a commit, but show a list of paths that are to be committed, paths with local changes that will be left uncommitted and paths that are untracked."
-msgstr ""
-"Não crie um commit porém exiba uma lista dos caminhos onde os commits devem "
-"ser feitos, os caminhos com as alterações locais onde os commits serão "
-"deixados de lado e os caminhos que não serão rastreados."
+msgstr "Não crie um commit porém exiba uma lista dos caminhos onde os commits devem ser feitos, os caminhos com as alterações locais onde os commits serão deixados de lado e os caminhos que não serão rastreados."
 
 #. type: Labeled list
 #: en/git-commit.txt:338
@@ -16768,11 +15437,7 @@ msgstr "--status"
 #: en/git-commit.txt:343
 #, priority:280
 msgid "Include the output of linkgit:git-status[1] in the commit message template when using an editor to prepare the commit message.  Defaults to on, but can be used to override configuration variable commit.status."
-msgstr ""
-"Inclua a saída do linkgit:git-status[1] na mensagem do commit ao usar um "
-"editor para preparar a mensagem do commit.  A predefinição retorna para "
-"ligado, porém pode ser utilizado para substituir a variável de configuração "
-"`commit.status`."
+msgstr "Inclua a saída do linkgit:git-status[1] na mensagem do commit ao usar um editor para preparar a mensagem do commit.  A predefinição retorna para ligado, porém pode ser utilizado para substituir a variável de configuração `commit.status`."
 
 #. type: Labeled list
 #: en/git-commit.txt:344
@@ -16840,11 +15505,7 @@ msgstr "O comando `git commit -a` primeiro olha para a sua árvore de trabalho,
 #: en/git-commit.txt:411
 #, priority:280
 msgid "After staging changes to many files, you can alter the order the changes are recorded in, by giving pathnames to `git commit`.  When pathnames are given, the command makes a commit that only records the changes made to the named paths:"
-msgstr ""
-"Após preparar as mudanças em muitos arquivos, você pode alterar a ordem em "
-"que as alterações são registradas ao encaminhar `pathnames` para `git commit`"
-".  Quando `pathnames` são utilizados, o comando faz um commit que registra "
-"apenas as alterações feitas nos caminhos informados:"
+msgstr "Após preparar as mudanças em muitos arquivos, você pode alterar a ordem em que as alterações são registradas ao encaminhar `pathnames` para `git commit`.  Quando `pathnames` são utilizados, o comando faz um commit que registra apenas as alterações feitas nos caminhos informados:"
 
 #. type: delimited block -
 #: en/git-commit.txt:417
@@ -16908,14 +15569,7 @@ msgstr "Após resolver os conflitos e organizar o resultado, o `git ls-files -u`
 #: en/git-commit.txt:461
 #, priority:280
 msgid "As with the case to record your own changes, you can use `-a` option to save typing.  One difference is that during a merge resolution, you cannot use `git commit` with pathnames to alter the order the changes are committed, because the merge should be recorded as a single commit.  In fact, the command refuses to run when given pathnames (but see `-i` option)."
-msgstr ""
-"Como no caso de registrar as suas próprias alterações, você pode usar a "
-"opção `-a` para salvar a digitação.  Uma diferença é que durante uma "
-"resolução da mesclagem, você não pode utilizar o comando `git commit` com o "
-"`pathnames` para alterar a ordem onde as alterações dos commits foram "
-"realizados porque a mesclagem deve ser registrada como um commit.  De fato, "
-"o comando se recusa a ser executado quando recebem os nomes do caminho ("
-"consulte a opção `-i`)."
+msgstr "Como no caso de registrar as suas próprias alterações, você pode usar a opção `-a` para salvar a digitação.  Uma diferença é que durante uma resolução da mesclagem, você não pode utilizar o comando `git commit` com o `pathnames` para alterar a ordem onde as alterações dos commits foram realizados porque a mesclagem deve ser registrada como um commit.  De fato, o comando se recusa a ser executado quando recebem os nomes do caminho (consulte a opção `-i`)."
 
 #. type: Title -
 #: en/git-commit.txt:463
@@ -16981,15 +15635,7 @@ msgstr "O uso típico é definir apenas as variáveis `user.name` e `user.email`
 #: en/git-commit.txt:510
 #, priority:280
 msgid "Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description.  The text up to the first blank line in a commit message is treated as the commit title, and that title is used throughout Git.  For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body."
-msgstr ""
-"Embora não seja obrigatório, é uma boa ideia iniciar a mensagem do commit "
-"com uma única linha curta (com menos de 50 caracteres) resumindo a "
-"alteração, seguida por uma linha em branco e em seguida, uma descrição mais "
-"completa.  O texto até a primeira linha em branco em uma mensagem do commit "
-"é tratado como o título do commit e esse título é utilizado através de todo "
-"o Git.  Por exemplo, o linkgit:git-format-patch[1] transforma um commit em "
-"um email e usa o título na linha de assunto e o restante do commit no corpo "
-"da mensagem."
+msgstr "Embora não seja obrigatório, é uma boa ideia iniciar a mensagem do commit com uma única linha curta (com menos de 50 caracteres) resumindo a alteração, seguida por uma linha em branco e em seguida, uma descrição mais completa.  O texto até a primeira linha em branco em uma mensagem do commit é tratado como o título do commit e esse título é utilizado através de todo o Git.  Por exemplo, o linkgit:git-format-patch[1] transforma um commit em um email e usa o título na linha de assunto e o restante do commit no corpo da mensagem."
 
 #. type: Title -
 #: en/git-commit.txt:514
@@ -17001,12 +15647,7 @@ msgstr "VARIÁVEIS DE AMBIENTE E CONFIGURAÇÃO"
 #: en/git-commit.txt:519
 #, priority:280
 msgid "The editor used to edit the commit log message will be chosen from the `GIT_EDITOR` environment variable, the core.editor configuration variable, the `VISUAL` environment variable, or the `EDITOR` environment variable (in that order).  See linkgit:git-var[1] for details."
-msgstr ""
-"O editor usado para editar a mensagem do registro log do commit que será "
-"escolhido entre a variável de ambiente `GIT_EDITOR`, a variável de "
-"configuração `core.editor`, a variável de ambiente `VISUAL` ou a variável de "
-"ambiente `EDITOR` (nesta ordem).  Para mais detalhes, consulte linkgit:git-"
-"var[1]."
+msgstr "O editor usado para editar a mensagem do registro log do commit que será escolhido entre a variável de ambiente `GIT_EDITOR`, a variável de configuração `core.editor`, a variável de ambiente `VISUAL` ou a variável de ambiente `EDITOR` (nesta ordem).  Para mais detalhes, consulte linkgit:git-var[1]."
 
 #. type: Plain text
 #: en/git-commit.txt:525
@@ -17174,10 +15815,7 @@ msgstr "--replace-all"
 #: en/git-config.txt:77
 #, priority:100
 msgid "Default behavior is to replace at most one line. This replaces all lines matching the key (and optionally the value_regex)."
-msgstr ""
-"O comportamento predefinido é substituir pelo menos uma linha. Isso "
-"substitui todas as linhas que coincidam com a chave (e opcionalmente ao "
-"\"value_regex\")."
+msgstr "O comportamento predefinido é substituir pelo menos uma linha. Isso substitui todas as linhas que coincidam com a chave (e opcionalmente ao \"value_regex\")."
 
 #. type: Labeled list
 #: en/git-config.txt:78 en/git-update-index.txt:45
@@ -17189,9 +15827,7 @@ msgstr "--add"
 #: en/git-config.txt:82
 #, priority:100
 msgid "Adds a new line to the option without altering any existing values.  This is the same as providing '^$' as the value_regex in `--replace-all`."
-msgstr ""
-"Adiciona uma nova linha à opção, sem alterar nenhum valor já existente.  É o "
-"mesmo que informar '^$' como o `valor_regex` na opção `--replace-all`."
+msgstr "Adiciona uma nova linha à opção, sem alterar nenhum valor já existente.  É o mesmo que informar '^$' como o `valor_regex` na opção `--replace-all`."
 
 #. type: Labeled list
 #: en/git-config.txt:83
@@ -17203,11 +15839,7 @@ msgstr "--get"
 #: en/git-config.txt:87
 #, priority:100
 msgid "Get the value for a given key (optionally filtered by a regex matching the value). Returns error code 1 if the key was not found and the last value if multiple key values were found."
-msgstr ""
-"Obtenha o valor para uma determinada chave (opcionalmente filtrada por uma "
-"expressão regular que coincida com o valor). Retorna o código de erro '1' "
-"caso a chave não seja encontrada e o último valor caso vários valores da "
-"chave sejam encontrados."
+msgstr "Obtenha o valor para uma determinada chave (opcionalmente filtrada por uma expressão regular que coincida com o valor). Retorna o código de erro '1' caso a chave não seja encontrada e o último valor caso vários valores da chave sejam encontrados."
 
 #. type: Labeled list
 #: en/git-config.txt:88
@@ -17231,12 +15863,7 @@ msgstr "--get-regexp"
 #: en/git-config.txt:97
 #, priority:100
 msgid "Like --get-all, but interprets the name as a regular expression and writes out the key names.  Regular expression matching is currently case-sensitive and done against a canonicalized version of the key in which section and variable names are lowercased, but subsection names are not."
-msgstr ""
-"Como a opção `--get-all`, porém interpreta o nome como uma expressão regular "
-"e escreve os nomes das chaves.  A coincidência comum da expressão regular é "
-"sensível a maiúsculas e minúsculas, é feita contra uma versão canonizado da "
-"chave onde a seção e os nomes das variáveis são minúsculas, porém os nomes "
-"das subseções não são."
+msgstr "Como a opção `--get-all`, porém interpreta o nome como uma expressão regular e escreve os nomes das chaves.  A coincidência comum da expressão regular é sensível a maiúsculas e minúsculas, é feita contra uma versão canonizado da chave onde a seção e os nomes das variáveis são minúsculas, porém os nomes das subseções não são."
 
 #. type: Labeled list
 #: en/git-config.txt:98
@@ -17248,13 +15875,7 @@ msgstr "--get-urlmatch nome URL"
 #: en/git-config.txt:105
 #, priority:100
 msgid "When given a two-part name section.key, the value for section.<url>.key whose <url> part matches the best to the given URL is returned (if no such key exists, the value for section.key is used as a fallback).  When given just the section as name, do so for all the keys in the section and list them.  Returns error code 1 if no value is found."
-msgstr ""
-"Quando é utilizado em um nome com duas partes `section.key`, o valor da "
-"`section.<url>.key` cuja parte da <url> coincida para o retorno da melhor "
-"URL informada (caso essa chave não exista, o valor do `section.key` será "
-"usado como substituto).  Quando receber apenas a seção como nome, faça-o "
-"para todas as chaves da seção e liste-as.  Retorna o código de erro 1 caso "
-"nenhum valor seja encontrado."
+msgstr "Quando é utilizado em um nome com duas partes `section.key`, o valor da `section.<url>.key` cuja parte da <url> coincida para o retorno da melhor URL informada (caso essa chave não exista, o valor do `section.key` será usado como substituto).  Quando receber apenas a seção como nome, faça-o para todas as chaves da seção e liste-as.  Retorna o código de erro 1 caso nenhum valor seja encontrado."
 
 #. type: Labeled list
 #: en/git-config.txt:106
@@ -17320,10 +15941,7 @@ msgstr "--worktree"
 #: en/git-config.txt:140
 #, priority:100
 msgid "Similar to `--local` except that `.git/config.worktree` is read from or written to if `extensions.worktreeConfig` is present. If not it's the same as `--local`."
-msgstr ""
-"Semelhante a opção `--local`, exceto que o a opção de configuração `.git/"
-"config.worktree` é lido ou gravado caso `extensions.worktreeConfig` existir. "
-"Caso não seja, é o mesmo que a opção `--local`."
+msgstr "Semelhante a opção `--local`, exceto que o a opção de configuração `.git/config.worktree` é lido ou gravado caso `extensions.worktreeConfig` existir. Caso não seja, é o mesmo que a opção `--local`."
 
 #. type: Labeled list
 #: en/git-config.txt:141
@@ -17341,9 +15959,7 @@ msgstr "--file arquivo-config"
 #: en/git-config.txt:144
 #, priority:100
 msgid "Use the given config file instead of the one specified by GIT_CONFIG."
-msgstr ""
-"Utilize o arquivo de configuração informado em vez daquele especificado por "
-"GIT_CONFIG."
+msgstr "Utilize o arquivo de configuração informado em vez daquele especificado por GIT_CONFIG."
 
 #. type: Labeled list
 #: en/git-config.txt:145
@@ -17355,12 +15971,7 @@ msgstr "--blob blob"
 #: en/git-config.txt:151
 #, priority:100
 msgid "Similar to `--file` but use the given blob instead of a file. E.g.  you can use 'master:.gitmodules' to read values from the file '.gitmodules' in the master branch. See \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7] for a more complete list of ways to spell blob names."
-msgstr ""
-"É semelhante a opção `--file` porém utilize a bolha informada em vez de um "
-"arquivo. Como por exemplo, é possível utilizar 'master:.gitmodules' para ler "
-"os valores de um arquivo '.gitmodules' no ramo \"master\". Para conhecer uma "
-"lista completa das diferentes maneiras de soletrar os nomes das bolhas, "
-"consulte a seção \"DEFININDO AS REVISÕES\" em linkgit:gitrevisions[7]."
+msgstr "É semelhante a opção `--file` porém utilize a bolha informada em vez de um arquivo. Como por exemplo, é possível utilizar 'master:.gitmodules' para ler os valores de um arquivo '.gitmodules' no ramo \"master\". Para conhecer uma lista completa das diferentes maneiras de soletrar os nomes das bolhas, consulte a seção \"DEFININDO AS REVISÕES\" em linkgit:gitrevisions[7]."
 
 #. type: Labeled list
 #: en/git-config.txt:152
@@ -17444,10 +16055,7 @@ msgstr "'bool': canoniza os valores como 'true' ou 'false'."
 #: en/git-config.txt:179
 #, priority:100
 msgid "'int': canonicalize values as simple decimal numbers. An optional suffix of 'k', 'm', or 'g' will cause the value to be multiplied by 1024, 1048576, or 1073741824 upon input."
-msgstr ""
-"'int': canoniza os valores como números decimais simples. Um sufixo opcional "
-"com 'k', 'm' ou 'g' fará com que o valor seja multiplicado por 1024, 1048576 "
-"ou 1073741824 na entrada."
+msgstr "'int': canoniza os valores como números decimais simples. Um sufixo opcional com 'k', 'm' ou 'g' fará com que o valor seja multiplicado por 1024, 1048576 ou 1073741824 na entrada."
 
 #. type: Plain text
 #: en/git-config.txt:181
@@ -17459,31 +16067,19 @@ msgstr "'bool-or-int': canoniza de acordo com 'bool' ou 'int', como descrito aci
 #: en/git-config.txt:185
 #, priority:100
 msgid "'path': canonicalize by adding a leading `~` to the value of `$HOME` and `~user` to the home directory for the specified user. This specifier has no effect when setting the value (but you can use `git config section.variable ~/` from the command line to let your shell do the expansion.)"
-msgstr ""
-"'path': canonize ao adicionar um sinal `~` no começo para o valor `$HOME` e "
-"`~user` no diretório home do usuário especificado. Este especificador não "
-"tem efeito durante a definição do valor (porém você pode utilizar o comando `"
-"git config section.variable ~ /` na linha de comando para permitir que o seu "
-"shell faça a expansão.)"
+msgstr "'path': canonize ao adicionar um sinal `~` no começo para o valor `$HOME` e `~user` no diretório home do usuário especificado. Este especificador não tem efeito durante a definição do valor (porém você pode utilizar o comando `git config section.variable ~ /` na linha de comando para permitir que o seu shell faça a expansão.)"
 
 #. type: Plain text
 #: en/git-config.txt:187
 #, priority:100
 msgid "'expiry-date': canonicalize by converting from a fixed or relative date-string to a timestamp. This specifier has no effect when setting the value."
-msgstr ""
-"'data validade': canoniza convertendo a partir de uma cadeia com data fixa "
-"ou relativa a um registro de data e hora. Este especificador não tem efeito "
-"quando for definir o valor."
+msgstr "'data validade': canoniza convertendo a partir de uma cadeia com data fixa ou relativa a um registro de data e hora. Este especificador não tem efeito quando for definir o valor."
 
 #. type: Plain text
 #: en/git-config.txt:191
 #, priority:100
 msgid "'color': When getting a value, canonicalize by converting to an ANSI color escape sequence. When setting a value, a sanity-check is performed to ensure that the given value is canonicalize-able as an ANSI color, but it is written as-is."
-msgstr ""
-"'color': Quando obtiver um valor, canonize através da conversão para uma "
-"sequência no padrão ANSI de cor. Ao definir um valor, uma verificação é "
-"realizada para garantir que o valor informado seja canonizável como uma cor "
-"ANSI, porém será escrito como estiver."
+msgstr "'color': Quando obtiver um valor, canonize através da conversão para uma sequência no padrão ANSI de cor. Ao definir um valor, uma verificação é realizada para garantir que o valor informado seja canonizável como uma cor ANSI, porém será escrito como estiver."
 
 #. type: Labeled list
 #: en/git-config.txt:193
@@ -17519,9 +16115,7 @@ msgstr "--expiry-date"
 #: en/git-config.txt:200
 #, priority:100
 msgid "Historical options for selecting a type specifier. Prefer instead `--type` (see above)."
-msgstr ""
-"Opções históricas para selecionar um especificador de tipo. Em vez disso, "
-"prefira opção `--type` (veja acima)."
+msgstr "Opções históricas para selecionar um especificador de tipo. Em vez disso, prefira opção `--type` (veja acima)."
 
 #. type: Labeled list
 #: en/git-config.txt:201
@@ -17533,30 +16127,19 @@ msgstr "--no-type"
 #: en/git-config.txt:205
 #, priority:100
 msgid "Un-sets the previously set type specifier (if one was previously set). This option requests that 'git config' not canonicalize the retrieved variable.  `--no-type` has no effect without `--type=<type>` or `--<type>`."
-msgstr ""
-"Indetermine o tipo do especificador definido anteriormente (caso tenha sido "
-"definido anteriormente). Esta opção solicita que o comando 'git config' não "
-"canonize a variável recuperada.  A opção `--no-type` não tem qualquer efeito "
-"sem a opção `--type=<tipo>` ou `--<tipo>`."
+msgstr "Indetermine o tipo do especificador definido anteriormente (caso tenha sido definido anteriormente). Esta opção solicita que o comando 'git config' não canonize a variável recuperada.  A opção `--no-type` não tem qualquer efeito sem a opção `--type=<tipo>` ou `--<tipo>`."
 
 #. type: Plain text
 #: en/git-config.txt:214
 #, priority:100
 msgid "For all options that output values and/or keys, always end values with the null character (instead of a newline). Use newline instead as a delimiter between key and value. This allows for secure parsing of the output without getting confused e.g. by values that contain line breaks."
-msgstr ""
-"Para todas as opções que gerem valores e/ou chaves, sempre finalize os "
-"valores com o caractere nulo (em vez de uma nova linha). Utilize a nova "
-"linha como um delimitador entre chave e valor. Isso permite uma análise "
-"segura do que for gerado sem se confundir, como por exemplo, através de "
-"valores que tenham quebras de linha."
+msgstr "Para todas as opções que gerem valores e/ou chaves, sempre finalize os valores com o caractere nulo (em vez de uma nova linha). Utilize a nova linha como um delimitador entre chave e valor. Isso permite uma análise segura do que for gerado sem se confundir, como por exemplo, através de valores que tenham quebras de linha."
 
 #. type: Plain text
 #: en/git-config.txt:218
 #, priority:100
 msgid "Output only the names of config variables for `--list` or `--get-regexp`."
-msgstr ""
-"Gere apenas os nomes das variáveis de configuração para `--list` ou `--get-"
-"regexp`."
+msgstr "Gere apenas os nomes das variáveis de configuração para `--list` ou `--get-regexp`."
 
 #. type: Labeled list
 #: en/git-config.txt:219
@@ -17568,11 +16151,7 @@ msgstr "--show-origin"
 #: en/git-config.txt:224
 #, priority:100
 msgid "Augment the output of all queried config options with the origin type (file, standard input, blob, command line) and the actual origin (config file path, ref, or blob id if applicable)."
-msgstr ""
-"Aumente a geração de todas as opções de configuração consultadas com o tipo "
-"da origem (arquivo, entrada padrão, blob, linha de comando) e a origem real ("
-"o caminho do arquivo de configuração, da \"ref\" ou a ID da bolha, caso seja "
-"aplicável)."
+msgstr "Aumente a geração de todas as opções de configuração consultadas com o tipo da origem (arquivo, entrada padrão, blob, linha de comando) e a origem real (o caminho do arquivo de configuração, da \"ref\" ou a ID da bolha, caso seja aplicável)."
 
 #. type: Labeled list
 #: en/git-config.txt:225
@@ -17584,10 +16163,7 @@ msgstr "--show-scope"
 #: en/git-config.txt:229
 #, priority:100
 msgid "Similar to `--show-origin` in that it augments the output of all queried config options with the scope of that value (local, global, system, command)."
-msgstr ""
-"Semelhante a opção `--show-origin`, na medida em que aumenta a saída de "
-"todas as opções de configuração consultadas com o escopo deste valor (`local`"
-", `global`, `system`, `command`)."
+msgstr "Semelhante a opção `--show-origin`, na medida em que aumenta a saída de todas as opções de configuração consultadas com o escopo deste valor (`local`, `global`, `system`, `command`)."
 
 #. type: Labeled list
 #: en/git-config.txt:230
@@ -17599,14 +16175,7 @@ msgstr "--get-colorbool nome [stdout-is-tty]"
 #: en/git-config.txt:240
 #, priority:100
 msgid "Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or \"false\", and is taken into account when configuration says \"auto\".  If `stdout-is-tty` is missing, then checks the standard output of the command itself, and exits with status 0 if color is to be used, or exits with status 1 otherwise.  When the color setting for `name` is undefined, the command uses `color.ui` as fallback."
-msgstr ""
-"Encontre a configuração das cores para `nome` (por exemplo, `color.diff`) e "
-"gere 'true' ou 'false'.  O `stdout-is-tty` deve ser 'true' ou 'false' e é "
-"levado em consideração quando a configuração diz \"auto\".  Caso `stdout-is-"
-"tty` esteja ausente, verifique a saída padrão do próprio comando e encerre "
-"com a condição '0' caso a cor deva ser utilizada, ou caso contrário, encerre "
-"com a condição '1'.  Quando a configuração das cores para `nome` for "
-"indefinida, o comando retroage e em vez disso usa `color.ui`."
+msgstr "Encontre a configuração das cores para `nome` (por exemplo, `color.diff`) e gere 'true' ou 'false'.  O `stdout-is-tty` deve ser 'true' ou 'false' e é levado em consideração quando a configuração diz \"auto\".  Caso `stdout-is-tty` esteja ausente, verifique a saída padrão do próprio comando e encerre com a condição '0' caso a cor deva ser utilizada, ou caso contrário, encerre com a condição '1'.  Quando a configuração das cores para `nome` for indefinida, o comando retroage e em vez disso usa `color.ui`."
 
 #. type: Labeled list
 #: en/git-config.txt:241
@@ -17618,10 +16187,7 @@ msgstr "--get-color nome [default]"
 #: en/git-config.txt:247
 #, priority:100
 msgid "Find the color configured for `name` (e.g. `color.diff.new`) and output it as the ANSI color escape sequence to the standard output.  The optional `default` parameter is used instead, if there is no color configured for `name`."
-msgstr ""
-"Localize a cor configurada para `nome` (`color.diff.new` por exemplo) e gere "
-"a sequência no padrão ANSI de cor.  Em vez disso o parâmetro opcional "
-"`default` é utilizado, caso não haja uma cor configurada para `nome`."
+msgstr "Localize a cor configurada para `nome` (`color.diff.new` por exemplo) e gere a sequência no padrão ANSI de cor.  Em vez disso o parâmetro opcional `default` é utilizado, caso não haja uma cor configurada para `nome`."
 
 #. type: Plain text
 #: en/git-config.txt:251
@@ -17633,9 +16199,7 @@ msgstr "`--type=color [--default=<default>]` é preferível em vez de `--get-col
 #: en/git-config.txt:256
 #, priority:100
 msgid "Opens an editor to modify the specified config file; either `--system`, `--global`, or repository (default)."
-msgstr ""
-"Abre um editor para alterar o arquivo de configuração informado; ou "
-"`--system`,` --global` ou repositório (predefinido)."
+msgstr "Abre um editor para alterar o arquivo de configuração informado; ou `--system`,` --global` ou repositório (predefinido)."
 
 #. type: Labeled list
 #: en/git-config.txt:257
@@ -17647,11 +16211,7 @@ msgstr "--[no-]includes"
 #: en/git-config.txt:262
 #, priority:100
 msgid "Respect `include.*` directives in config files when looking up values. Defaults to `off` when a specific file is given (e.g., using `--file`, `--global`, etc) and `on` when searching all config files."
-msgstr ""
-"Respeite as diretivas `include.*` nos arquivos de configuração ao procurar "
-"pelos valores. A predefinição retorna para `off` quando determinado arquivo "
-"seja informado (como por exemplo, usando os comandos `--file`, `--global`, "
-"etc) e ao pesquisar por todos os arquivos de configuração."
+msgstr "Respeite as diretivas `include.*` nos arquivos de configuração ao procurar pelos valores. A predefinição retorna para `off` quando determinado arquivo seja informado (como por exemplo, usando os comandos `--file`, `--global`, etc) e ao pesquisar por todos os arquivos de configuração."
 
 #. type: Labeled list
 #: en/git-config.txt:263
@@ -17663,9 +16223,7 @@ msgstr "--default <valor>"
 #: en/git-config.txt:266
 #, priority:100
 msgid "When using `--get`, and the requested variable is not found, behave as if <value> were the value assigned to the that variable."
-msgstr ""
-"Ao usar `--get` e a variável solicitada não for encontrada, comportar-se "
-"como se o <valor> fosse o valor atribuído à variável."
+msgstr "Ao usar `--get` e a variável solicitada não for encontrada, comportar-se como se o <valor> fosse o valor atribuído à variável."
 
 #. type: Plain text
 #: en/git-config.txt:272
@@ -17701,13 +16259,7 @@ msgstr "$XDG_CONFIG_HOME/git/config"
 #: en/git-config.txt:290
 #, priority:100
 msgid "Second user-specific configuration file. If $XDG_CONFIG_HOME is not set or empty, `$HOME/.config/git/config` will be used. Any single-valued variable set in this file will be overwritten by whatever is in `~/.gitconfig`.  It is a good idea not to create this file if you sometimes use older versions of Git, as support for this file was added fairly recently."
-msgstr ""
-"Segundo arquivo de configuração específico do usuário. Caso $XDG_CONFIG_HOME "
-"não esteja definido ou esteja vazio , a opção de configuração `$HOME/.config/"
-"git/config` será utilizada. Qualquer variável com valor único definido neste "
-"arquivo será substituída pelo que estiver em `~/.gitconfig`.  É uma boa "
-"ideia não criar este arquivo no caso de você às vezes usar versões mais "
-"antigas do Git, pois o suporte para este arquivo foi adicionado recentemente."
+msgstr "Segundo arquivo de configuração específico do usuário. Caso $XDG_CONFIG_HOME não esteja definido ou esteja vazio , a opção de configuração `$HOME/.config/git/config` será utilizada. Qualquer variável com valor único definido neste arquivo será substituída pelo que estiver em `~/.gitconfig`.  É uma boa ideia não criar este arquivo no caso de você às vezes usar versões mais antigas do Git, pois o suporte para este arquivo foi adicionado recentemente."
 
 #. type: Labeled list
 #: en/git-config.txt:291
@@ -17749,55 +16301,31 @@ msgstr "Isso é opcional e só é pesquisado quando o arquivo `extensions.worktr
 #: en/git-config.txt:307
 #, priority:100
 msgid "If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration file are not available they will be ignored. If the repository configuration file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued."
-msgstr ""
-"Caso nenhuma outra opção seja utilizada, todas as opções de leitura irão ler "
-"todos estes arquivos que estiverem disponíveis. Caso o arquivo global ou o "
-"arquivo de configuração global inteiro não esteja disponível, eles serão "
-"ignorados. Caso o arquivo de configuração do repositório não estiver "
-"disponível ou legível, o comando 'git config' encerrará com um código de "
-"erro diferente de zero. No entanto, em nenhum dos casos será emitida uma "
-"mensagem de erro."
+msgstr "Caso nenhuma outra opção seja utilizada, todas as opções de leitura irão ler todos estes arquivos que estiverem disponíveis. Caso o arquivo global ou o arquivo de configuração global inteiro não esteja disponível, eles serão ignorados. Caso o arquivo de configuração do repositório não estiver disponível ou legível, o comando 'git config' encerrará com um código de erro diferente de zero. No entanto, em nenhum dos casos será emitida uma mensagem de erro."
 
 #. type: Plain text
 #: en/git-config.txt:311
 #, priority:100
 msgid "The files are read in the order given above, with last value found taking precedence over values read earlier.  When multiple values are taken then all values of a key from all files will be used."
-msgstr ""
-"Os arquivos são lidos na ordem dada acima, com o último valor encontrado "
-"tendo precedência sobre os valores lidos anteriormente.  Quando vários "
-"valores são obtidos, então todos os valores de uma chave de todos os "
-"arquivos, serão usados."
+msgstr "Os arquivos são lidos na ordem dada acima, com o último valor encontrado tendo precedência sobre os valores lidos anteriormente.  Quando vários valores são obtidos, então todos os valores de uma chave de todos os arquivos, serão usados."
 
 #. type: Plain text
 #: en/git-config.txt:314
 #, priority:100
 msgid "You may override individual configuration parameters when running any git command by using the `-c` option. See linkgit:git[1] for details."
-msgstr ""
-"Você pode substituir os parâmetros da configuração dos parâmetros "
-"individuais ao executar qualquer comando git utilizando a opção `-c`. Para "
-"mais detalhes, consulte linkgit:git[1]."
+msgstr "Você pode substituir os parâmetros da configuração dos parâmetros individuais ao executar qualquer comando git utilizando a opção `-c`. Para mais detalhes, consulte linkgit:git[1]."
 
 #. type: Plain text
 #: en/git-config.txt:318
 #, priority:100
 msgid "All writing options will per default write to the repository specific configuration file. Note that this also affects options like `--replace-all` and `--unset`. *'git config' will only ever change one file at a time*."
-msgstr ""
-"É predefinido que todas as opções de gravação sejam gravadas no arquivo de "
-"configuração específico do repositório. Observe que isso também afeta opções "
-"como `--replace-all` e `--sunset`. *O comando 'git config' sempre irá "
-"alterar um arquivo por vez*."
+msgstr "É predefinido que todas as opções de gravação sejam gravadas no arquivo de configuração específico do repositório. Observe que isso também afeta opções como `--replace-all` e `--sunset`. *O comando 'git config' sempre irá alterar um arquivo por vez*."
 
 #. type: Plain text
 #: en/git-config.txt:324
 #, priority:100
 msgid "You can override these rules either by command-line options or by environment variables. The `--global`, `--system` and `--worktree` options will limit the file used to the global, system-wide or per-worktree file respectively.  The `GIT_CONFIG` environment variable has a similar effect, but you can specify any filename you want."
-msgstr ""
-"Estas regras podem ser substituídas através da linha de comando ou através "
-"das variáveis de ambiente. As opções `--global`, `--system` e `--worktree` "
-"limitarão o arquivo utilizado ao arquivo global, em todo o sistema ou por "
-"árvore de trabalho, respectivamente.  A variável de ambiente `GIT_CONFIG` "
-"environment variable has a similar effecttem um efeito similar, porém é "
-"possível definir um nome do arquivo caso queira."
+msgstr "Estas regras podem ser substituídas através da linha de comando ou através das variáveis de ambiente. As opções `--global`, `--system` e `--worktree` limitarão o arquivo utilizado ao arquivo global, em todo o sistema ou por árvore de trabalho, respectivamente.  A variável de ambiente `GIT_CONFIG` environment variable has a similar effecttem um efeito similar, porém é possível definir um nome do arquivo caso queira."
 
 #. 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
@@ -17815,10 +16343,7 @@ msgstr "GIT_CONFIG"
 #: en/git-config.txt:333
 #, priority:100
 msgid "Take the configuration from the given file instead of .git/config.  Using the \"--global\" option forces this to ~/.gitconfig. Using the \"--system\" option forces this to $(prefix)/etc/gitconfig."
-msgstr ""
-"Pegue a configuração do arquivo informado em vez de .git/config. Usar a "
-"opção \"--global\" força isso para ~/.gitconfig. Usar a opção \"--system\" "
-"força isso para $(prefixo)/etc/gitconfig."
+msgstr "Pegue a configuração do arquivo informado em vez de .git/config. Usar a opção \"--global\" força isso para ~/.gitconfig. Usar a opção \"--system\" força isso para $(prefixo)/etc/gitconfig."
 
 #. type: Labeled list
 #: en/git-config.txt:334
@@ -17830,10 +16355,7 @@ msgstr "GIT_CONFIG_NOSYSTEM"
 #: en/git-config.txt:337
 #, priority:100
 msgid "Whether to skip reading settings from the system-wide $(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
-msgstr ""
-"Independente se você vai ignorar as configurações de leitura do arquivo "
-"`$(prefix)/etc/gitconfig` do sistema. Para mais detalhes, consulte "
-"linkgit:git[1]."
+msgstr "Independente se você vai ignorar as configurações de leitura do arquivo `$(prefix)/etc/gitconfig` do sistema. Para mais detalhes, consulte linkgit:git[1]."
 
 #. type: Plain text
 #: en/git-config.txt:346
@@ -17963,10 +16485,7 @@ msgstr "% git config --unset diff.renames\n"
 #: en/git-config.txt:401
 #, priority:100
 msgid "If you want to delete an entry for a multivar (like core.gitproxy above), you have to provide a regex matching the value of exactly one line."
-msgstr ""
-"Caso queira excluir uma entrada para um \"multivar\" (como `core.gitproxy` "
-"acima), é necessário fornecer um `regex` que coincida com o valor exato de "
-"uma linha."
+msgstr "Caso queira excluir uma entrada para um \"multivar\" (como `core.gitproxy` acima), é necessário fornecer um `regex` que coincida com o valor exato de uma linha."
 
 #. type: Plain text
 #: en/git-config.txt:403
@@ -18111,7 +16630,7 @@ msgstr ""
 "http.sslverify false\n"
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr "BUGS"
@@ -18160,9 +16679,7 @@ msgstr "git-count-objects(1)"
 #: en/git-count-objects.txt:7
 #, priority:100
 msgid "git-count-objects - Count unpacked number of objects and their disk consumption"
-msgstr ""
-"git-count-objects - Conta a quantidade dos objetos não empacotados e o seu "
-"consumo no disco"
+msgstr "git-count-objects - Conta a quantidade dos objetos não empacotados e o seu consumo no disco"
 
 #. type: Plain text
 #: en/git-count-objects.txt:12
@@ -18336,14 +16853,7 @@ msgstr "--socket <caminho>"
 #: en/git-credential-cache.txt:43
 #, priority:100
 msgid "Use `<path>` to contact a running cache daemon (or start a new cache daemon if one is not started).  Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless `~/.git-credential-cache/` exists in which case `~/.git-credential-cache/socket` is used instead.  If your home directory is on a network-mounted filesystem, you may need to change this to a local filesystem. You must specify an absolute path."
-msgstr ""
-"Utilize o `<caminho>` para entrar em contato com um daemon de cache em "
-"execução (ou inicie um novo, cache daemon caso nenhum tenha sido iniciado).  "
-"A predefinição retorna para `$XDG_CACHE_HOME/git/credential/socket` a menos "
-"que `~/.git-credential-cache/` exista, neste caso `~/.git-credential-cache/"
-"socket` é utilizado.  Se o diretório inicial estiver em um sistema de "
-"arquivos montado via rede, pode ser necessário alterá-lo para um sistema de "
-"arquivos local. Você deve usar um caminho absoluto."
+msgstr "Utilize o `<caminho>` para entrar em contato com um daemon de cache em execução (ou inicie um novo, cache daemon caso nenhum tenha sido iniciado).  A predefinição retorna para `$XDG_CACHE_HOME/git/credential/socket` a menos que `~/.git-credential-cache/` exista, neste caso `~/.git-credential-cache/socket` é utilizado.  Se o diretório inicial estiver em um sistema de arquivos montado via rede, pode ser necessário alterá-lo para um sistema de arquivos local. Você deve usar um caminho absoluto."
 
 #. type: Title -
 #: en/git-credential-cache.txt:45
@@ -18429,12 +16939,7 @@ msgstr "git config credential.helper 'store [<opções>]'\n"
 #: en/git-credential-store.txt:21
 #, priority:100
 msgid "Using this helper will store your passwords unencrypted on disk, protected only by filesystem permissions. If this is not an acceptable security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system."
-msgstr ""
-"Ao usar este auxiliar as suas senhas são armazenadas de forma criptografada "
-"no disco, protegida apenas pelas permissões do sistema de arquivos. Caso "
-"essa não seja uma troca aceitável de segurança, tente o linkgit:git-"
-"credential-cache[1] ou encontre um auxiliar que se integre ao armazenamento "
-"seguro informado pelo seu sistema operacional."
+msgstr "Ao usar este auxiliar as suas senhas são armazenadas de forma criptografada no disco, protegida apenas pelas permissões do sistema de arquivos. Caso essa não seja uma troca aceitável de segurança, tente o linkgit:git-credential-cache[1] ou encontre um auxiliar que se integre ao armazenamento seguro informado pelo seu sistema operacional."
 
 #. type: Plain text
 #: en/git-credential-store.txt:24
@@ -18458,14 +16963,7 @@ msgstr "--file=<caminho>"
 #: en/git-credential-store.txt:42
 #, priority:100
 msgid "Use `<path>` to lookup and store credentials. The file will have its filesystem permissions set to prevent other users on the system from reading it, but will not be encrypted or otherwise protected. If not specified, credentials will be searched for from `~/.git-credentials` and `$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it exists and the former does not. See also <<FILES>>."
-msgstr ""
-"Utilize `<caminho>` para localizar e armazenar as credenciais. O arquivo "
-"terá suas as permissões do sistema de arquivos definidos para impedir que os "
-"outros usuários no sistema o leiam, mas não serão criptografados ou "
-"protegidos. Caso não seja utilizado, as credenciais serão pesquisadas em "
-"`~/.git-credentials` e `$XDG_CONFIG_HOME/git/credentials`, as credenciais "
-"serão salvas em `~/.git-credentials` caso exista, ou `$XDG_CONFIG_HOME/git/"
-"credentials` caso exista e o primeiro não. Consulte também <<ARQUIVOS>>."
+msgstr "Utilize `<caminho>` para localizar e armazenar as credenciais. O arquivo terá suas as permissões do sistema de arquivos definidos para impedir que os outros usuários no sistema o leiam, mas não serão criptografados ou protegidos. Caso não seja utilizado, as credenciais serão pesquisadas em `~/.git-credentials` e `$XDG_CONFIG_HOME/git/credentials`, as credenciais serão salvas em `~/.git-credentials` caso exista, ou `$XDG_CONFIG_HOME/git/credentials` caso exista e o primeiro não. Consulte também <<ARQUIVOS>>."
 
 #. type: Plain text
 #: en/git-credential-store.txt:49
@@ -18501,10 +16999,7 @@ msgstr "Arquivo de credenciais secundário específicas do usuário. Caso '$XDG_
 #: en/git-credential-store.txt:63
 #, priority:100
 msgid "For credential lookups, the files are read in the order given above, with the first matching credential found taking precedence over credentials found in files further down the list."
-msgstr ""
-"Para pesquisas das credenciais, os arquivos são lidos na ordem acima, com a "
-"primeira credencial coincidente que for encontrada tendo precedência sobre "
-"as credenciais encontradas nos arquivos mais abaixo na lista."
+msgstr "Para pesquisas das credenciais, os arquivos são lidos na ordem acima, com a primeira credencial coincidente que for encontrada tendo precedência sobre as credenciais encontradas nos arquivos mais abaixo na lista."
 
 #. type: Plain text
 #: en/git-credential-store.txt:67
@@ -18566,10 +17061,7 @@ msgstr "https://usuário:senha@example.com\n"
 #: en/git-credential-store.txt:100
 #, priority:100
 msgid "No other kinds of lines (e.g. empty lines or comment lines) are allowed in the file, even though some may be silently ignored. Do not view or edit the file with editors."
-msgstr ""
-"Nenhum outro tipo de linha (como por exemplo, as linhas vazias ou as linhas "
-"dos comentários) é permitido no arquivo, mesmo que algumas possam ser "
-"ignoradas silenciosamente. Não exiba ou edite o arquivo com editores."
+msgstr "Nenhum outro tipo de linha (como por exemplo, as linhas vazias ou as linhas dos comentários) é permitido no arquivo, mesmo que algumas possam ser ignoradas silenciosamente. Não exiba ou edite o arquivo com editores."
 
 #. type: Plain text
 #: en/git-credential-store.txt:107
@@ -18611,12 +17103,7 @@ msgstr "O `git-credential` usa uma \"ação\" como opção na linha de comando (
 #: en/git-credential.txt:35
 #, priority:100
 msgid "If the action is `fill`, git-credential will attempt to add \"username\" and \"password\" attributes to the description by reading config files, by contacting any configured credential helpers, or by prompting the user. The username and password attributes of the credential description are then printed to stdout together with the attributes already provided."
-msgstr ""
-"Caso a ação seja `fill`, o comando tentará adicionar os atributos \"username"
-"\" e \"password\" à descrição lendo os arquivos de configuração ao contactar "
-"qualquer auxiliar de credencial configurado ou solicitando ao usuário. Os "
-"atributos de nome de usuário e senha da descrição da credencial são "
-"impressos para \"stdout\" junto com os atributos já informados."
+msgstr "Caso a ação seja `fill`, o comando tentará adicionar os atributos \"username\" e \"password\" à descrição lendo os arquivos de configuração ao contactar qualquer auxiliar de credencial configurado ou solicitando ao usuário. Os atributos de nome de usuário e senha da descrição da credencial são impressos para \"stdout\" junto com os atributos já informados."
 
 #. type: Plain text
 #: en/git-credential.txt:39
@@ -18696,11 +17183,7 @@ msgstr ""
 #: en/git-credential.txt:79
 #, priority:100
 msgid "In most cases, this means the attributes given in the input will be repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false."
-msgstr ""
-"Na maioria dos casos, isso significa que os atributos informados na entrada "
-"serão repetidos na saída, mas o Git também poderá modificar a descrição da "
-"credencial, por exemplo, removendo o atributo `path` quando o protocolo for "
-"HTTP(s) e a variável `credential.useHttpPath` seja falsa."
+msgstr "Na maioria dos casos, isso significa que os atributos informados na entrada serão repetidos na saída, mas o Git também poderá modificar a descrição da credencial, por exemplo, removendo o atributo `path` quando o protocolo for HTTP(s) e a variável `credential.useHttpPath` seja falsa."
 
 #. type: Plain text
 #: en/git-credential.txt:85
@@ -18730,21 +17213,13 @@ msgstr "FORMATO DE ENTRADA/SAÍDA"
 #: en/git-credential.txt:108
 #, priority:100
 msgid "`git credential` reads and/or writes (depending on the action used)  credential information in its standard input/output. This information can correspond either to keys for which `git credential` will obtain the login information (e.g. host, protocol, path), or to the actual credential data to be obtained (username/password)."
-msgstr ""
-"O comando `git credential` lê ou grava (dependendo da ação utilizada) as "
-"informações da credencial na sua entrada e saída padrão. Esta informação "
-"pode corresponder às chaves pelas quais o comando `git credential` obterá as "
-"informações de login e senha (por exemplo, host, protocolo, caminho) ou aos "
-"dados da credencial real a serem obtidos (login e senha)."
+msgstr "O comando `git credential` lê ou grava (dependendo da ação utilizada) as informações da credencial na sua entrada e saída padrão. Esta informação pode corresponder às chaves pelas quais o comando `git credential` obterá as informações de login e senha (por exemplo, host, protocolo, caminho) ou aos dados da credencial real a serem obtidos (login e senha)."
 
 #. type: Plain text
 #: en/git-credential.txt:112
 #, priority:100
 msgid "The credential is split into a set of named attributes, with one attribute per line. Each attribute is specified by a key-value pair, separated by an `=` (equals) sign, followed by a newline."
-msgstr ""
-"A credencial é dividida em um conjunto de atributos informados, com um "
-"atributo por linha. Cada atributo é especificado por um par de valores-"
-"chave, separado por um sinal de `=` (igual), seguido por uma nova linha."
+msgstr "A credencial é dividida em um conjunto de atributos informados, com um atributo por linha. Cada atributo é especificado por um par de valores-chave, separado por um sinal de `=` (igual), seguido por uma nova linha."
 
 #. type: Plain text
 #: en/git-credential.txt:115
@@ -18786,9 +17261,7 @@ msgstr "`host`"
 #: en/git-credential.txt:131
 #, priority:100
 msgid "The remote hostname for a network credential.  This includes the port number if one was specified (e.g., \"example.com:8088\")."
-msgstr ""
-"O nome do host remoto para uma credencial de rede.  Incluí o número da porta "
-"caso nenhuma seja informada(\"example.com:8088\" por exemplo)."
+msgstr "O nome do host remoto para uma credencial de rede.  Incluí o número da porta caso nenhuma seja informada(\"example.com:8088\" por exemplo)."
 
 #. type: Labeled list
 #: en/git-credential.txt:132
@@ -18836,29 +17309,19 @@ msgstr "`url`"
 #: en/git-credential.txt:154
 #, priority:100
 msgid "When this special attribute is read by `git credential`, the value is parsed as a URL and treated as if its constituent parts were read (e.g., `url=https://example.com` would behave as if `protocol=https` and `host=example.com` had been provided). This can help callers avoid parsing URLs themselves."
-msgstr ""
-"Quando esse atributo especial é lido através do `git credential`, o valor é "
-"analisado como uma URL e tratado como se as suas partes constituintes fossem "
-"lidas (como por exemplo, `url=https://example.com` se comportaria como se o `"
-"protocol = https` e `host=example.com` tenham sido fornecidos). Isso pode "
-"ajudar quem chama a evitar a análise das URLs eles mesmos."
+msgstr "Quando esse atributo especial é lido através do `git credential`, o valor é analisado como uma URL e tratado como se as suas partes constituintes fossem lidas (como por exemplo, `url=https://example.com` se comportaria como se o `protocol = https` e `host=example.com` tenham sido fornecidos). Isso pode ajudar quem chama a evitar a análise das URLs eles mesmos."
 
 #. type: Plain text
 #: en/git-credential.txt:159
 #, priority:100
 msgid "Note that specifying a protocol is mandatory and if the URL doesn't specify a hostname (e.g., \"cert:///path/to/file\") the credential will contain a hostname attribute whose value is an empty string."
-msgstr ""
-"Observe que a definição de um protocolo é obrigatório e caso a URL não "
-"informe o nome do host (\"cert:///caminho/para/o/arquivo\") o conteúdo da "
-"credencial terá o atributo do nome do host cujo valor seja vazio."
+msgstr "Observe que a definição de um protocolo é obrigatório e caso a URL não informe o nome do host (\"cert:///caminho/para/o/arquivo\") o conteúdo da credencial terá o atributo do nome do host cujo valor seja vazio."
 
 #. type: Plain text
 #: en/git-credential.txt:161
 #, priority:100
 msgid "Components which are missing from the URL (e.g., there is no username in the example above) will be left unset."
-msgstr ""
-"Os componentes ausentes na URL (não há um nome de usuário no exemplo acima "
-"por exemplo) serão deixados por sem uma definição."
+msgstr "Os componentes ausentes na URL (não há um nome de usuário no exemplo acima por exemplo) serão deixados por sem uma definição."
 
 #. type: Title =
 #: en/git-cvsexportcommit.txt:2
@@ -18870,8 +17333,7 @@ msgstr "git-cvsexportcommit(1)"
 #: en/git-cvsexportcommit.txt:7
 #, priority:100
 msgid "git-cvsexportcommit - Export a single commit to a CVS checkout"
-msgstr ""
-"git-cvsexportcommit - Exportar um único commit para uma averiguação do CVS"
+msgstr "git-cvsexportcommit - Exportar um único commit para uma averiguação do CVS"
 
 #. type: Plain text
 #: en/git-cvsexportcommit.txt:14
@@ -18953,9 +17415,7 @@ msgstr "Imponha o commit da origem, ainda que não seja direto dela."
 #: en/git-cvsexportcommit.txt:63
 #, priority:100
 msgid "Prepend the commit message with the provided prefix.  Useful for patch series and the like."
-msgstr ""
-"Anexe a mensagem do commit com o prefixo informado.  Útil para patches em "
-"série e similares."
+msgstr "Anexe a mensagem do commit com o prefixo informado.  Útil para patches em série e similares."
 
 #. type: Plain text
 #: en/git-cvsexportcommit.txt:66
@@ -19072,11 +17532,9 @@ msgid ""
 "\t      [-r <remote>] [-R] [<CVS_module>]\n"
 msgstr ""
 "'git cvsimport' [-o <ramo-para-o-HEAD>] [-h] [-v] [-d <CVSROOT>]\n"
-"\t      [-A <arquivos-conv-do-autor>] [-p <opções-para-o-cvsps>] [-P "
-"<arquivo>]\n"
+"\t      [-A <arquivos-conv-do-autor>] [-p <opções-para-o-cvsps>] [-P <arquivo>]\n"
 "\t      [-C <repositório-git>] [-z <fuzz>] [-i] [-k] [-u] [-s <subst>]\n"
-"\t      [-a] [-m] [-M <expressão-regular>] [-S <expressão-regular>] [-L "
-"<commitlimit>]\n"
+"\t      [-a] [-m] [-M <expressão-regular>] [-S <expressão-regular>] [-L <commitlimit>]\n"
 "\t      [-r <remoto>] [-R] [<módulo-CVS>]\n"
 
 #. type: Plain text
@@ -19187,10 +17645,7 @@ msgstr "-r <remoto>"
 #: en/git-cvsimport.txt:75
 #, priority:100
 msgid "The Git remote to import this CVS repository into.  Moves all CVS branches into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by default."
-msgstr ""
-"O Git remoto para importar este repositório CVS.  Move todas as ramificações "
-"do CVS nos ramos remotos/<remoto>/<ramo>, semelhante a maneira predefinida "
-"como o comando 'git clone' usa 'origin'."
+msgstr "O Git remoto para importar este repositório CVS.  Move todas as ramificações do CVS nos ramos remotos/<remoto>/<ramo>, semelhante a maneira predefinida como o comando 'git clone' usa 'origin'."
 
 #. type: Labeled list
 #: en/git-cvsimport.txt:76
@@ -19202,13 +17657,7 @@ msgstr "-o <ramo-para-o-HEAD>"
 #: en/git-cvsimport.txt:84
 #, priority:100
 msgid "When no remote is specified (via -r) the `HEAD` branch from CVS is imported to the 'origin' branch within the Git repository, as `HEAD` already has a special meaning for Git.  When a remote is specified the `HEAD` branch is named remotes/<remote>/master mirroring 'git clone' behaviour.  Use this option if you want to import into a different branch."
-msgstr ""
-"Quando nenhum ponto remoto definido (via `-r`), o ramo `HEAD` do CVS é "
-"importado para o ramo 'origin' dentro do repositório Git, pois o` HEAD` já "
-"possui um significado especial para o Git.  Quando um ponto remoto é "
-"especificado, o ramo `HEAD` é chamado de remotes/<remoto>/master espelhando-"
-"se no comportamento do comando `git clone`.  Utilize esta opção caso queira "
-"importar para uma ramificação diferente."
+msgstr "Quando nenhum ponto remoto definido (via `-r`), o ramo `HEAD` do CVS é importado para o ramo 'origin' dentro do repositório Git, pois o` HEAD` já possui um significado especial para o Git.  Quando um ponto remoto é especificado, o ramo `HEAD` é chamado de remotes/<remoto>/master espelhando-se no comportamento do comando `git clone`.  Utilize esta opção caso queira importar para uma ramificação diferente."
 
 #. type: Plain text
 #: en/git-cvsimport.txt:87
@@ -19226,11 +17675,7 @@ msgstr "Import-only: não realize o \"checkout\" após a importação.  Esta op
 #: en/git-cvsimport.txt:97
 #, priority:100
 msgid "Kill keywords: will extract files with '-kk' from the CVS archive to avoid noisy changesets. Highly recommended, but off by default to preserve compatibility with early imported trees."
-msgstr ""
-"Kill keywords: extrairá arquivos com `-kk` do arquivo CVS para evitar "
-"atritos com o `changesets`. Altamente recomendado, a sua predefinição "
-"retorna para desativado visando preservar a compatibilidade com as árvores "
-"importadas anteriormente."
+msgstr "Kill keywords: extrairá arquivos com `-kk` do arquivo CVS para evitar atritos com o `changesets`. Altamente recomendado, a sua predefinição retorna para desativado visando preservar a compatibilidade com as árvores importadas anteriormente."
 
 #. type: Plain text
 #: en/git-cvsimport.txt:100
@@ -19278,9 +17723,7 @@ msgstr "-z <fuzz>"
 #: en/git-cvsimport.txt:113
 #, priority:100
 msgid "Pass the timestamp fuzz factor to cvsps, in seconds. If unset, cvsps defaults to 300s."
-msgstr ""
-"Encaminhe o registro de data e hora do fato \"fuzz\" ao cvsps em segundos. "
-"Caso não esteja definido, o cvsps retorna para a predefinição 300s."
+msgstr "Encaminhe o registro de data e hora do fato \"fuzz\" ao cvsps em segundos. Caso não esteja definido, o cvsps retorna para a predefinição 300s."
 
 #. type: Labeled list
 #: en/git-cvsimport.txt:114
@@ -19292,9 +17735,7 @@ msgstr "-P <arquivo-cvsps-gerado>"
 #: en/git-cvsimport.txt:117
 #, priority:100
 msgid "Instead of calling cvsps, read the provided cvsps output file. Useful for debugging or when cvsps is being handled outside cvsimport."
-msgstr ""
-"Em vez de chamar o cvsps, leia o arquivo cvsps fornecido. Útil para a "
-"depuração ou quando o cvsps está sendo manuseado fora do `cvsimport`."
+msgstr "Em vez de chamar o cvsps, leia o arquivo cvsps fornecido. Útil para a depuração ou quando o cvsps está sendo manuseado fora do `cvsimport`."
 
 #. type: Plain text
 #: en/git-cvsimport.txt:122
@@ -19644,12 +18085,7 @@ msgstr "Imprima a informação de uso e encerre"
 #: en/git-cvsserver.txt:58
 #, priority:100
 msgid "You can specify a list of allowed directories. If no directories are given, all are allowed. This is an additional restriction, gitcvs access still needs to be enabled by the `gitcvs.enabled` config option unless `--export-all` was given, too."
-msgstr ""
-"Você pode especificar uma lista de diretórios permitidos. Caso nenhum "
-"diretório seja informado, todos serão permitidos. Esta é uma restrição "
-"adicional, o acesso ao `gitcvs` ainda precisa ser ativado pela opção da "
-"configuração do `gitcvs.enabled`, a menos que o `--export=all` também tenha "
-"sido utilizado."
+msgstr "Você pode especificar uma lista de diretórios permitidos. Caso nenhum diretório seja informado, todos serão permitidos. Esta é uma restrição adicional, o acesso ao `gitcvs` ainda precisa ser ativado pela opção da configuração do `gitcvs.enabled`, a menos que o `--export=all` também tenha sido utilizado."
 
 #. type: Plain text
 #: en/git-cvsserver.txt:64
@@ -19670,7 +18106,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr "O teste foi realizado utilizando o cliente CLI CVS e o plug-in Eclipse CVS. A maioria das funcionalidades funciona bem com esses dois clientes."
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr "LIMITAÇÕES"
@@ -19789,9 +18225,7 @@ msgstr "Nenhuma configuração especial é necessária para o acesso SSH, além
 #: en/git-cvsserver.txt:139
 #, priority:100
 msgid "Note: Newer CVS versions (>= 1.12.11) also support specifying CVS_SERVER directly in CVSROOT like"
-msgstr ""
-"Observação: As versões mais recentes do CVS (>= 1.12.11) também é compatível "
-"a especificação do `CVS_SERVER` diretamente no `CVSROOT`, como"
+msgstr "Observação: As versões mais recentes do CVS (>= 1.12.11) também é compatível a especificação do `CVS_SERVER` diretamente no `CVSROOT`, como"
 
 #. type: delimited block -
 #: en/git-cvsserver.txt:142
@@ -19829,21 +18263,13 @@ msgstr ""
 #: en/git-cvsserver.txt:164
 #, priority:100
 msgid "Note: you need to ensure each user that is going to invoke 'git-cvsserver' has write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over SSH, the users of course also need write access to the Git repository itself."
-msgstr ""
-"Observação: você precisa garantir que cada usuário que invoque o comando "
-"`git-cvsserver` tenha acesso de gravação ao arquivo de registro log e ao "
-"banco de dados (consulte <<dbbackend,Database Backend>>. Caso queira "
-"oferecer acesso de gravação via SSH, é óbvio que os usuários também precisam "
-"ter acesso de gravação ao próprio repositório Git."
+msgstr "Observação: você precisa garantir que cada usuário que invoque o comando `git-cvsserver` tenha acesso de gravação ao arquivo de registro log e ao banco de dados (consulte <<dbbackend,Database Backend>>. Caso queira oferecer acesso de gravação via SSH, é óbvio que os usuários também precisam ter acesso de gravação ao próprio repositório Git."
 
 #. type: Plain text
 #: en/git-cvsserver.txt:167
 #, priority:100
 msgid "You also need to ensure that each repository is \"bare\" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]."
-msgstr ""
-"Você também precisa garantir que cada repositório seja \"simples\" (sem um "
-"arquivo do índice do Git) para que o comando `cvs commit` funcione. Consulte "
-"linkgit:gitcvs-migration[7]."
+msgstr "Você também precisa garantir que cada repositório seja \"simples\" (sem um arquivo do índice do Git) para que o comando `cvs commit` funcione. Consulte linkgit:gitcvs-migration[7]."
 
 #. type: Plain text
 #: en/git-cvsserver.txt:173
@@ -19897,14 +18323,7 @@ msgstr "Para clientes SSH que efetuam commits, verifique se os arquivos `.ssh/en
 #: en/git-cvsserver.txt:204
 #, priority:100
 msgid "Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out.  This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`.  For example, this checks out 'master' branch to the `project-master` directory:"
-msgstr ""
-"Os clientes agora devem conseguir fazer a averiguação no projeto. Utilize o "
-"nome do 'module' do CVS para indicar qual 'head' do Git você deseja fazer a "
-"averiguação.  Isso também define o nome do diretório que foi feito a "
-"averiguação recentemente, a menos que você diga o contrário com a opção `-d`"
-". Por exemplo, isso faz check-out do ramo 'master' no diretório `master do "
-"projeto`:  Por exemplo, é verificado o ramo 'master' no diretório `project-"
-"master`:"
+msgstr "Os clientes agora devem conseguir fazer a averiguação no projeto. Utilize o nome do 'module' do CVS para indicar qual 'head' do Git você deseja fazer a averiguação.  Isso também define o nome do diretório que foi feito a averiguação recentemente, a menos que você diga o contrário com a opção `-d`. Por exemplo, isso faz check-out do ramo 'master' no diretório `master do projeto`:  Por exemplo, é verificado o ramo 'master' no diretório `project-master`:"
 
 #. type: delimited block -
 #: en/git-cvsserver.txt:207
@@ -19946,17 +18365,7 @@ msgstr "Por predefinição no diretório Git é utilizado o banco de dados SQLit
 #: en/git-cvsserver.txt:246
 #, priority:100
 msgid "The database cannot be reliably regenerated in a consistent form after the branch it is tracking has changed.  Example: For merged branches, 'git-cvsserver' only tracks one branch of development, and after a 'git merge' an incrementally updated database may track a different branch than a database regenerated from scratch, causing inconsistent CVS revision numbers. `git-cvsserver` has no way of knowing which branch it would have picked if it had been run incrementally pre-merge. So if you have to fully or partially (from old backup) regenerate the database, you should be suspicious of pre-existing CVS sandboxes."
-msgstr ""
-"O banco de dados não pode ser regenerado de forma consistente após que uma "
-"alteração do ramo que está sendo monitorado foi modificado.  Exemplo: Para "
-"as ramificações mescladas, o comando 'git cvsserver' monitora apenas um ramo "
-"do desenvolvimento e após o 'git merge', um banco de dados atualizado de "
-"forma incremental pode monitorar um ramo diferente do que um banco de dados "
-"regenerado do zero, causando números inconsistentes da revisão do CVS. O "
-"comando `git-cvsserver` não tem como saber qual ramo ele escolheria caso "
-"tivesse sido executado de forma incremental antes da mesclagem. Portanto, "
-"caso precise de uma regeneração completa ou parcial (do backup antigo) do "
-"banco de dados, desconfie das caixas de proteção do CVS pré-existentes."
+msgstr "O banco de dados não pode ser regenerado de forma consistente após que uma alteração do ramo que está sendo monitorado foi modificado.  Exemplo: Para as ramificações mescladas, o comando 'git cvsserver' monitora apenas um ramo do desenvolvimento e após o 'git merge', um banco de dados atualizado de forma incremental pode monitorar um ramo diferente do que um banco de dados regenerado do zero, causando números inconsistentes da revisão do CVS. O comando `git-cvsserver` não tem como saber qual ramo ele escolheria caso tivesse sido executado de forma incremental antes da mesclagem. Portanto, caso precise de uma regeneração completa ou parcial (do backup antigo) do banco de dados, desconfie das caixas de proteção do CVS pré-existentes."
 
 #. type: Plain text
 #: en/git-cvsserver.txt:249
@@ -19986,11 +18395,7 @@ msgstr "gitcvs.dbName"
 #: en/git-cvsserver.txt:263
 #, priority:100
 msgid "Database name. The exact meaning depends on the selected database driver, for SQLite this is a filename.  Supports variable substitution (see below). May not contain semicolons (`;`).  Default: '%Ggitcvs.%m.sqlite'"
-msgstr ""
-"Nome do banco de dados. O significado exato depende do driver do banco de "
-"dados selecionado; para o SQLite, esse é um nome do arquivo.  É compatível "
-"com a reposição da variável (veja abaixo). Não pode conter ponto e vírgula "
-"(`;`).  Predefinição: '%Ggitcvs.%m.sqlite'"
+msgstr "Nome do banco de dados. O significado exato depende do driver do banco de dados selecionado; para o SQLite, esse é um nome do arquivo.  É compatível com a reposição da variável (veja abaixo). Não pode conter ponto e vírgula (`;`).  Predefinição: '%Ggitcvs.%m.sqlite'"
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:264
@@ -20002,12 +18407,7 @@ msgstr "gitcvs.dbDriver"
 #: en/git-cvsserver.txt:272
 #, priority:100
 msgid "Used DBI driver. You can specify any available driver for this here, but it might not work. cvsserver is tested with 'DBD::SQLite', reported to work with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'.  Please regard this as an experimental feature. May not contain colons (`:`).  Default: 'SQLite'"
-msgstr ""
-"Driver DBI utilizado. Você pode especificar qualquer driver disponível, mas "
-"pode não funcionar. O `cvsserver` é testado com 'DBD::SQLite', foi informado "
-"que funciona com 'DBD::Pg' mas *não* com 'DBD::mysql'.  Considere isso como "
-"um recurso experimental. Não pode conter ponto e vírgula (`;`).  "
-"Predefinição: 'SQLite'"
+msgstr "Driver DBI utilizado. Você pode especificar qualquer driver disponível, mas pode não funcionar. O `cvsserver` é testado com 'DBD::SQLite', foi informado que funciona com 'DBD::Pg' mas *não* com 'DBD::mysql'.  Considere isso como um recurso experimental. Não pode conter ponto e vírgula (`;`).  Predefinição: 'SQLite'"
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:273
@@ -20019,10 +18419,7 @@ msgstr "gitcvs.dbuser"
 #: en/git-cvsserver.txt:277
 #, priority:100
 msgid "Database user. Only useful if setting `dbDriver`, since SQLite has no concept of database users. Supports variable substitution (see below)."
-msgstr ""
-"O banco de dados do usuário. Útil apenas caso o `dbDriver` esteja "
-"configurando, pois o banco de dados SQLite não trabalha com usuários. É "
-"compatível com a reposição da variável (veja abaixo)."
+msgstr "O banco de dados do usuário. Útil apenas caso o `dbDriver` esteja configurando, pois o banco de dados SQLite não trabalha com usuários. É compatível com a reposição da variável (veja abaixo)."
 
 #. type: Labeled list
 #: en/git-cvsserver.txt:278
@@ -20046,10 +18443,7 @@ msgstr "gitcvs.dbTableNamePrefix"
 #: en/git-cvsserver.txt:286
 #, priority:100
 msgid "Database table name prefix.  Supports variable substitution (see below).  Any non-alphabetic characters will be replaced with underscores."
-msgstr ""
-"Prefixo do nome da tabela do banco de dados.  É compatível com a reposição "
-"da variável (veja abaixo).  Quaisquer caracteres não alfabéticos serão "
-"substituídos por sublinhados."
+msgstr "Prefixo do nome da tabela do banco de dados.  É compatível com a reposição da variável (veja abaixo).  Quaisquer caracteres não alfabéticos serão substituídos por sublinhados."
 
 #. type: Plain text
 #: en/git-cvsserver.txt:288
@@ -20295,10 +18689,7 @@ msgstr "Como alternativa, caso a configuração `gitcvs.usecrlfattr` não esteja
 #: en/git-cvsserver.txt:426
 #, priority:100
 msgid "For best consistency with 'cvs', it is probably best to override the defaults by setting `gitcvs.usecrlfattr` to true, and `gitcvs.allBinary` to \"guess\"."
-msgstr ""
-"Para uma melhor compatibilidade com o 'cvs', provavelmente é melhor "
-"substituir os valores predefinidos configurando `gitcvs.usecrlfattr` como "
-"'true' e `gitcvs.allBinary` para \"guess\"."
+msgstr "Para uma melhor compatibilidade com o 'cvs', provavelmente é melhor substituir os valores predefinidos configurando `gitcvs.usecrlfattr` como 'true' e `gitcvs.allBinary` para \"guess\"."
 
 #. type: Title -
 #: en/git-cvsserver.txt:428
@@ -20404,12 +18795,7 @@ msgstr "--base-path=<caminho>"
 #: en/git-daemon.txt:61
 #, priority:100
 msgid "Remap all the path requests as relative to the given path.  This is sort of \"Git root\" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as `/srv/git/hello.git`."
-msgstr ""
-"Faça o remapeamento de todas as solicitações de caminho em relação ao "
-"caminho informado.  Isso é meio que um \"Git root\" - caso você execute o "
-"comando 'git daemon' com '--base-path=/srv/git' em 'example.com', caso tente "
-"obter mais tarde 'git://example.com/hello.git', 'git daemon' interpretará o "
-"caminho como `/srv/git/hello.git`."
+msgstr "Faça o remapeamento de todas as solicitações de caminho em relação ao caminho informado.  Isso é meio que um \"Git root\" - caso você execute o comando 'git daemon' com '--base-path=/srv/git' em 'example.com', caso tente obter mais tarde 'git://example.com/hello.git', 'git daemon' interpretará o caminho como `/srv/git/hello.git`."
 
 #. type: Labeled list
 #: en/git-daemon.txt:62
@@ -20433,14 +18819,7 @@ msgstr "--interpolated-path=<modelo-de-caminho>"
 #: en/git-daemon.txt:77
 #, priority:100
 msgid "To support virtual hosting, an interpolated path template can be used to dynamically construct alternate paths.  The template supports %H for the target hostname as supplied by the client but converted to all lowercase, %CH for the canonical hostname, %IP for the server's IP address, %P for the port number, and %D for the absolute path of the named repository.  After interpolation, the path is validated against the directory whitelist."
-msgstr ""
-"Para dar suporte à hospedagem virtual, um modelo de caminho interpolado pode "
-"ser utilizado para construir dinamicamente os caminhos alternativos.  O "
-"modelo é compatível com `%H` para o nome de host do destino, informado pelo "
-"cliente, porém é convertido minúsculas, `%CH` para o nome do host canônico, "
-"`%IP` para o endereço IP do servidor, `%P` para o número da porta e `%D` "
-"para o caminho absoluto do nome do repositório.  Após a interpolação, o "
-"caminho é validado na lista branca de permissões do diretório."
+msgstr "Para dar suporte à hospedagem virtual, um modelo de caminho interpolado pode ser utilizado para construir dinamicamente os caminhos alternativos.  O modelo é compatível com `%H` para o nome de host do destino, informado pelo cliente, porém é convertido minúsculas, `%CH` para o nome do host canônico, `%IP` para o endereço IP do servidor, `%P` para o número da porta e `%D` para o caminho absoluto do nome do repositório.  Após a interpolação, o caminho é validado na lista branca de permissões do diretório."
 
 #. type: Plain text
 #: en/git-daemon.txt:82
@@ -20518,9 +18897,7 @@ msgstr "--max-connections=<n>"
 #: en/git-daemon.txt:113
 #, priority:100
 msgid "Maximum number of concurrent clients, defaults to 32.  Set it to zero for no limit."
-msgstr ""
-"A quantidade máxima de clientes simultâneos, a predefinição retorna para o "
-"valor 32.  Defina como zero para não ter limites."
+msgstr "A quantidade máxima de clientes simultâneos, a predefinição retorna para o valor 32.  Defina como zero para não ter limites."
 
 #. type: Labeled list
 #: en/git-daemon.txt:114
@@ -20652,11 +19029,7 @@ msgstr "--group=<grupo>"
 #: en/git-daemon.txt:170
 #, priority:100
 msgid "Change daemon's uid and gid before entering the service loop.  When only `--user` is given without `--group`, the primary group ID for the user is used.  The values of the option are given to `getpwnam(3)` and `getgrnam(3)` and numeric IDs are not supported."
-msgstr ""
-"Altere o uid e o gid do daemon antes de entrar no loop de serviço.  Quando "
-"apenas o `--user` é informado sem o `--group`, o ID do grupo primário para o "
-"usuário é utilizado.  Os valores da opção são informados para `getpwnam(3)` "
-"e `getgrnam(3)` e os IDs numéricos não são compatíveis."
+msgstr "Altere o uid e o gid do daemon antes de entrar no loop de serviço.  Quando apenas o `--user` é informado sem o `--group`, o ID do grupo primário para o usuário é utilizado.  Os valores da opção são informados para `getpwnam(3)` e `getgrnam(3)` e os IDs numéricos não são compatíveis."
 
 #. type: Plain text
 #: en/git-daemon.txt:174
@@ -20704,10 +19077,7 @@ msgstr "--forbid-override=<serviço>"
 #: en/git-daemon.txt:195
 #, priority:100
 msgid "Allow/forbid overriding the site-wide default with per repository configuration.  By default, all the services may be overridden."
-msgstr ""
-"Permitir ou proibir a reposição da predefinição em todo o site através da "
-"configuração do repositório.  É predefinido que todos os serviços possam ser "
-"substituídos."
+msgstr "Permitir ou proibir a reposição da predefinição em todo o site através da configuração do repositório.  É predefinido que todos os serviços possam ser substituídos."
 
 #. type: Labeled list
 #: en/git-daemon.txt:196
@@ -20743,10 +19113,7 @@ msgstr "O comando externo pode, opcionalmente, gravar uma única linha em sua sa
 #: en/git-daemon.txt:224
 #, priority:100
 msgid "A directory to add to the whitelist of allowed directories. Unless --strict-paths is specified this will also include subdirectories of each named directory."
-msgstr ""
-"Um diretório a ser adicionado à lista branca dos diretórios permitidos. A "
-"menos que `--strict-paths` seja especificado, isso também incluirá "
-"subdiretórios de cada diretório informado."
+msgstr "Um diretório a ser adicionado à lista branca dos diretórios permitidos. A menos que `--strict-paths` seja especificado, isso também incluirá subdiretórios de cada diretório informado."
 
 #. type: Title -
 #: en/git-daemon.txt:226 en/git-http-backend.txt:33
@@ -20962,14 +19329,7 @@ msgstr ""
 #: en/git-describe.txt:24
 #, priority:260
 msgid "The command finds the most recent tag that is reachable from a commit.  If the tag points to the commit, then only the tag is shown.  Otherwise, it suffixes the tag name with the number of additional commits on top of the tagged object and the abbreviated object name of the most recent commit. The result is a \"human-readable\" object name which can also be used to identify the commit to other git commands."
-msgstr ""
-"O comando localiza a tag mais recente que seja acessível a partir de um "
-"commit.  Caso a tag aponte para o commit, somente a tag será exibida.  Caso "
-"contrário, é adicionado um sufixo ao nome da tag com a quantidade adicionais "
-"de commits na parte superior do objeto marcado e o nome abreviado do objeto "
-"commit mais recente. O resultado é um nome do objeto que é \"legível para "
-"humanos\" que também pode ser utilizado para identificar o commit para "
-"outros comandos do git."
+msgstr "O comando localiza a tag mais recente que seja acessível a partir de um commit.  Caso a tag aponte para o commit, somente a tag será exibida.  Caso contrário, é adicionado um sufixo ao nome da tag com a quantidade adicionais de commits na parte superior do objeto marcado e o nome abreviado do objeto commit mais recente. O resultado é um nome do objeto que é \"legível para humanos\" que também pode ser utilizado para identificar o commit para outros comandos do git."
 
 #. type: Plain text
 #: en/git-describe.txt:28
@@ -20981,11 +19341,7 @@ msgstr "É predefinido que o comando `git description` exiba apenas as tags com
 #: en/git-describe.txt:34
 #, priority:260
 msgid "If the given object refers to a blob, it will be described as `<commit-ish>:<path>`, such that the blob can be found at `<path>` in the `<commit-ish>`, which itself describes the first commit in which this blob occurs in a reverse revision walk from HEAD."
-msgstr ""
-"Caso o objeto especificado se refera a uma bolha, este será descrito como "
-"`<commit-ish>:<caminho>`, de modo que a gota possa ser encontrada em "
-"`<caminho>` que em si descreve o primeiro commit no qual essa gota ocorre em "
-"uma revisão reversa do `HEAD`."
+msgstr "Caso o objeto especificado se refera a uma bolha, este será descrito como `<commit-ish>:<caminho>`, de modo que a gota possa ser encontrada em `<caminho>` que em si descreve o primeiro commit no qual essa gota ocorre em uma revisão reversa do `HEAD`."
 
 #. type: Labeled list
 #: en/git-describe.txt:37
@@ -20997,9 +19353,7 @@ msgstr "<commit-ish>..."
 #: en/git-describe.txt:39
 #, priority:260
 msgid "Commit-ish object names to describe.  Defaults to HEAD if omitted."
-msgstr ""
-"Descrevendo os nomes dos objetos commit.  Caso seja omitido, a predefinição "
-"retorna para que `HEAD` seja utilizado."
+msgstr "Descrevendo os nomes dos objetos commit.  Caso seja omitido, a predefinição retorna para que `HEAD` seja utilizado."
 
 #. type: Labeled list
 #: en/git-describe.txt:40
@@ -21023,20 +19377,13 @@ msgstr "Descreve a condição da árvore de trabalho.  Quando a árvore de traba
 #: en/git-describe.txt:54
 #, priority:260
 msgid "Instead of using only the annotated tags, use any ref found in `refs/` namespace.  This option enables matching any known branch, remote-tracking branch, or lightweight tag."
-msgstr ""
-"Em vez de usar apenas as tags anotadas, utilize qualquer \"ref\" encontrada "
-"no espaço de nomes `refs/`.  Essa opção permite fazer com que coincida com "
-"qualquer ramificação conhecida, do ramo monitorado remotamente ou de uma tag "
-"leve (lightweight)."
+msgstr "Em vez de usar apenas as tags anotadas, utilize qualquer \"ref\" encontrada no espaço de nomes `refs/`.  Essa opção permite fazer com que coincida com qualquer ramificação conhecida, do ramo monitorado remotamente ou de uma tag leve (lightweight)."
 
 #. type: Plain text
 #: en/git-describe.txt:59
 #, priority:260
 msgid "Instead of using only the annotated tags, use any tag found in `refs/tags` namespace.  This option enables matching a lightweight (non-annotated) tag."
-msgstr ""
-"Em vez de usar apenas as anotações das tags, utilize qualquer tag que for "
-"encontrada no `namespace` `refs/tags`.  Essa opção permite fazer a "
-"coincidência com uma tag \"leve\" (não anotada)."
+msgstr "Em vez de usar apenas as anotações das tags, utilize qualquer tag que for encontrada no `namespace` `refs/tags`.  Essa opção permite fazer a coincidência com uma tag \"leve\" (não anotada)."
 
 #. type: Labeled list
 #: en/git-describe.txt:60
@@ -21078,9 +19425,7 @@ msgstr "--exact-match"
 #: en/git-describe.txt:81
 #, priority:260
 msgid "Only output exact matches (a tag directly references the supplied commit).  This is a synonym for --candidates=0."
-msgstr ""
-"Apenas os resultados exatos de saída (uma tag faz referência direta ao "
-"commit informado).  Este é um sinônimo para `--candidates=0`."
+msgstr "Apenas os resultados exatos de saída (uma tag faz referência direta ao commit informado).  Este é um sinônimo para `--candidates=0`."
 
 #. type: Labeled list
 #: en/git-describe.txt:82 en/git-ls-files.txt:159
@@ -21110,15 +19455,7 @@ msgstr "--match <padrão>"
 #: en/git-describe.txt:105
 #, priority:260
 msgid "Only consider tags matching the given `glob(7)` pattern, excluding the \"refs/tags/\" prefix. If used with `--all`, it also considers local branches and remote-tracking references matching the pattern, excluding respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of other types are never considered. If given multiple times, a list of patterns will be accumulated, and tags matching any of the patterns will be considered.  Use `--no-match` to clear and reset the list of patterns."
-msgstr ""
-"Considere apenas as tags que coincidam ao padrão `glob (7)`, excluindo o "
-"prefixo \"refs/tags/\". Se utilizado com `--all`, também considera as "
-"ramificações locais e as referências do monitoramento remoto que coincidam "
-"com o padrão, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/"
-"remotes/\"; as referências dos outros tipos nunca são consideradas. Caso "
-"seja utilizado várias vezes, uma lista de padrões será acumulada e as tags "
-"que coincidam com qualquer um dos padrões serão consideradas.  Utilize `--no-"
-"match` para limpar e redefinir a lista dos padrões."
+msgstr "Considere apenas as tags que coincidam ao padrão `glob (7)`, excluindo o prefixo \"refs/tags/\". Se utilizado com `--all`, também considera as ramificações locais e as referências do monitoramento remoto que coincidam com o padrão, excluindo respectivamente o prefixo \"refs/heads/\" e \"refs/remotes/\"; as referências dos outros tipos nunca são consideradas. Caso seja utilizado várias vezes, uma lista de padrões será acumulada e as tags que coincidam com qualquer um dos padrões serão consideradas.  Utilize `--no-match` para limpar e redefinir a lista dos padrões."
 
 #. type: Labeled list
 #: en/git-describe.txt:106
@@ -21258,46 +19595,25 @@ msgstr "ESTRATÉGIA DE PESQUISA"
 #: en/git-describe.txt:183
 #, priority:260
 msgid "For each commit-ish supplied, 'git describe' will first look for a tag which tags exactly that commit.  Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates.  If an exact match is found, its name will be output and searching will stop."
-msgstr ""
-"Para cada 'commit-ish' informado, o comando 'git description' procurará "
-"primeiro em uma tag que identifique exatamente este commit.  As tags "
-"anotadas sempre serão preferidas às tags leves, as tags com datas mais "
-"recentes sempre serão preferidas às tags com datas mais antigas.  Em caso de "
-"uma coincidência exata ser encontrada, o seu nome será exibido e a pesquisa "
-"será interrompida."
+msgstr "Para cada 'commit-ish' informado, o comando 'git description' procurará primeiro em uma tag que identifique exatamente este commit.  As tags anotadas sempre serão preferidas às tags leves, as tags com datas mais recentes sempre serão preferidas às tags com datas mais antigas.  Em caso de uma coincidência exata ser encontrada, o seu nome será exibido e a pesquisa será interrompida."
 
 #. type: Plain text
 #: en/git-describe.txt:190
 #, priority:260
 msgid "If an exact match was not found, 'git describe' will walk back through the commit history to locate an ancestor commit which has been tagged.  The ancestor's tag will be output along with an abbreviation of the input commit-ish's SHA-1. If `--first-parent` was specified then the walk will only consider the first parent of each commit."
-msgstr ""
-"Caso uma coincidência exata não seja encontrada, o comando 'git description' "
-"retornará ao histórico do commit para encontrar um commit ancestral que "
-"tenha sido marcado.  A tag do ancestral será gerada juntamente com uma "
-"abreviação do SHA-1 do 'commit-ish' da entrada. Caso `--first-parent` teha "
-"sido utilizado, será considerada apenas o primeiro pai de cada commit."
+msgstr "Caso uma coincidência exata não seja encontrada, o comando 'git description' retornará ao histórico do commit para encontrar um commit ancestral que tenha sido marcado.  A tag do ancestral será gerada juntamente com uma abreviação do SHA-1 do 'commit-ish' da entrada. Caso `--first-parent` teha sido utilizado, será considerada apenas o primeiro pai de cada commit."
 
 #. type: Plain text
 #: en/git-describe.txt:196
 #, priority:260
 msgid "If multiple tags were found during the walk then the tag which has the fewest commits different from the input commit-ish will be selected and output.  Here fewest commits different is defined as the number of commits which would be shown by `git log tag..input` will be the smallest number of commits possible."
-msgstr ""
-"No caso várias tags serem localizadas durante o procedimento, será "
-"selecionada e gerada a tag que possuir a menor quantidade de \"commit-ish\" "
-"diferentes na entrada.  Aqui, a menor quantidade de commits diferentes é "
-"definido pela quantidade de commits que seriam exibidos através do comando `"
-"git log tag..input`, o seu resultado será a menor quantidade de commits "
-"possíveis."
+msgstr "No caso várias tags serem localizadas durante o procedimento, será selecionada e gerada a tag que possuir a menor quantidade de \"commit-ish\" diferentes na entrada.  Aqui, a menor quantidade de commits diferentes é definido pela quantidade de commits que seriam exibidos através do comando `git log tag..input`, o seu resultado será a menor quantidade de commits possíveis."
 
 #. type: Plain text
 #: en/git-describe.txt:204
 #, priority:260
 msgid "Tree objects as well as tag objects not pointing at commits, cannot be described.  When describing blobs, the lightweight tags pointing at blobs are ignored, but the blob is still described as <committ-ish>:<path> despite the lightweight tag being favorable."
-msgstr ""
-"Os objetos árvore assim como os objetos tag que não apontem para um commit "
-"não podem ser descritos.  Ao descrever as gotas, as tags mais leves que "
-"apontam para as gotas são ignoradas, porém a bolha ainda é descrita como "
-"<committ-ish>:<caminho> apesar da tag mais leve ser favorável."
+msgstr "Os objetos árvore assim como os objetos tag que não apontem para um commit não podem ser descritos.  Ao descrever as gotas, as tags mais leves que apontam para as gotas são ignoradas, porém a bolha ainda é descrita como <committ-ish>:<caminho> apesar da tag mais leve ser favorável."
 
 #. type: Title =
 #: en/git-diff-files.txt:2
@@ -21315,34 +19631,28 @@ msgstr "git-diff-files - Compara os arquivos na árvore de trabalho e no índice
 #: en/git-diff-files.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
-msgstr ""
-"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<opções-comuns-ao-diff>] "
-"[<caminho>...]\n"
+msgstr "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<opções-comuns-ao-diff>] [<caminho>...]\n"
 
 #. type: Plain text
 #: en/git-diff-files.txt:20
 #, priority:100
 msgid "Compares the files in the working tree and the index.  When paths are specified, compares only those named paths.  Otherwise all entries in the index are compared.  The output format is the same as for 'git diff-index' and 'git diff-tree'."
-msgstr ""
-"Compara os arquivos na árvore de trabalho e no índice.  Quando os caminhos "
-"são utilizados, compara apenas os caminhos informados.  Caso contrário, "
-"todas as entradas no índice serão comparadas.  O formato de saída é o mesmo "
-"que para `git diff-index` e `git diff-tree`."
+msgstr "Compara os arquivos na árvore de trabalho e no índice.  Quando os caminhos são utilizados, compara apenas os caminhos informados.  Caso contrário, todas as entradas no índice serão comparadas.  O formato de saída é o mesmo que para `git diff-index` e `git diff-tree`."
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr "-1 --base"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr "-2 --ours"
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr "-3 --theirs"
@@ -21393,9 +19703,7 @@ msgstr "git-diff-index - Compara uma árvore com a árvore ou índice de trabalh
 #: en/git-diff-index.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
-msgstr ""
-"'git diff-index' [-m] [--cached] [<opções-comuns-ao-diff>] <tree-ish> "
-"[<caminho>...]\n"
+msgstr "'git diff-index' [-m] [--cached] [<opções-comuns-ao-diff>] <tree-ish> [<caminho>...]\n"
 
 #. type: Plain text
 #: en/git-diff-index.txt:21
@@ -21419,10 +19727,7 @@ msgstr "não considere de forma alguma o arquivo em disco"
 #: en/git-diff-index.txt:37
 #, priority:100
 msgid "By default, files recorded in the index but not checked out are reported as deleted.  This flag makes 'git diff-index' say that all non-checked-out files are up to date."
-msgstr ""
-"É predefinido que os arquivos registrados no índice sem verificação sejam "
-"relatados como excluídos.  Esta opção faz com que o comando `git diff-index` "
-"diga que todos os arquivos sem verificação estejam atualizados."
+msgstr "É predefinido que os arquivos registrados no índice sem verificação sejam relatados como excluídos.  Esta opção faz com que o comando `git diff-index` diga que todos os arquivos sem verificação estejam atualizados."
 
 #. type: Title -
 #: en/git-diff-index.txt:41
@@ -21434,11 +19739,7 @@ msgstr "MODOS DE OPERAÇÃO"
 #: en/git-diff-index.txt:46
 #, priority:100
 msgid "You can choose whether you want to trust the index file entirely (using the `--cached` flag) or ask the diff logic to show any files that don't match the stat state as being \"tentatively changed\".  Both of these operations are very useful indeed."
-msgstr ""
-"Você pode escolher se quer confiar inteiramente no arquivo do índice ("
-"utilizando a opção `--cached`) ou pedir à lógica \"diff\" para exibir todos "
-"os arquivos que não coincidam com a condição de \"provisoriamente alterado\""
-".  Ambas as operações são realmente muito úteis."
+msgstr "Você pode escolher se quer confiar inteiramente no arquivo do índice (utilizando a opção `--cached`) ou pedir à lógica \"diff\" para exibir todos os arquivos que não coincidam com a condição de \"provisoriamente alterado\".  Ambas as operações são realmente muito úteis."
 
 #. type: Title -
 #: en/git-diff-index.txt:48
@@ -21502,10 +19803,7 @@ msgstr "É possível ver facilmente que o item acima foi renomeado."
 #: en/git-diff-index.txt:75
 #, priority:100
 msgid "In fact, `git diff-index --cached` *should* always be entirely equivalent to actually doing a 'git write-tree' and comparing that. Except this one is much nicer for the case where you just want to check where you are."
-msgstr ""
-"De fato, o comando `git diff-index --cached` *deve* sempre ser totalmente "
-"equivalente a fazer um `git write-tree` e comparar. Exceto que este é muito "
-"melhor para o caso onde você queira apenas averiguar onde você está."
+msgstr "De fato, o comando `git diff-index --cached` *deve* sempre ser totalmente equivalente a fazer um `git write-tree` e comparar. Exceto que este é muito melhor para o caso onde você queira apenas averiguar onde você está."
 
 #. type: Plain text
 #: en/git-diff-index.txt:79
@@ -21573,12 +19871,7 @@ msgstr "Como em outros comandos desse tipo, o 'git diff-index' não analisa de f
 #: en/git-diff-index.txt:119
 #, priority:100
 msgid "You can have a mixture of files show up as \"has been updated\" and \"is still dirty in the working directory\" together. You can always tell which file is in which state, since the \"has been updated\" ones show a valid sha1, and the \"not in sync with the index\" ones will always have the special all-zero sha1."
-msgstr ""
-"Você pode exibir junto uma mistura de arquivos como \"foi atualizado\" e "
-"\"ainda está sujo no diretório de trabalho\". Você sempre pode dizer qual "
-"arquivo está em qual condição, uma vez que os que \"foram atualizados\" "
-"exibam um sha1 válido e os \"que não estão sincronizados com o índice\" "
-"sempre terão o sha1 especial, zerados."
+msgstr "Você pode exibir junto uma mistura de arquivos como \"foi atualizado\" e \"ainda está sujo no diretório de trabalho\". Você sempre pode dizer qual arquivo está em qual condição, uma vez que os que \"foram atualizados\" exibam um sha1 válido e os \"que não estão sincronizados com o índice\" sempre terão o sha1 especial, zerados."
 
 #. type: Title =
 #: en/git-difftool.txt:2
@@ -21668,46 +19961,25 @@ msgstr "Utilize a ferramenta diff especificada por <ferramenta>.  Os valores vá
 #: en/git-difftool.txt:47
 #, priority:100
 msgid "If a diff tool is not specified, 'git difftool' will use the configuration variable `diff.tool`.  If the configuration variable `diff.tool` is not set, 'git difftool' will pick a suitable default."
-msgstr ""
-"Caso uma ferramenta diff não seja especificada, `git difftool` utilizará a "
-"variável de configuração `diff.tool`.  Caso a variável de configuração `diff."
-"tool` não esteja definida, o 'git difftool' escolherá um padrão adequado."
+msgstr "Caso uma ferramenta diff não seja especificada, `git difftool` utilizará a variável de configuração `diff.tool`.  Caso a variável de configuração `diff.tool` não esteja definida, o 'git difftool' escolherá um padrão adequado."
 
 #. type: Plain text
 #: en/git-difftool.txt:53
 #, priority:100
 msgid "You can explicitly provide a full path to the tool by setting the configuration variable `difftool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `difftool.kdiff3.path`. Otherwise, 'git difftool' assumes the tool is available in PATH."
-msgstr ""
-"Você pode fornecer explicitamente um caminho completo para a ferramenta "
-"definindo a variável de configuração `difftool.<ferramenta>.path`. Por "
-"exemplo, você pode configurar o caminho absoluto para o kdiff3 configurando "
-"`difftool.kdiff3.path`. Caso contrário, o 'git difftool' assume que a "
-"ferramenta está disponível no `PATH`."
+msgstr "Você pode fornecer explicitamente um caminho completo para a ferramenta definindo a variável de configuração `difftool.<ferramenta>.path`. Por exemplo, você pode configurar o caminho absoluto para o kdiff3 configurando `difftool.kdiff3.path`. Caso contrário, o 'git difftool' assume que a ferramenta está disponível no `PATH`."
 
 #. type: Plain text
 #: en/git-difftool.txt:58
 #, priority:100
 msgid "Instead of running one of the known diff tools, 'git difftool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `difftool.<tool>.cmd`."
-msgstr ""
-"Em vez de executar uma das ferramentas \"diff\" conhecidas, o 'git difftool' "
-"pode ser customizado para executar um programa alternativo, utilizando a "
-"linha de comando para chamar uma variável de configuração "
-"`difftool.<ferramenta>.cmd`."
+msgstr "Em vez de executar uma das ferramentas \"diff\" conhecidas, o 'git difftool' pode ser customizado para executar um programa alternativo, utilizando a linha de comando para chamar uma variável de configuração `difftool.<ferramenta>.cmd`."
 
 #. type: Plain text
 #: en/git-difftool.txt:68
 #, priority:100
 msgid "When 'git difftool' is invoked with this tool (either through the `-t` or `--tool` option or the `diff.tool` configuration variable)  the configured command line will be invoked with the following variables available: `$LOCAL` is set to the name of the temporary file containing the contents of the diff pre-image and `$REMOTE` is set to the name of the temporary file containing the contents of the diff post-image.  `$MERGED` is the name of the file which is being compared. `$BASE` is provided for compatibility with custom merge tool commands and has the same value as `$MERGED`."
-msgstr ""
-"Quando o 'git difftool' é chamado com esta ferramenta (através da opção `-t`"
-", `--tool` ou da variável de configuração `diff.tool`), a linha de comando "
-"configurada será chamada com as seguintes variáveis disponíveis: `$LOCAL` é "
-"definido como o nome do arquivo temporário que contenha o conteúdo da pré-"
-"imagem \"diff\" e `$REMOTE` é definido como o nome do arquivo temporário que "
-"contenha o conteúdo \"diff\" da pós-imagem diff.  `$MERGED` é o nome do "
-"arquivo que está sendo comparado. `$BASE` é disponibilizado para "
-"compatibilidade com comandos personalizados da ferramenta de mesclagem e tem "
-"o mesmo valor que `$MERGED`."
+msgstr "Quando o 'git difftool' é chamado com esta ferramenta (através da opção `-t`, `--tool` ou da variável de configuração `diff.tool`), a linha de comando configurada será chamada com as seguintes variáveis disponíveis: `$LOCAL` é definido como o nome do arquivo temporário que contenha o conteúdo da pré-imagem \"diff\" e `$REMOTE` é definido como o nome do arquivo temporário que contenha o conteúdo \"diff\" da pós-imagem diff.  `$MERGED` é o nome do arquivo que está sendo comparado. `$BASE` é disponibilizado para compatibilidade com comandos personalizados da ferramenta de mesclagem e tem o mesmo valor que `$MERGED`."
 
 #. type: Labeled list
 #: en/git-difftool.txt:69 en/git-mergetool.txt:67
@@ -21773,13 +20045,7 @@ msgstr "--[no-]gui"
 #: en/git-difftool.txt:96
 #, priority:100
 msgid "When 'git-difftool' is invoked with the `-g` or `--gui` option the default diff tool will be read from the configured `diff.guitool` variable instead of `diff.tool`. The `--no-gui` option can be used to override this setting. If `diff.guitool` is not set, we will fallback in the order of `merge.guitool`, `diff.tool`, `merge.tool` until a tool is found."
-msgstr ""
-"Quando o comando 'git-difftool' é chamado com a opção `-g` ou `--gui`, a "
-"ferramenta diff predefinida será lida na variável `diff.guitool` configurada "
-"em vez do `diff.tool`. A opção `--no-gui` pode ser usada para substituir "
-"essa configuração. Caso o `diff.guitool` não esteja definido, retroagiremos "
-"na seguinte ordem, `merge.guitool`, `diff.tool`, `merge.tool` até que uma "
-"ferramenta seja encontrada."
+msgstr "Quando o comando 'git-difftool' é chamado com a opção `-g` ou `--gui`, a ferramenta diff predefinida será lida na variável `diff.guitool` configurada em vez do `diff.tool`. A opção `--no-gui` pode ser usada para substituir essa configuração. Caso o `diff.guitool` não esteja definido, retroagiremos na seguinte ordem, `merge.guitool`, `diff.tool`, `merge.tool` até que uma ferramenta seja encontrada."
 
 #. type: Labeled list
 #: en/git-difftool.txt:97
@@ -21953,9 +20219,7 @@ msgstr "Compara o conteúdo e o modo das bolhas encontrados por meio de dois obj
 #: en/git-diff-tree.txt:22
 #, priority:100
 msgid "If there is only one <tree-ish> given, the commit is compared with its parents (see --stdin below)."
-msgstr ""
-"Caso haja apenas um <tree-ish> informado, o commit será comparado com as "
-"suas raízes (consulte `--stdin` abaixo)."
+msgstr "Caso haja apenas um <tree-ish> informado, o commit será comparado com as suas raízes (consulte `--stdin` abaixo)."
 
 #. type: Plain text
 #: en/git-diff-tree.txt:24
@@ -21970,7 +20234,7 @@ msgid "The id of a tree object."
 msgstr "A identificação de um objeto árvore."
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr "<caminho>..."
@@ -22003,21 +20267,13 @@ msgstr "Quando `--root` é utilizado o commit inicial será exibido como um gran
 #: en/git-diff-tree.txt:52
 #, priority:100
 msgid "When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line.  Instead, it reads lines containing either two <tree>, one <commit>, or a list of <commit> from its standard input.  (Use a single space as separator.)"
-msgstr ""
-"Quando `--stdin` é utilizado o comando não obtém os argumentos `<tree-ish>` "
-"da linha de comando.  Em vez disso ele lê as linhas contendo duas `<árvores>`"
-", um `<commit>` ou uma lista de `<commit>` da sua entrada padrão.  (Utilize "
-"um único espaço como separador.)"
+msgstr "Quando `--stdin` é utilizado o comando não obtém os argumentos `<tree-ish>` da linha de comando.  Em vez disso ele lê as linhas contendo duas `<árvores>`, um `<commit>` ou uma lista de `<commit>` da sua entrada padrão.  (Utilize um único espaço como separador.)"
 
 #. type: Plain text
 #: en/git-diff-tree.txt:57
 #, priority:100
 msgid "When two trees are given, it compares the first tree with the second.  When a single commit is given, it compares the commit with its parents.  The remaining commits, when given, are used as if they are parents of the first commit."
-msgstr ""
-"Quando duas árvores são informadas, é feita uma comparação entre a primeira "
-"e a segunda.  Quando um único commit é dado, ele compara o commit com as "
-"suas origens.  Os commits restantes, quando informados, são utilizados como "
-"se fossem as origens do primeiro commit."
+msgstr "Quando duas árvores são informadas, é feita uma comparação entre a primeira e a segunda.  Quando um único commit é dado, ele compara o commit com as suas origens.  Os commits restantes, quando informados, são utilizados como se fossem as origens do primeiro commit."
 
 #. type: Plain text
 #: en/git-diff-tree.txt:62
@@ -22029,9 +20285,7 @@ msgstr "Ao comparar duas árvores, o ID de ambas (separado por um espaço e fina
 #: en/git-diff-tree.txt:65
 #, priority:100
 msgid "The following flags further affect the behavior when comparing commits (but not trees)."
-msgstr ""
-"As seguintes opções afetam ainda mais o comportamento durante a comparação "
-"dos commits (mas não as árvores)."
+msgstr "As seguintes opções afetam ainda mais o comportamento durante a comparação dos commits (mas não as árvores)."
 
 #. type: Plain text
 #: en/git-diff-tree.txt:71
@@ -22085,12 +20339,7 @@ msgstr "--combined-all-paths"
 #: en/git-diff-tree.txt:114 en/rev-list-options.txt:1149
 #, priority:260
 msgid "This flag causes combined diffs (used for merge commits) to list the name of the file from all parents.  It thus only has effect when -c or --cc are specified, and is likely only useful if filename changes are detected (i.e. when either rename or copy detection have been requested)."
-msgstr ""
-"Esta opção faz com que os diffs combinados (usados para a mesclagem dos "
-"commits) listem o nome do arquivo de todos os pais.  Dessa forma, só tem "
-"efeito quando `-c` ou `-cc` são utilizados e provavelmente é útil apenas "
-"caso as alterações no nome do arquivo sejam detectados (ou seja, quando a "
-"renomeação ou a detecção da cópia forem solicitadas)."
+msgstr "Esta opção faz com que os diffs combinados (usados para a mesclagem dos commits) listem o nome do arquivo de todos os pais.  Dessa forma, só tem efeito quando `-c` ou `-cc` são utilizados e provavelmente é útil apenas caso as alterações no nome do arquivo sejam detectados (ou seja, quando a renomeação ou a detecção da cópia forem solicitadas)."
 
 #. type: Plain text
 #: en/git-diff-tree.txt:118
@@ -22111,12 +20360,19 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Exibe as mudanças entre os commits, o commit, a árvore de trabalho, etc"
 
 #. type: Plain text
-#: en/git-diff.txt:17
-#, ignore-ellipsis, no-wrap, priority:280
+#: en/git-diff.txt:18
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid ""
+#| "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
+#| "'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+#| "'git diff' [<options>] <blob> <blob>\n"
+#| "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
@@ -22127,157 +20383,159 @@ msgstr ""
 "'git diff' [<opções>] --no-index [--] <caminho> <caminho>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:23
-#, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+#: en/git-diff.txt:25
+#, fuzzy, priority:280
+#| msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr "Exibe as alterações entre a árvore de trabalho, o índice ou uma árvore, as alterações entre o índice e uma árvore, as alterações entre as duas árvores, alterações entre dois objetos gota ou alterações entre dois arquivos no disco."
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr "'git diff' [<opções>] [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr "Este formulário serve para exibir as alterações feitas em relação ao índice (área de preparação para o próximo commit).  Em outras palavras, as diferenças são as que você _pode_ informar ao Git para adicionar ao índice, mas ainda não o fez.   Você pode preparar essas alterações utilizando linkgit:git-add[1]."
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr "'git diff' [<opções>] --no-index [--] <caminho> <caminho>"
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr "Este formulário serve para comparar os dois caminhos utilizados no sistema de arquivos.  Você pode omitir a opção `--no-index` durante a execução do comando em uma árvore de trabalho controlado pelo Git e pelo menos um dos pontos dos caminhos fora da árvore de trabalho ou ao executar o comando fora de uma árvore de trabalho que é controlado pelo Git. Este formulário implica no uso da opção `--exit-code`."
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "'git diff' [<opções>] --cached [<commit>] [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
-msgstr ""
-"Este formulário serve para exibir as alterações feitas em relação ao próximo "
-"commit relativo ao `<commit>` informado.  Geralmente você vai querer uma "
-"comparação com o commit mais recente, portanto, se não fizer o `<commit>` a "
-"predefinição retorna para `HEAD`.  Caso `HEAD` não exista (como por exemplo, "
-"os galhos que ainda vão aparecer) e um `<commit>` não tenha sido feito, "
-"exibe todas as alterações em etapas.  `--staged` é um sinônimo da opção "
-"`--cached`."
+msgstr "Este formulário serve para exibir as alterações feitas em relação ao próximo commit relativo ao `<commit>` informado.  Geralmente você vai querer uma comparação com o commit mais recente, portanto, se não fizer o `<commit>` a predefinição retorna para `HEAD`.  Caso `HEAD` não exista (como por exemplo, os galhos que ainda vão aparecer) e um `<commit>` não tenha sido feito, exibe todas as alterações em etapas.  `--staged` é um sinônimo da opção `--cached`."
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr "'git diff' [<opções>] <commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr "Este formulário exibe as modificações feitas por você na sua árvore de trabalho relativo ao nome do `<commit>`.  É possível utilizar o `HEAD` para compará-lo com o commit mais recente ou para comparar com o cume de um ramo diferente."
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<opções>] <commit> <commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr "Isso é para exibir as alterações entre os dois `<commits>` arbitrários."
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<opções>] <commit>..<commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr "Isso é um sinônimo do formulário anterior.  Caso o <commitir> de um lado seja omitido, ele terá o mesmo efeito que usar `HEAD`."
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "'git diff' [<opções>] <commit>\\...<commit> [--] [<caminho>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff' [<opções>] <commit>\\...<commit> [--] [<caminho>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr "Este formulário é para exibir as alterações no ramo que contenha até o segundo `<commit>`, iniciando com um ancestral comum de ambos os `<commit>`.  `git diff A\\...B` é o equivalente a um `git diff $(git merge-base A B) B`.  Você pode omitir qualquer um dos `<commit>` que tem o mesmo efeito que usar `HEAD`."
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr "No caso de você estar fazendo algo exótico, deve-se notar que todos os `<commit>` na descrição acima, exceto nas duas últimas formas que usam as notações \"..\", podem ser qualquer `<árvore>`."
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr "Para obter uma lista mais completa de maneiras de soletrar um `<commit>`, consulte a seção \"DEFININDO AS REVISÕES\" em linkgit:gitrevisions[7].  No entanto, `diff` é sobre comparar dois _endpoints_, e não os intervalos, as notações de intervalo (\"<commit>.. <commit>\" e \"<commit>\\... <commit>\") não significam um intervalo definido na seção \"DEFININDO AS REVISÕES\" em linkgit:gitrevisions[7]."
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr "'git diff' [<opções>] <blob> <blob>"
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr "Este formulário serve para exibir as alterações feitas entre o conteúdo bruto de dois objetos gota."
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
-msgstr ""
-"Compare a árvore de trabalho com a versão \"base\" (stage #1), \"o nosso "
-"ramo\" (stage #2) \"o ramo deles\" (stage #3).  O índice contém estas etapas "
-"apenas para as entradas que não foram não mescladas enquanto estiver "
-"resolvendo os conflitos.  Para obter informações mais detalhadas, consulte a "
-"seção \"3-Way Merge\" linkgit:git-read-tree[1]."
+msgstr "Compare a árvore de trabalho com a versão \"base\" (stage #1), \"o nosso ramo\" (stage #2) \"o ramo deles\" (stage #3).  O índice contém estas etapas apenas para as entradas que não foram não mescladas enquanto estiver resolvendo os conflitos.  Para obter informações mais detalhadas, consulte a seção \"3-Way Merge\" linkgit:git-read-tree[1]."
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr "Omita a saída diff para as entradas que não tenham sido mescladas e exiba \"Unmergedd\".  Só pode ser utilizado quando comparamos a árvore de trabalho com o índice."
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr "Os parâmetros `<paths>`, quando utilizados, são para limitar o `diff` quanto aos nomes dos caminhos (você pode dar nomes de diretórios e obter um `diff` para todos os arquivos sob eles)."
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr "Várias maneiras para verificar a sua árvore de trabalho"
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -22289,31 +20547,31 @@ msgstr ""
 "$ git diff HEAD       <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr "As mudanças na árvore de trabalho ainda não preparadas para o próximo commit."
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr "As alterações entre o índice e o seu último commit; o que você estaria fazendo no commit caso você executasse o comando \"git commit\" sem a opção \"-a\"."
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr "As alterações na árvore de trabalho desde o seu último commit; o que você estaria fazendo no commit caso executasse o comando \"git commit -a\""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr "Comparando com commits arbitrários"
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -22325,31 +20583,31 @@ msgstr ""
 "$ git diff HEAD^ HEAD      <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr "Em vez de utilizar o cume do ramo atual, compare com o cume do ramo \"teste\"."
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr "Em vez de comparar com o cume do ramo \"teste\", compare com o cume do ramo atual, limitando-se a comparação com o arquivo \"teste\"."
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr "Compare a versão antes do último commit e o último commit."
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr "Comparando os ramos"
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -22361,31 +20619,31 @@ msgstr ""
 "$ git diff topic...master  <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr "As alterações entre as dicas do tópico e as ramificações principais."
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr "O mesmo que acima."
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr "As alterações que ocorreram na ramificação master (mestre) desde quando a ramificação do tópico foi iniciada."
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr "Limitando a saída diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -22397,31 +20655,31 @@ msgstr ""
 "$ git diff arch/i386 include/asm-i386   <3>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr "Exibe apenas as modificações, renomeações e cópias, mas não a adição ou exclusão."
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr "Exibe apenas os nomes e a natureza da alteração, mas não a saída diff real."
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr "Limite a saída diff aos nomes das subárvores."
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr "Arruinando a saída diff"
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -22431,21 +20689,22 @@ msgstr ""
 "$ git diff -R                          <2>\n"
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr "Gaste alguns ciclos extras para encontrar renomeações, cópias e reescritas completas (muito custoso ao sistema)."
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr "Saída do diff em reverso."
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
 msgstr "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
 
 #. type: Title =
@@ -22476,11 +20735,7 @@ msgstr "Este programa despeja as revisões informadas em um formato adequado par
 #: en/git-fast-export.txt:23
 #, priority:100
 msgid "You can use it as a human-readable bundle replacement (see linkgit:git-bundle[1]), or as a format that can be edited before being fed to 'git fast-import' in order to do history rewrites (an ability relied on by tools like 'git filter-repo')."
-msgstr ""
-"Você pode usá-lo como uma reposição legível do pacote (consulte linkgit:git-"
-"bundle[1]) ou como um formato que pode ser editado antes que possa ser "
-"enviado ao 'git fast import' para fazer a reescrita no histórico (uma "
-"habilidade dependente das ferramentas como 'git filter-repo')."
+msgstr "Você pode usá-lo como uma reposição legível do pacote (consulte linkgit:git-bundle[1]) ou como um formato que pode ser editado antes que possa ser enviado ao 'git fast import' para fazer a reescrita no histórico (uma habilidade dependente das ferramentas como 'git filter-repo')."
 
 #. type: Labeled list
 #: en/git-fast-export.txt:26
@@ -22510,13 +20765,7 @@ msgstr "Determine como lidar com tags assinadas.  Como qualquer transformação
 #: en/git-fast-export.txt:41
 #, priority:100
 msgid "When asking to 'abort' (which is the default), this program will die when encountering a signed tag.  With 'strip', the tags will silently be made unsigned, with 'warn-strip' they will be made unsigned but a warning will be displayed, with 'verbatim', they will be silently exported and with 'warn', they will be exported, but you will see a warning."
-msgstr ""
-"Ao pedir para abortar 'abort' (que é o padrão), este programa será terminado "
-"ao encontrar uma tag assinada.  Com `strip`, as tags serão silenciosamente "
-"perderão a assinatura, com `warn strip` elas também perderão a assinatura, "
-"porém um aviso será exibido, com `verbatim`, elas serão exportadas "
-"silenciosamente e com `warn`, elas serão exportadas , porém você será "
-"avisado."
+msgstr "Ao pedir para abortar 'abort' (que é o padrão), este programa será terminado ao encontrar uma tag assinada.  Com `strip`, as tags serão silenciosamente perderão a assinatura, com `warn strip` elas também perderão a assinatura, porém um aviso será exibido, com `verbatim`, elas serão exportadas silenciosamente e com `warn`, elas serão exportadas , porém você será avisado."
 
 #. type: Labeled list
 #: en/git-fast-export.txt:42
@@ -22558,16 +20807,7 @@ msgstr "--export-marks=<arquivo>"
 #: en/git-fast-export.txt:73
 #, priority:100
 msgid "Dumps the internal marks table to <file> when complete.  Marks are written one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks for blobs are ignored.  Backends can use this file to validate imports after they have been completed, or to save the marks table across incremental runs.  As <file> is only opened and truncated at completion, the same path can also be safely given to --import-marks.  The file will not be written if no new object has been marked/exported."
-msgstr ""
-"Despeja a tabela de marcações internas em <arquivo> quando concluída.  As "
-"marcações são escritas uma por linha como `:markid SHA-1`. Somente as "
-"marcações para as revisões são despejadas; as marcações das bolhas são "
-"ignoradas.  Os processos internos podem usar esse arquivo para validar as "
-"importações depois de concluídas ou para salvar a tabela de marcações em "
-"execuções incrementais.  Como o <arquivo> só é aberto e truncado na "
-"conclusão, o mesmo caminho também pode ser passado com segurança para "
-"`--import-marks`.  O arquivo não será gravado caso nenhum novo objeto tenha "
-"sido marcado/exportado."
+msgstr "Despeja a tabela de marcações internas em <arquivo> quando concluída.  As marcações são escritas uma por linha como `:markid SHA-1`. Somente as marcações para as revisões são despejadas; as marcações das bolhas são ignoradas.  Os processos internos podem usar esse arquivo para validar as importações depois de concluídas ou para salvar a tabela de marcações em execuções incrementais.  Como o <arquivo> só é aberto e truncado na conclusão, o mesmo caminho também pode ser passado com segurança para `--import-marks`.  O arquivo não será gravado caso nenhum novo objeto tenha sido marcado/exportado."
 
 #. type: Labeled list
 #: en/git-fast-export.txt:74 en/git-fast-import.txt:102
@@ -22591,23 +20831,13 @@ msgstr "--mark-tags"
 #: en/git-fast-export.txt:87
 #, priority:100
 msgid "In addition to labelling blobs and commits with mark ids, also label tags.  This is useful in conjunction with `--export-marks` and `--import-marks`, and is also useful (and necessary) for exporting of nested tags.  It does not hurt other cases and would be the default, but many fast-import frontends are not prepared to accept tags with mark identifiers."
-msgstr ""
-"Além de rotular as bolhas e fazer os commits com os IDs das marcações, e "
-"também rotulando as tags.  É útil em conjunto com a opção `--export-marks` e "
-"`--import-marks`, também é útil (e necessário) para a exportação das tags "
-"aninhadas.  Não prejudica os outros casos e seria a predefinição, porém "
-"muitos frontends de importação rápida (fast-import) não estão preparados "
-"para aceitar as tags com identificadores de marcação."
+msgstr "Além de rotular as bolhas e fazer os commits com os IDs das marcações, e também rotulando as tags.  É útil em conjunto com a opção `--export-marks` e `--import-marks`, também é útil (e necessário) para a exportação das tags aninhadas.  Não prejudica os outros casos e seria a predefinição, porém muitos frontends de importação rápida (fast-import) não estão preparados para aceitar as tags com identificadores de marcação."
 
 #. type: Plain text
 #: en/git-fast-export.txt:92
 #, priority:100
 msgid "Any commits (or tags) that have already been marked will not be exported again.  If the backend uses a similar --import-marks file, this allows for incremental bidirectional exporting of the repository by keeping the marks the same across runs."
-msgstr ""
-"Quaisquer commits (ou tags) que já foram marcadas não serão exportadas "
-"novamente.  Caso a estrutura utilize um arquivo '--import-marks' semelhante, "
-"isto permitirá a exportação bidirecional e incremental do repositório, "
-"mantendo as marcas iguais durante as execuções."
+msgstr "Quaisquer commits (ou tags) que já foram marcadas não serão exportadas novamente.  Caso a estrutura utilize um arquivo '--import-marks' semelhante, isto permitirá a exportação bidirecional e incremental do repositório, mantendo as marcas iguais durante as execuções."
 
 #. type: Labeled list
 #: en/git-fast-export.txt:93
@@ -22671,92 +20901,90 @@ msgstr "Torne os conteúdos do repositório, anônimo, mantendo a forma do hist
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
-msgstr ""
-"É predefinido que ao executar um comando como `git fast-export master~5.."
-"master` não incluirá o commit 'master{tilde}5' e fará com que o "
-"'master{tilde}4' não tenha mais o 'master{tilde}5' como parente (embora "
-"ambos o antigo 'master{tilde}4' e o novo 'master{tilde}4' tenham todos os "
-"mesmos arquivos).  Utilize a opção `--reference-exclusive-parents` para que "
-"o fluxo se refira aos commits no intervalo excluído do histórico pelo "
-"sha1sum.  Observe que o fluxo resultante pode ser utilizado apenas por um "
-"repositório que já contenha os parentes dos commits necessários."
+msgstr "É predefinido que ao executar um comando como `git fast-export master~5..master` não incluirá o commit 'master{tilde}5' e fará com que o 'master{tilde}4' não tenha mais o 'master{tilde}5' como parente (embora ambos o antigo 'master{tilde}4' e o novo 'master{tilde}4' tenham todos os mesmos arquivos).  Utilize a opção `--reference-exclusive-parents` para que o fluxo se refira aos commits no intervalo excluído do histórico pelo sha1sum.  Observe que o fluxo resultante pode ser utilizado apenas por um repositório que já contenha os parentes dos commits necessários."
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
-msgstr ""
-"Inclua uma diretiva extra para os commits que forem gerados e as bolhas, "
-"`original-oid <SHA1SUM>`.  Embora estas diretivas provavelmente sejam "
-"ignoradas pelos importadores, como o comando `git-fast-import`, pode ser "
-"útil para os filtros intermediários (para reescrever mensagens do commit que "
-"se referem aos commits mais antigos ou para remover as bolhas através de uma "
-"ID por exemplo)."
+msgstr "Inclua uma diretiva extra para os commits que forem gerados e as bolhas, `original-oid <SHA1SUM>`.  Embora estas diretivas provavelmente sejam ignoradas pelos importadores, como o comando `git-fast-import`, pode ser útil para os filtros intermediários (para reescrever mensagens do commit que se referem aos commits mais antigos ou para remover as bolhas através de uma ID por exemplo)."
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr "--reencode=(yes|no|abort)"
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr "Especifique como manipular o cabeçalho `encoding` nos objetos commit.  Ao pedir para abortar 'abort' (que é a predefinição), este programa será terminado ao encontrar tal objeto que foi feito o commit.  Com 'yes', a mensagem do commit será re-codificada para UTF-8.  Com 'no', a codificação original será preservada."
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr "Aplique o `refspec` especificado a cada \"ref\" exportado. Vários deles podem ser especificados."
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr "[<git-rev-list-args>...]"
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr "Uma lista de argumentos aceitáveis para o 'git rev-parse' e 'git rev-list', que especifica os objetos e referências para serem exportadas.  Por exemplo, `master~10..master` faz com que a referência principal atual seja exportada junto com todos os objetos adicionados desde o seu décimo commit ancestral e (a menos que a opção `--reference-exclusive-parents` esteja especificada) todos os arquivos comuns a master{tilde}9 e master{tilde}10."
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr "Isso exportará o repositório inteiro e importará para o repositório vazio existente.  Exceto para re-codificar os commits que não estejam como UTF-8, seria um cópia um para um."
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -22768,67 +20996,55 @@ msgstr ""
 "\tgit fast-import\n"
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr "Isso cria um novo ramo chamado 'other' de 'master~5..master' (ou seja, caso 'master' tenha um histórico linear, serão necessários então os últimos 5 commits)."
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr "Observe que isso pressupõe que nenhuma das bolhas e as mensagens dos commits referenciadas por esse intervalo de revisão, contenha a sequência `refs/heads/master`."
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr "ANONIMIZANDO"
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr "Caso a opção `--anonymize` seja utilizada, o git tentará remover todas as informações de identificação do repositório, mantendo ainda o suficiente da árvore original e dos padrões do histórico para reproduzir alguns bugs. O objetivo é que um bug do git encontrado em um repositório privado persista no repositório anonimizado e este último pode ser compartilhado com os desenvolvedores do git para ajudar na resolução do problema."
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
-msgstr ""
-"Com esta opção, o git substituirá todos os `refnames`, os caminhos, o "
-"conteúdo da bolha, o commit, a tag das mensagens, os nomes e os endereços de "
-"e-mail que forem gerados através de dados anônimos.  As duas instâncias da "
-"mesma sequência serão substituídas de forma equivalente (dois commits com o "
-"mesmo autor irão gerar o mesmo autor anônimo, porém não terão nenhuma "
-"semelhança com a sequência do autor original por exemplo). O relacionamento "
-"entre os commits, as ramificações e as tags será mantido, bem como o "
-"registro de data e hora dos commits (menos as mensagens dos commits e os "
-"`refnames` que não tenham nenhuma semelhança com os originais). A composição "
-"relativa da árvore é mantida (caso tenha uma árvore raiz com 10 arquivos e 3 "
-"árvores, assim também será gerado por exemplo), porém os seus nomes e o "
-"conteúdo dos arquivos serão substituídos."
+msgstr "Com esta opção, o git substituirá todos os `refnames`, os caminhos, o conteúdo da bolha, o commit, a tag das mensagens, os nomes e os endereços de e-mail que forem gerados através de dados anônimos.  As duas instâncias da mesma sequência serão substituídas de forma equivalente (dois commits com o mesmo autor irão gerar o mesmo autor anônimo, porém não terão nenhuma semelhança com a sequência do autor original por exemplo). O relacionamento entre os commits, as ramificações e as tags será mantido, bem como o registro de data e hora dos commits (menos as mensagens dos commits e os `refnames` que não tenham nenhuma semelhança com os originais). A composição relativa da árvore é mantida (caso tenha uma árvore raiz com 10 arquivos e 3 árvores, assim também será gerado por exemplo), porém os seus nomes e o conteúdo dos arquivos serão substituídos."
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr "Caso acredite que tenha encontrado um bug no git, pode começar exportando um fluxo anonimizado de todo o repositório:"
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr "$ git fast-export --anonymize --all >anon-stream\n"
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr "Em seguida, confirme se o bug persiste em um repositório criado a partir desse fluxo (muitos erros não, pois eles realmente dependem do conteúdo exato do repositório):"
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -22842,25 +21058,59 @@ msgstr ""
 "$ ... teste o seu bug ...\n"
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr "Caso o repositório anonimizado exiba o erro, pode valer a pena compartilhar o `anon-stream` junto com um relatório de erro tradicional. Observe que o fluxo anonimizado é muito bem compactado, portanto a sua compactação gzip é altamente recomendável. Caso deseje examinar o fluxo para ver se não contém dados particulares, é possível examiná-lo diretamente antes de enviar. Também é possível tentar:"
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr "que exiba todas as linhas exclusivas (com números convertidos em \"X\", para recolher o \"Usuário 0\", \"Usuário 1\" etc. em \"Usuário X\"). Isso produz uma saída muito menor e geralmente é de rápida confirmação já que não há dados privados no fluxo."
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr "Como 'git fast-import' não pode marcar as árvores, você não poderá exportar o repositório linux.git completamente pois ele contém uma marca que faz referência a uma árvore em vez de um commit."
@@ -22875,8 +21125,7 @@ msgstr "git-fast-import(1)"
 #: en/git-fast-import.txt:7
 #, priority:100
 msgid "git-fast-import - Backend for fast Git data importers"
-msgstr ""
-"git-fast-import - Estrutura para os importadores de dados rápidos do Git"
+msgstr "git-fast-import - Estrutura para os importadores de dados rápidos do Git"
 
 #. type: Plain text
 #: en/git-fast-import.txt:13
@@ -22894,32 +21143,19 @@ msgstr "Este programa geralmente não é o que o usuário final deseja executar
 #: en/git-fast-import.txt:26
 #, priority:100
 msgid "fast-import reads a mixed command/data stream from standard input and writes one or more packfiles directly into the current repository.  When EOF is received on standard input, fast import writes out updated branch and tag refs, fully updating the current repository with the newly imported data."
-msgstr ""
-"O `fast-import` lê um fluxo misto de comandos e dados na entrada padrão e "
-"grava um ou mais pacote de arquivos diretamente no repositório atual.  "
-"Quando um \"EOF\" é recebido na entrada padrão, a importação rápida grava as "
-"referências atualizadas das ramificações e tags, atualizando completamente o "
-"repositório atual com os dados importados recentemente."
+msgstr "O `fast-import` lê um fluxo misto de comandos e dados na entrada padrão e grava um ou mais pacote de arquivos diretamente no repositório atual.  Quando um \"EOF\" é recebido na entrada padrão, a importação rápida grava as referências atualizadas das ramificações e tags, atualizando completamente o repositório atual com os dados importados recentemente."
 
 #. type: Plain text
 #: en/git-fast-import.txt:32
 #, priority:100
 msgid "The fast-import backend itself can import into an empty repository (one that has already been initialized by 'git init') or incrementally update an existing populated repository.  Whether or not incremental imports are supported from a particular foreign source depends on the frontend program in use."
-msgstr ""
-"A estrutura `fast-import` em si pode importar para um repositório vazio (um "
-"que já foi inicializado por 'git init') ou atualizar de forma incremental em "
-"um repositório preenchido já existente.  Caso as importações incrementais "
-"sejam ou não compatíveis com determinada fonte estrangeira específica, isso "
-"vai depender do programa de front-end utilizado."
+msgstr "A estrutura `fast-import` em si pode importar para um repositório vazio (um que já foi inicializado por 'git init') ou atualizar de forma incremental em um repositório preenchido já existente.  Caso as importações incrementais sejam ou não compatíveis com determinada fonte estrangeira específica, isso vai depender do programa de front-end utilizado."
 
 #. type: Plain text
 #: en/git-fast-import.txt:41
 #, priority:100
 msgid "Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit)."
-msgstr ""
-"Impor a atualização das ramificações existentes que foram alteradas , ainda "
-"que os commits sejam perdidos (como um novo commit que não contenha o commit "
-"antigo)."
+msgstr "Impor a atualização das ramificações existentes que foram alteradas , ainda que os commits sejam perdidos (como um novo commit que não contenha o commit antigo)."
 
 #. type: Plain text
 #: en/git-fast-import.txt:47
@@ -22949,25 +21185,13 @@ msgstr "--allow-unsafe-features"
 #: en/git-fast-import.txt:63
 #, priority:100
 msgid "Many command-line options can be provided as part of the fast-import stream itself by using the `feature` or `option` commands. However, some of these options are unsafe (e.g., allowing fast-import to access the filesystem outside of the repository). These options are disabled by default, but can be allowed by providing this option on the command line.  This currently impacts only the `export-marks`, `import-marks`, and `import-marks-if-exists` feature commands."
-msgstr ""
-"Muitas opções na linha de comando podem ser informadas como parte do próprio "
-"fluxo de importação rápida, utilizando os comandos `feature` ou `option`. No "
-"entanto, algumas destas opções não são seguras (como por exemplo, permitindo "
-"que a importação rápida acesse o sistema de arquivos fora do repositório). É "
-"predefinido que estas opções estão desabilitadas, porém podem ser permitidas "
-"ao utilizar essa opção na linha de comandos.  Atualmente, isso afeta apenas "
-"os comandos de recurso `export-marks`,` import-marks` e `import-marks-if-"
-"exist`."
+msgstr "Muitas opções na linha de comando podem ser informadas como parte do próprio fluxo de importação rápida, utilizando os comandos `feature` ou `option`. No entanto, algumas destas opções não são seguras (como por exemplo, permitindo que a importação rápida acesse o sistema de arquivos fora do repositório). É predefinido que estas opções estão desabilitadas, porém podem ser permitidas ao utilizar essa opção na linha de comandos.  Atualmente, isso afeta apenas os comandos de recurso `export-marks`,` import-marks` e `import-marks-if-exist`."
 
 #. type: Plain text
 #: en/git-fast-import.txt:68
 #, priority:100
 msgid "Only enable this option if you trust the program generating the fast-import stream! This option is enabled automatically for remote-helpers that use the `import` capability, as they are already trusted to run their own code."
-msgstr ""
-"Ative esta opção apenas caso confie no programa que gera o fluxo de "
-"importação rápida! Esta opção é ativada automaticamente para os auxiliares "
-"remotos que usem o recurso `import`, pois eles já são confiáveis para "
-"executar o seu próprio código."
+msgstr "Ative esta opção apenas caso confie no programa que gera o fluxo de importação rápida! Esta opção é ativada automaticamente para os auxiliares remotos que usem o recurso `import`, pois eles já são confiáveis para executar o seu próprio código."
 
 #. type: Title ~
 #: en/git-fast-import.txt:70
@@ -22985,10 +21209,7 @@ msgstr "--cat-blob-fd=<fd>"
 #: en/git-fast-import.txt:77
 #, priority:100
 msgid "Write responses to `get-mark`, `cat-blob`, and `ls` queries to the file descriptor <fd> instead of `stdout`.  Allows `progress` output intended for the end-user to be separated from other output."
-msgstr ""
-"Escreva as respostas para `get-mark`, `cat-blob` e do `ls` das consultas no "
-"descritor do arquivo <fd> em vez do `stdout`.  Permite que a saída `progress`"
-" destinada ao usuário final seja separada de uma outra saída."
+msgstr "Escreva as respostas para `get-mark`, `cat-blob` e do `ls` das consultas no descritor do arquivo <fd> em vez do `stdout`.  Permite que a saída `progress` destinada ao usuário final seja separada de uma outra saída."
 
 #. type: Labeled list
 #: en/git-fast-import.txt:78
@@ -23084,40 +21305,25 @@ msgstr "--rewrite-submodules-to=<nome>:<arquivo>"
 #: en/git-fast-import.txt:131
 #, priority:100
 msgid "Rewrite the object IDs for the submodule specified by <name> from the values"
-msgstr ""
-"Reescreva as IDs dos objetos para o submódulo definido pelo <nome> vindo dos "
-"valores"
+msgstr "Reescreva as IDs dos objetos para o submódulo definido pelo <nome> vindo dos valores"
 
 #. type: Plain text
 #: en/git-fast-import.txt:134
 #, priority:100
 msgid "used in the from <file> to those used in the to <file>. The from marks should have been created by `git fast-export`, and the to marks should have been created by `git fast-import` when importing that same submodule."
-msgstr ""
-"usado vindo de um <arquivo> para aqueles usado para o <arquivo>. As "
-"marcações de origem deveriam ter sido criadas por pelo comando `git fast-"
-"export` e as marcações to deveriam ter sido criadas pelo ` git fast-import` "
-"durante a importação do mesmo submódulo."
+msgstr "usado vindo de um <arquivo> para aqueles usado para o <arquivo>. As marcações de origem deveriam ter sido criadas por pelo comando `git fast-export` e as marcações to deveriam ter sido criadas pelo ` git fast-import` durante a importação do mesmo submódulo."
 
 #. type: Plain text
 #: en/git-fast-import.txt:139
 #, priority:100
 msgid "<name> may be any arbitrary string not containing a colon character, but the same value must be used with both options when specifying corresponding marks.  Multiple submodules may be specified with different values for <name>. It is an error not to use these options in corresponding pairs."
-msgstr ""
-"O <nome> pode ser qualquer sequência arbitrária que não contenha um "
-"caractere com dois pontos, porém o mesmo valor deve ser utilizado com as "
-"duas opções ao definir as marcações correspondentes.  Os vários submódulos "
-"podem ser definidos com valores diferentes para <nome>. É um erro não "
-"utilizar estas opções nos pares correspondentes."
+msgstr "O <nome> pode ser qualquer sequência arbitrária que não contenha um caractere com dois pontos, porém o mesmo valor deve ser utilizado com as duas opções ao definir as marcações correspondentes.  Os vários submódulos podem ser definidos com valores diferentes para <nome>. É um erro não utilizar estas opções nos pares correspondentes."
 
 #. type: Plain text
 #: en/git-fast-import.txt:144
 #, priority:100
 msgid "These options are primarily useful when converting a repository from one hash algorithm to another; without them, fast-import will fail if it encounters a submodule because it has no way of writing the object ID into the new hash algorithm."
-msgstr ""
-"Estas opções são úteis principalmente durante a conversão de um repositório "
-"através de um algoritmo hash para o outro; sem eles, a importação rápida irá "
-"falhar caso encontre um submódulo porque não há como gravar a ID do objeto "
-"no novo algoritmo hash."
+msgstr "Estas opções são úteis principalmente durante a conversão de um repositório através de um algoritmo hash para o outro; sem eles, a importação rápida irá falhar caso encontre um submódulo porque não há como gravar a ID do objeto no novo algoritmo hash."
 
 #. type: Title ~
 #: en/git-fast-import.txt:146
@@ -23207,14 +21413,7 @@ msgstr "DESEMPENHO"
 #: en/git-fast-import.txt:186
 #, priority:100
 msgid "The design of fast-import allows it to import large projects in a minimum amount of memory usage and processing time.  Assuming the frontend is able to keep up with fast-import and feed it a constant stream of data, import times for projects holding 10+ years of history and containing 100,000+ individual commits are generally completed in just 1-2 hours on quite modest (~$2,000 USD) hardware."
-msgstr ""
-"O design do `fast-import` permite a importação de grandes projetos com uma "
-"quantidade mínima do consumo da memória e do tempo de processamento.  "
-"Supondo que o front-end seja capaz de acompanhar e alimentar o `fast-import` "
-"com um fluxo constante de dados, os tempos de importação para os projetos "
-"com mais de 10+ anos de história e com mais de 100.000+ commits individuais "
-"geralmente são concluídos entre uma a duas horas com um hardware modesto (~$"
-"2.000 USD)."
+msgstr "O design do `fast-import` permite a importação de grandes projetos com uma quantidade mínima do consumo da memória e do tempo de processamento.  Supondo que o front-end seja capaz de acompanhar e alimentar o `fast-import` com um fluxo constante de dados, os tempos de importação para os projetos com mais de 10+ anos de história e com mais de 100.000+ commits individuais geralmente são concluídos entre uma a duas horas com um hardware modesto (~$2.000 USD)."
 
 #. type: Plain text
 #: en/git-fast-import.txt:192
@@ -23250,16 +21449,7 @@ msgstr "Como `git push` ou `git fetch`, as importações manipuladas pelo `fast-
 #: en/git-fast-import.txt:219
 #, priority:100
 msgid "fast-import does not lock the branch or tag refs it is actively importing.  After the import, during its ref update phase, fast-import tests each existing branch ref to verify the update will be a fast-forward update (the commit stored in the ref is contained in the new history of the commit to be written).  If the update is not a fast-forward update, fast-import will skip updating that ref and instead prints a warning message.  fast-import will always attempt to update all branch refs, and does not stop on the first failure."
-msgstr ""
-"O `fast-import` não bloqueia a ramificação ou \"tag refs\" que está sendo "
-"importando ativamente.  Após a importação, durante a sua fase de atualização "
-"do \"ref\", o `fast-import` testa cada \"ref\" em cada ramo existente para "
-"verificar se a atualização será uma atualização de avanço rápido (o commit "
-"armazenado no \"ref\" está contida no novo histórico do commit a ser gravado)"
-".  Se a atualização não for uma atualização rápida, a importação rápida "
-"pulará a atualização \"ref\" e em vez disso, imprimirá uma mensagem de "
-"aviso.  A importação rápida sempre tentará atualizar todas as ramificações "
-"refs e não para na primeira falha."
+msgstr "O `fast-import` não bloqueia a ramificação ou \"tag refs\" que está sendo importando ativamente.  Após a importação, durante a sua fase de atualização do \"ref\", o `fast-import` testa cada \"ref\" em cada ramo existente para verificar se a atualização será uma atualização de avanço rápido (o commit armazenado no \"ref\" está contida no novo histórico do commit a ser gravado).  Se a atualização não for uma atualização rápida, a importação rápida pulará a atualização \"ref\" e em vez disso, imprimirá uma mensagem de aviso.  A importação rápida sempre tentará atualizar todas as ramificações refs e não para na primeira falha."
 
 #. type: Plain text
 #: en/git-fast-import.txt:223
@@ -23277,14 +21467,7 @@ msgstr "DISCUSSÃO TÉCNICA"
 #: en/git-fast-import.txt:233
 #, priority:100
 msgid "fast-import tracks a set of branches in memory.  Any branch can be created or modified at any point during the import process by sending a `commit` command on the input stream.  This design allows a frontend program to process an unlimited number of branches simultaneously, generating commits in the order they are available from the source data.  It also simplifies the frontend programs considerably."
-msgstr ""
-"O `fast-import` monitora um conjunto de ramificações na memória.  Durante o "
-"processo de importação, qualquer ramo pode ser criado ou modificado a "
-"qualquer momento, enviando um comando `commit` no fluxo de entrada.  Este "
-"design permite que um programa front-end processe uma quantidade ilimitada "
-"de ramificações simultâneas, gerando commits na ordem em que estão "
-"disponíveis a partir dos dados da origem.  Isso também simplifica "
-"consideravelmente os programas de interface."
+msgstr "O `fast-import` monitora um conjunto de ramificações na memória.  Durante o processo de importação, qualquer ramo pode ser criado ou modificado a qualquer momento, enviando um comando `commit` no fluxo de entrada.  Este design permite que um programa front-end processe uma quantidade ilimitada de ramificações simultâneas, gerando commits na ordem em que estão disponíveis a partir dos dados da origem.  Isso também simplifica consideravelmente os programas de interface."
 
 #. type: Plain text
 #: en/git-fast-import.txt:242
@@ -23308,14 +21491,7 @@ msgstr "Com exceção dos dados brutos do arquivo (que o Git não interpreta), o
 #: en/git-fast-import.txt:258
 #, priority:100
 msgid "fast-import is very strict about its input.  Where we say SP below we mean *exactly* one space.  Likewise LF means one (and only one) linefeed and HT one (and only one) horizontal tab.  Supplying additional whitespace characters will cause unexpected results, such as branch names or file names with leading or trailing spaces in their name, or early termination of fast-import when it encounters unexpected input."
-msgstr ""
-"O `fast-import` é muito rigoroso quanto à sua entrada.  Quando dissermos SP, "
-"queremos dizer *exatamente* um espaço.  Da mesma forma, `LF` significa uma "
-"alimentação de linha (apenas uma) e `HT` uma guia horizontal (apenas uma).  "
-"O fornecimento de caracteres de espaço adicionais causará resultados "
-"inesperados, como os nomes dos ramos ou nomes dos arquivos com espaços à "
-"esquerda ou à direita em seu nome, ou o encerramento antecipado do `fast-"
-"import` quando encontrar uma entrada inesperada."
+msgstr "O `fast-import` é muito rigoroso quanto à sua entrada.  Quando dissermos SP, queremos dizer *exatamente* um espaço.  Da mesma forma, `LF` significa uma alimentação de linha (apenas uma) e `HT` uma guia horizontal (apenas uma).  O fornecimento de caracteres de espaço adicionais causará resultados inesperados, como os nomes dos ramos ou nomes dos arquivos com espaços à esquerda ou à direita em seu nome, ou o encerramento antecipado do `fast-import` quando encontrar uma entrada inesperada."
 
 #. type: Title ~
 #: en/git-fast-import.txt:260
@@ -23372,271 +21548,272 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr "Caso uma compensação local não esteja disponível no material de origem, utilize ``+0000'' ou a compensação local mais comum.  Por exemplo, muitas organizações têm um repositório CVS que só foi acessado por usuários localizados no mesmo local e fuso horário.  Nesse caso, uma compensação razoável do UTC pode ser assumida."
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
-#, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+#: en/git-fast-import.txt:298
+#, fuzzy, priority:100
+#| msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr "Diferente do formato `rfc2822`, que é muito rigoroso.  Qualquer variação na formatação fará com que o `fast-import` rejeite o valor."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr "`rfc2822`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr "Este é o formato de email padrão, conforme está descrito pela RFC 2822."
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr "Um valor de exemplo é ``Ter 6 de fevereiro 11:22:18 2007 -0500''.  O analisador do Git é preciso, porém um pouco tolerante.  É o mesmo analisador utilizado pelo 'git am' ao aplicar os patches recebidos de email."
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr "Algumas cadeias de caracteres (strings) malformadas podem ser aceitas como datas válidas.  Em alguns desses casos, o Git ainda poderá obter a data correta da cadeia de caracteres.  Também existem alguns tipos de cadeia de caracteres malformados que o Git analisará incorretamente e, no entanto, ainda assim o considerará válido.  As sequências que estiverem seriamente malformadas serão rejeitadas."
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr "Diferentemente do formato `bruto` acima, as informações de compensação do fuso horário/UTC contidas em uma sequência de datas RFC 2822, são utilizadas para ajustar o valor da data para UTC antes do armazenamento.  Portanto, é importante que essas informações sejam as mais precisas possíveis."
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr "Caso o material de origem utilize datas no formato RFC 2822, o front-end deve permitir que o `fast-import` manipule a análise a conversão (em vez de tentar fazer isso sozinho), pois o analisador do Git foi bem testado em um ambiente natural."
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr "Os front-end devem preferir o formato `raw` (bruto) caso o material de origem já utilize o formato UNIX, pode ser atrativo fornecer datas nesse formato, ou o seu formato é facilmente convertível, pois não há ambiguidade na análise."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
-msgstr ""
-"Sempre utilize a hora e o fuso horário atual.  O literal `now` sempre deve "
-"ser informado em `<quando>`."
+msgstr "Sempre utilize a hora e o fuso horário atual.  O literal `now` sempre deve ser informado em `<quando>`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr "Este é um formato de brinquedo.  A hora e o fuso horário atual deste sistema são sempre copiados para a cadeia de identidade no momento em que são criados pelo `fast-import`.  Não há como especificar um horário ou fuso horário diferente."
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
-msgstr ""
-"Esse formato em particular é informado para implementação curta e pode ser "
-"útil para um processo onde se deseja criar um novo commit imediatamente, sem "
-"a necessidade de usar um diretório ativo ou `git update-index`."
+msgstr "Esse formato em particular é informado para implementação curta e pode ser útil para um processo onde se deseja criar um novo commit imediatamente, sem a necessidade de usar um diretório ativo ou `git update-index`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr "Caso o `autor` e o `committer` sejam utilizados de forma separadas em um `commit`, os registro de data e hora podem não coincidir, pois o relógio do sistema será pesquisado duas vezes (uma vez para cada comando).  A única maneira de garantir que as informações de identidade do autor e de quem fez o commit tenham o mesmo registro de data e hora é omitir o `autor` (copiando assim do `committer`) ou usar um formato de data diferente de `now`."
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr "Comandos"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr "O fast-import aceita vários comandos para atualizar o repositório atual e controlar o processo de importação.  Discussões mais detalhadas (com exemplos) de cada comando virão depois."
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr "Cria uma nova ramificação ou atualiza uma ramificação existente, criando um novo commit e atualizando a ramificação para apontar para o commit recém criado."
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
-msgstr ""
-"Cria um objeto \"tag\" anotado a partir de um commit ou ramificação "
-"existente.  As tags `lightweight` (ou leves) não são compatíveis com este "
-"comando, pois não são recomendadas para registrar os pontos importantes de "
-"tempo."
+msgstr "Cria um objeto \"tag\" anotado a partir de um commit ou ramificação existente.  As tags `lightweight` (ou leves) não são compatíveis com este comando, pois não são recomendadas para registrar os pontos importantes de tempo."
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr "Redefina uma ramificação existente (ou uma nova ramificação) para determinada revisão.  Este comando deve ser utilizado para alterar uma ramificação para uma revisão específica sem fazer um commit nela."
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr "Converta os dados brutos do arquivo em uma bolha, para uso futuro em um comando `commit`.  Este comando é opcional, não sendo necessário para executar uma importação."
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr "Registre que uma marca se refere a um determinado objeto sem antes criar qualquer objeto novo.  O uso de --import-marks e referindo-se a marcas ausentes fará com que a importação rápida falhe de modo que os pseudônimos possam fornecer uma maneira de definir os compromissos podados de outra forma a um valor válido (por exemplo, o ancestral não podado mais próximo)."
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr "Impõem o uso de `fast-import` para fechar o arquivo de pacotes atual, gerar seu \"checksum\", seu índice SHA-1 e iniciar um novo pacote de arquivo.  Este comando é opcional, não sendo necessário para executar uma importação."
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
-msgstr ""
-"Faz com que o `fast-import` faça um eco da linha inteira para sua própria "
-"saída padrão.  Este comando é opcional, não sendo necessário para executar "
-"uma importação."
+msgstr "Faz com que o `fast-import` faça um eco da linha inteira para sua própria saída padrão.  Este comando é opcional, não sendo necessário para executar uma importação."
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr "Faz a marcação do fim do fluxo. Este comando é opcional, a menos que o recurso `done` tenha sido solicitado utilizando a opção de linha de comando` --done` ou o comando `feature done`."
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr "Faz com que o `fast-import` imprima o SHA-1 correspondente a uma marcação no descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso não tenha sido especificado."
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr "Faz com que o `fast-import` imprima uma bolha no formato 'cat-file --batch' no descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso não tenha sido especificado."
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr "Faz com que o `fast-import` imprima uma linha que descreve uma entrada do diretório no formato `ls-tree` para o descritor do arquivo definido com `--cat-blob-fd` ou `stdout` caso não tenha sido especificado."
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr "Ativa o recurso especificado. Isso requer que o `fast-import` ofereça compatibilidade ao recurso especificado, caso contrário, que seja abortado."
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr "Especifique qualquer uma das opções listadas em `OPTIONS` que não alterem a semântica do fluxo para atender às necessidades do front-end. Este comando é opcional, não sendo necessário para executar uma importação."
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr "Crie ou atualize uma ramificação com um novo commit, registrando uma alteração lógica no projeto."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -23660,261 +21837,245 @@ msgstr ""
 "\tdata\n"
 "\t('from' SP <commit-ish> LF)?\n"
 "\t('merge' SP <commit-ish> LF)*\n"
-"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | "
-"notemodify)*\n"
+"\t(filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)*\n"
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr "onde `<ref>` é o nome do ramo no qual o commit deve ser feito.  Normalmente, os nomes dos ramos são prefixados com `refs/heads/` no Git, portanto, a importação do símbolo do ramo CVS `RELENG-1_0` utilizaria `refs/heads/RELENG-1_0` como o valor de `<ref>`.  O valor de `<ref>` deve ser um \"refname\" válido no Git.  Como `LF` não é válido em um \"refname\" do Git, nenhuma sintaxe de aspas ou de escape é compatível aqui."
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr "Um comando de marcação `mark` pode aparecer opcionalmente, solicitando ao `fast-import` para salvar uma referência ao commit recém-criado para uso futuro através do front-end (veja abaixo).  É muito comum que os front-ends marquem cada commit criado, permitindo assim a criação futura de ramificações a partir de qualquer commit importado."
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr "O comando `data` após o `committer` deve suprir a mensagem do commit (veja abaixo a sintaxe do comando `data`).  Para importar uma mensagem vazia de commit, utilize os dados com 0 de comprimento.  As mensagens do commit são de livre formato e não são interpretadas pelo Git.  Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` não permite que outras codificações sejam utilizadas."
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr "Zero ou mais comandos como `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` e `notemodify` podem ser incluídos para atualizar o conteúdo do ramo antes de criar o commit.  Estes comandos podem ser utilizados em qualquer ordem.  No entanto, é recomendado que um comando `filedeleteall` preceda todos os comandos `filemodify`, `filecopy`, `filerename` e `notemodify` no mesmo commit, já que `filedeleteall` limpa a ramificação (veja abaixo)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr "O 'LF' após o comando é opcional (costumava ser obrigatório).  Observe que por razões de retrocompatibilidade, caso o commit termine com um comando `data` (ou seja, não tiver nenhum comando `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` ou `notemodify`) então dois comandos 'LF' podem aparecer no final do comando em vez de apenas um."
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr "Um comando `autor` pode opcionalmente aparecer, caso as informações do autor puderem diferir das informações de quem fez o commit.  Caso o `autor` seja omitido, então o `fast-import` usará automaticamente as informações de quem fez o commit para a parte relaiva ao autor do commit.  Veja abaixo uma descrição dos campos em `autor`, pois são idênticos aos do `committer`."
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr "O comando `committer` indica quem foi que fez o commit e quando foi feito."
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
-msgstr ""
-"Aqui `<nome>` é o nome de exibição da pessoa (``Com M Itter'' por exemplo) "
-"and `<e-mail>` é o endereço de e-mail da pessoa(``\\cm@example.com'').  `LT` "
-"e `GT` são os símbolos literais menores que (`\\x3c`) e maiores que (`\\x3e`)"
-".  Isso é necessário para delimitar o endereço de e-mail dos outros campos "
-"na linha.  Observe que `<nome>` e `<e-mail>` são de forma livre e podem "
-"conter qualquer sequência de bytes, exceto `LT`,` GT` e `LF`.  `<nome>` é "
-"codificada em UTF-8."
+msgstr "Aqui `<nome>` é o nome de exibição da pessoa (``Com M Itter'' por exemplo) and `<e-mail>` é o endereço de e-mail da pessoa(``\\cm@example.com'').  `LT` e `GT` são os símbolos literais menores que (`\\x3c`) e maiores que (`\\x3e`).  Isso é necessário para delimitar o endereço de e-mail dos outros campos na linha.  Observe que `<nome>` e `<e-mail>` são de forma livre e podem conter qualquer sequência de bytes, exceto `LT`,` GT` e `LF`.  `<nome>` é codificada em UTF-8."
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr "A hora da alteração é especificada por `<quando>` utilizando o formato de data selecionado pela opção da linha de comando `--date-format=<fmt>`.  Consulte ``Formatos de data'' acima para obter o conjunto de formatos compatíveis e a sua sintaxe."
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
-msgstr ""
-"O comando opcional `encoding` indica a codificação da mensagem do commit.  A "
-"maioria dos  commits são UTF-8 e a codificação é omitida, porém isso permite "
-"importar as mensagens dos commits para o git sem que primeiro seja "
-"necessário recodificá-las."
+msgstr "O comando opcional `encoding` indica a codificação da mensagem do commit.  A maioria dos  commits são UTF-8 e a codificação é omitida, porém isso permite importar as mensagens dos commits para o git sem que primeiro seja necessário recodificá-las."
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr "O comando `from` é utilizado para especificar o commit para inicializar esta ramificação.  Esta revisão será o primeiro ancestral do novo commit.  O estado da árvore construída neste commit começará com a condição no commit `from` e será alterado pelas alterações do conteúdo deste commit."
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr "Omitir o comando `from` no primeiro commit de uma nova ramificação fará com que o `fast-import` crie este commit sem antecessor. Isso tende a ser desejado apenas para o commit inicial de um projeto.  Caso o front-end crie todos os arquivos do zero ao criar uma nova ramificação, um comando `merge` poderá ser utilizado em vez de `from` para iniciar o commit com uma árvore vazia.  Omitir o comando `from` em ramificações existentes é geralmente desejado, pois o commit atual neste ramo é automaticamente assumido como o primeiro antecessor do novo commit."
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr "Como `LF` não é válido em uma referência de nome do Git ou em uma expressão SHA-1, nenhuma sintaxe de citação ou escape é compatível com `<commit-ish>`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr "Aqui `<commit-ish>` é qualquer um dos seguintes:"
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr "O nome de uma ramificação existente já na tabela de ramificações internas do `fast-import`.  Caso o `fast-import` não saiba o nome, ele será tratado como uma expressão SHA-1."
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr "A marcação de referência, `:<idnum>`, onde `<idnum>` seja o número da marcação."
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr "O motivo do `fast-import` utilizar `:` para indicar uma marcação de referência, este caractere não é legal com um nome do ramo do Git.  O `:` principal facilita a distinção entre a marcação 42 (`:42`) e a ramificação 42 (`42` ou `refs/heads/42`), ou um SHA-1 abreviado que passou a consistir apenas em dígitos com base 10."
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr "As marcações devem ser declaradas (através de `mark`) antes de poderem ser utilizadas."
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr "Um commit completo com 40 bytes ou um SHA-1 abreviado em hexadecimal."
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr "Qualquer expressão Git SHA-1 válido que resolva para um commit.  Consulte ``DEFININDO AS REVISÕES'' em linkgit:gitrevisions[7] para mais detalhes."
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr "O SHA-1 nulo especial (40 zeros) especifica que a ramificação deve ser removida."
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr "O caso especial de reiniciar uma importação incremental do valor atual do ramo deve ser escrito como:"
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr "\tfrom refs/heads/branch^0\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr "O sufixo `^0` é necessário, pois a importação rápida não permite que uma ramificação inicie por si mesma e a ramificação é criada na memória antes que o comando `from` seja lido pela entrada.  Adicionar o `^0` irá impor que o `fast-import` resolva o commit através da biblioteca de análise de revisão do Git, em vez de sua tabela de ramificação interna, carregando assim o valor existente do ramo."
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr "Inclui um commit ancestral adicional.  O link de ancestralidade adicional não altera a maneira como o estado da árvore é construído nesse commit.  Caso o comando `from` seja omitido durante a criação de uma nova ramificação, o primeiro commit` merge` será o primeiro ancestral do commit atual, e o ramo começará sem arquivos.  Um número ilimitado de comandos `merge` por commit é permitido pelo `fast-import`, estabelecendo assim uma mesclagem n-way."
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr "Aqui `<commit-ish>` é qualquer uma das expressões de especificação de um commit também aceitas por `from` (veja acima)."
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr "Incluído no comando `commit` para adicionar um novo arquivo ou alterar o conteúdo de um arquivo existente.  Este comando possui dois meios diferentes de especificar o conteúdo do arquivo."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr "Formato de dados externos"
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
-msgstr ""
-"O conteúdo dos dados para o arquivo já foi informado por um comando `blob` "
-"(bolha) anterior.  O front-end só precisa conectá-lo."
+msgstr "O conteúdo dos dados para o arquivo já foi informado por um comando `blob` (bolha) anterior.  O front-end só precisa conectá-lo."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr "\t'M' SP <modo> SP <dataref> SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr "Aqui geralmente `<dataref>` deve ser uma marcação de referência (`:<idnum>`) definida por um comando `blob` ou um SHA-1 completo com 40 bytes de um objeto bolha já existente no Git.  Caso o `<modo>` seja `040000`` então `<dataref>` deve ser o SHA-1 completo com 40 bytes de um objeto existente na árvore Git ou uma marcação de referência definida com `--import-marks`."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr "Formato de dados em linha"
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
-msgstr ""
-"O conteúdo dos dados para o arquivo ainda não foi informado.  O front-end "
-"deseja fornecê-lo como parte deste comando de modificação."
+msgstr "O conteúdo dos dados para o arquivo ainda não foi informado.  O front-end deseja fornecê-lo como parte deste comando de modificação."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -23924,273 +22085,259 @@ msgstr ""
 "\tdado\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr "Veja abaixo uma descrição detalhada do comando `data`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr "Nos dois formatos o `<modo>` é o tipo de entrada do arquivo em formato octal.  O Git é compatível apenas com os seguintes modos:"
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr "`100644` ou `644`: um arquivo normal (não executável).  A maioria dos arquivos na maioria dos projetos utiliza este modo.  Em caso de dúvida, é isso mesmo que deve ser utilizado."
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr "`100755` ou `755`: Um arquivo normal, porém executável."
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr "`120000`: um link simbólico, o conteúdo do arquivo será o destino do link."
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr "`160000`: Um gitlink SHA-1 do objeto referindo-se a um commit em outro repositório. Os links Git podem ser especificados apenas pelo SHA ou por meio de uma marcação do commit. Eles são utilizados para implementar os submódulos."
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr "`040000`: um subdiretório.  Os subdiretórios podem ser especificados apenas pelo SHA ou através de uma marcação de árvore definida com `--import-marks`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr "Nos dois formatos o `<caminho>` é o caminho completo do arquivo a ser adicionado (caso ainda não exista) ou modificado (caso já exista)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr "Uma cadeia de caracteres `<caminho>` deve usar separadores de diretório no estilo UNIX (barra `/`), pode conter qualquer byte que não seja `LF` e não deve começar com aspas duplas (`\"`)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr "Um caminho pode usar aspas no estilo C; é aceito em todos os casos e obrigatório caso o nome do arquivo comece com duas aspas ou tenha um `LF`. Na citação no estilo C, o nome completo deve estar entre duas aspas e qualquer caractere `LF`, barra invertida ou duas aspas deve ser escapado precedendo-os com uma barra invertida (`\"caminho/com\\n, \\\\ e \\\"nele\"` por exemplo)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr "O valor de `<caminho>` deve estar em forma canônica. Ou seja, não deve:"
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr "contém um componente de diretório vazio (`foo//bar` é inválido por exemplo),"
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr "termina com um separador de diretório (`foo/` é inválido por exemplo),"
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr "comece com um separador de diretório (`/foo` é inválido por exemplo),"
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr "tem o componente especial `.` ou `..` (`foo/./bar` e `foo/../bar` são inválidos por exemplo)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr "A raiz da árvore pode ser representada por uma cadeia de caracteres vazios como `<caminho>`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr "É recomendável que o `<caminho>` seja sempre codificado utilizando UTF-8."
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr "Incluído no comando `commit` para remover um arquivo ou excluir recursivamente um diretório inteiro do ramo.  Caso a remoção do arquivo ou diretório deixar o seu diretório de origem vazio, o diretório de origem também será automaticamente removido.  Isso faz segue na árvore até que o primeiro diretório não vazio ou até que chegue até a raiz."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr "\t'D' SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
-msgstr ""
-"aqui o '<caminho>' é o caminho completo do arquivo ou subdiretório que será "
-"removido do ramo.  Consulte `filemodify` acima para obter uma descrição mais "
-"detalhada sobre `<caminho>`."
+msgstr "aqui o '<caminho>' é o caminho completo do arquivo ou subdiretório que será removido do ramo.  Consulte `filemodify` acima para obter uma descrição mais detalhada sobre `<caminho>`."
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr "Recursivamente copie um arquivo ou subdiretório existente para um local diferente dentro do ramo.  O arquivo ou diretório existente deve existir.  Caso o destino exista, ele será completamente substituído pelo conteúdo copiado da fonte."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr "\t'C' SP <caminho> SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr "aqui o primeiro `<caminho>` é o local de origem e o segundo `<caminho>` é o destino.  Consulte `filemodify` acima para uma descrição detalhada de como pode ser o `<caminho>`.  O caminho deve ser citado para usar um caminho de origem que contenha `SP`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr "Um comando `filecopy` entra em vigor imediatamente.  Depois que o local de origem tenha sido copiado para o destino, quaisquer comandos futuros aplicados ao local de origem não afetarão o destino da cópia."
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr "Renomeia um arquivo ou subdiretório existente para um local diferente dentro do ramo.  O arquivo ou diretório existente deve existir. Caso o destino exista, ele será substituído pelo diretório de origem."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr "\t'R' SP <caminho> SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr "Um comando `filerename` entra em vigor imediatamente.  Depois que o local de origem for renomeado para o destino, quaisquer comandos futuros aplicados ao local de origem criarão novos arquivos e não afetarão o destino da renomeação."
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
-msgstr ""
-"Observe que um `filename` é o mesmo que um` filecopy` seguido de um "
-"`filedelete` do local de origem.  Há uma pequena vantagem de desempenho em "
-"usar o `filename`, mas a vantagem é tão pequena que nunca vale a pena tentar "
-"converter um par de exclusão/adição no material de origem em uma renomeação "
-"para o `fast-import`.  Este comando `filerename` é informado apenas para "
-"simplificar os front-ends que já possuam informações de renomeação e não "
-"querem se decompor em um `filecopy` seguido de um `filedelete`."
+msgstr "Observe que um `filename` é o mesmo que um` filecopy` seguido de um `filedelete` do local de origem.  Há uma pequena vantagem de desempenho em usar o `filename`, mas a vantagem é tão pequena que nunca vale a pena tentar converter um par de exclusão/adição no material de origem em uma renomeação para o `fast-import`.  Este comando `filerename` é informado apenas para simplificar os front-ends que já possuam informações de renomeação e não querem se decompor em um `filecopy` seguido de um `filedelete`."
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr "Incluído no comando `commit` para remover todos os arquivos (e também todos os diretórios) do ramo.  Este comando redefine a estrutura interna do ramo para que exista nenhum arquivo nele, permitindo que o \"front-end\" adicione posteriormente todos os arquivos interessantes do zero."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr "\t'deleteall' LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr "Este comando é extremamente útil caso o front-end não soiba (ou não quer saber) quais são os arquivos estão atualmente no ramo e, portanto, não conseguir gerar os comandos `filedelete` adequados para atualizar o conteúdo."
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr "A emissão de um arquivo ʻfiledeleteall` seguido dos comandos necessários `filemodify` para definir o conteúdo correto e produzirá os mesmos resultados que o envio apenas dos comandos necessários `filemodify` e `filedelete`.  A abordagem `filedeleteall` pode, no entanto, exigir que o `fast-import` para usar um pouco mais de memória por ramificação ativa (menos de 1 MiB para projetos ainda maiores); portanto, os front-ends que podem obter facilmente apenas aos caminhos afetados para um commit são incentivados a fazê-lo."
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr "Incluído em um comando `commit` `<notes_ref>` para adicionar uma nova nota anotando um `<commit-ish>` ou alterar este conteúdo da anotação.  Internamente, é semelhante ao arquivo modificado 100644 no caminho `<commit-ish>` (talvez dividido em subdiretórios). Não é aconselhável usar outros comandos para escrever na árvore `<notes_ref>`, exceto `filedeleteall` para excluir todas as anotações existentes nessa árvore.  Este comando possui dois meios diferentes de especificar o conteúdo da anotação."
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
-msgstr ""
-"O conteúdo dos dados para a anotação já foi informado por um comando `blob` "
-"anterior.  O front-end só precisa conectá-lo ao commit que deve ser anotado."
+msgstr "O conteúdo dos dados para a anotação já foi informado por um comando `blob` anterior.  O front-end só precisa conectá-lo ao commit que deve ser anotado."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr "\t'N' SP <dataref> SP <commit-ish> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr "Aqui `<dataref>` pode ser uma marcação de referência (`:<idnum>`) definida por um comando `blob` anterior ou um SHA-1 completo com 40 bytes de um objeto bolha existente."
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
-msgstr ""
-"O conteúdo dos dados da anotação ainda não foi informado.  O front-end "
-"deseja fornecê-lo como parte deste comando de modificação."
+msgstr "O conteúdo dos dados da anotação ainda não foi informado.  O front-end deseja fornecê-lo como parte deste comando de modificação."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -24200,75 +22347,73 @@ msgstr ""
 "\tdado\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr "Nos dois formatos, `<commit-ish>` é qualquer uma das expressões de especificação do commit também aceitos por `from` (veja acima)."
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr "Organiza `fast-import` para salvar uma referência ao objeto atual, permitindo que o front-end recupere este objeto em um momento futuro, sem conhecer o seu SHA-1.  Aqui, o objeto atual é o comando de criação do objeto no qual o comando `mark` aparece.  Pode ser `commit`, `tag` e `blob`, mas `commit` é o uso mais comum."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr "\t'mark' SP ':' <idnum> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr "onde `<idnum>` é o número atribuído pelo front-end a esta marcação.  O valor de `<idnum>` é expresso como um número ASCII decimal inteiro.  O valor 0 é reservado e não pode ser utilizado como uma marcação.  Somente os valores maiores ou iguais a 1 podem ser utilizados como marcação."
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr "As novas marcações são criadas automaticamente.  As marcações existentes podem ser movidas para um outro objeto simplesmente reutilizando o mesmo `<idnum>` em outro comando `mark`."
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr "Fornece o nome do objeto no sistema de controle de origem original.  o `fast-import` simplesmente ignorará esta diretiva, porém os processos de filtro que operam e modificam o fluxo antes de alimentar o `fast-import` podem ter usos para essas informações"
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr "\t'original-oid' SP <identificador-do-objeto> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr "onde `<identificador-do-objeto>` é qualquer cadeia de caracteres que não contenha LF."
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
-msgstr ""
-"Cria uma tag anotada referente a um commit específico.  Para criar tags "
-"`leve` (não anotadas), consulte o comando `reset` abaixo."
+msgstr "Cria uma tag anotada referente a um commit específico.  Para criar tags `leve` (não anotadas), consulte o comando `reset` abaixo."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -24286,62 +22431,55 @@ msgstr ""
 "\tdata\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr "onde `<nome>` é o nome da tag a ser criada."
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr "Os nomes das tags são prefixados automaticamente com `refs/tags/` quando armazenados no Git, portanto, a importação do símbolo do ramo CVS `RELENG-1_0-FINAL` usaria apenas `RELENG-1_0-FINAL` para `<nome>` e o `fast-import` irá escrever um `ref` correspondente como `refs/tags/RELENG-1_0-FINAL`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr "O valor de `<nome>` deve ser um `refname` válido no Git e portanto, pode conter barras.  Como `LF` não é válido em um \"refname\" do Git, nenhuma sintaxe de aspas ou de escape é compatível aqui."
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr "O comando `from` é o mesmo que no comando `commit`; veja acima para detalhes."
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr "O comando `tagger` usa o mesmo formato que `committer` dentro de `commit`; veja novamente acima para obter detalhes."
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr "O comando `data` após o `tagger` deve fornecer a mensagem anotada do tag (veja abaixo a sintaxe do comando `data`).  Para importar uma mensagem de tag vazia, utilize dados com  0 de comprimento.  As mensagens de tag são de forma livre e não são interpretados pelo Git.  Atualmente, elas devem ser codificadas em UTF-8, pois o `fast-import` não permite que outras codificações sejam utilizadas."
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
-msgstr ""
-"A assinatura de tags anotadas durante a importação com `fast-import` não é "
-"compatível.  Não é recomendável tentar incluir na sua própria assinatura PGP/"
-"GPG, pois o front-end não tem (facilmente) acesso ao conjunto completo de "
-"bytes que normalmente entra nessa assinatura.  Caso a assinatura seja "
-"necessária, crie tags `leve` a partir do `fast-import` com `reset` e crie as "
-"versões anotadas dessas tags desconectadas com o processo predefinido 'git "
-"tag'."
+msgstr "A assinatura de tags anotadas durante a importação com `fast-import` não é compatível.  Não é recomendável tentar incluir na sua própria assinatura PGP/GPG, pois o front-end não tem (facilmente) acesso ao conjunto completo de bytes que normalmente entra nessa assinatura.  Caso a assinatura seja necessária, crie tags `leve` a partir do `fast-import` com `reset` e crie as versões anotadas dessas tags desconectadas com o processo predefinido 'git tag'."
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr "Cria (ou recria) a ramificação nomeada, iniciando opcionalmente a partir de uma revisão específica.  O comando `reset permite que um front-end emita um novo comando `from` para uma ramificação existente ou crie uma nova ramificação a partir de um commit existente sem criar um novo commit."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -24353,27 +22491,25 @@ msgstr ""
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr "Para uma descrição detalhada sobre `<ref>` e `<commit-ish>` veja acima em `commit` e` from`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr "O `LF` após o comando é opcional (costumava ser necessário)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
-msgstr ""
-"O comando `reset` também pode ser utilizado para criar tags leves (não "
-"anotadas).  Por exemplo:"
+msgstr "O comando `reset` também pode ser utilizado para criar tags leves (não anotadas).  Por exemplo:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -24383,21 +22519,19 @@ msgstr ""
 "\tfrom :938\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
-msgstr ""
-"criaria a tag `leve` `refs/tags/938` se referindo a qualquer marcação do "
-"commit `:938`."
+msgstr "criaria a tag `leve` `refs/tags/938` se referindo a qualquer marcação do commit `:938`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr "Solicita a gravação de uma revisão do arquivo no pacote do arquivo.  A revisão não está conectada a nenhum commit; essa conexão deve ser formada com um comando `commit` subsequente referenciando a bolha através de uma marcação atribuída."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -24411,50 +22545,43 @@ msgstr ""
 "\tdado\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr "O comando `mark` é opcional aqui, pois alguns front-ends optaram por gerar o SHA-1 do Git para a bolha por conta própria e alimentá-la diretamente para o `commit`.  No entanto, normalmente é mais trabalhoso do que vale a pena, pois as marcas são baratas de armazenar e fáceis de usar."
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
-msgstr ""
-"Fornece os dados brutos (para uso como o conteúdo bolha/arquivo, as "
-"mensagens do commit ou as mensagens de anotação das tags) para o `fast-"
-"import`.  Os dados podem ser informados utilizando uma contagem exata de "
-"bytes ou delimitados por uma linha final.  Os front-ends reais destinados "
-"para conversões de qualidade de produção devem sempre usar o formato exato "
-"de contagem de bytes, pois são mais robustos e têm um melhor desempenho.  O "
-"formato delimitado destina-se principalmente ao teste de importação rápida."
+msgstr "Fornece os dados brutos (para uso como o conteúdo bolha/arquivo, as mensagens do commit ou as mensagens de anotação das tags) para o `fast-import`.  Os dados podem ser informados utilizando uma contagem exata de bytes ou delimitados por uma linha final.  Os front-ends reais destinados para conversões de qualidade de produção devem sempre usar o formato exato de contagem de bytes, pois são mais robustos e têm um melhor desempenho.  O formato delimitado destina-se principalmente ao teste de importação rápida."
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr "As linhas de comentário que aparecem na parte `<raw>` dos comandos `data` sempre são consideradas parte do corpo dos dados e portanto, nunca são ignoradas pelo `fast-import`.  Isso torna seguro importar qualquer conteúdo do arquivo/mensagem cujas linhas possam começar com `#`."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr "Formato exato de contagem de bytes"
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr "O front-end deve especificar a quantidade de bytes dos dados."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -24464,31 +22591,31 @@ msgstr ""
 "\t<raw> LF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr "onde `<count>` é a quantidade exato de bytes que aparece em `<raw>`.  O valor `<count>` é expressado como um número ASCII decimal inteiro.  O `LF` em ambos os lados de `<raw>` não está incluído em `<count>` e não será incluído nos dados importados."
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr "O `LF` após `<raw>` é opcional (costumava ser necessário), mas recomendado.  A inclusão sempre facilita a depuração de um fluxo do `fast-import`, pois o próximo comando sempre inicia na coluna 0 da próxima linha, ainda que `<raw>` não termine com um `LF`."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr "Formato delimitado"
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr "Uma cadeia de caracteres delimitadora é utilizada para marcar o final dos dados.  O `fast-import` calculará o comprimento pesquisando pelo delimitador.  Esse formato é útil principalmente para testes e não é recomendado para dados reais."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -24502,27 +22629,25 @@ msgstr ""
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr "onde `<delim>` é a cadeia de caracteres escolhida para a delimitação.  A cadeia de caracteres `<delim>` não deve aparecer em uma linha sozinha dentro de `<raw>`, pois o `fast-import` pensará que os dados terminam mais cedo do que realmente terminam.  O `LF` imediatamente após `<raw>` faz parte de `<raw>`.  Essa é uma das limitações do formato delimitado, é impossível fornecer um bloco de dados que não tenha um `LF` como o seu último byte."
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr "O `LF` após `<delim> LF` é opcional (costumava ser necessário)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
-msgstr ""
-"Registre que uma marcação se refere a um determinado objeto sem criar "
-"primeiro nenhum novo objeto."
+msgstr "Registre que uma marcação se refere a um determinado objeto sem criar primeiro nenhum novo objeto."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -24536,19 +22661,19 @@ msgstr ""
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr "Para uma descrição detalhada do `<commit-ish>` veja acima em `from`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr "Impõem o `fast-import` a fechar o arquivo de pacote atual, iniciar um novo e salvar todas os `refs`, tags e marcas das ramificações atuais."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -24558,31 +22683,31 @@ msgstr ""
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr "Observe que o `fast-import` alterna automaticamente os arquivos do pacote quando o arquivo do pacote atual alcance `--max-pack-size` ou 4 GiB, o que for menor.  Durante uma troca automática do pacote de arquivos `fast-import não atualiza os `refs`, tags ou marcações do ramo."
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr "Como um `checkpoint` pode exigir uma quantidade significativa de tempo de CPU e E/S de disco (para calcular a soma de verificação SHA-1 do pacote geral, gerar o arquivo do índice correspondente e atualizar as `refs`), pode levar vários minutos para um único comando `checkpoint` para concluir."
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr "Os front-end podem optar por emitir `checkpoints` durante as importações extremamente grandes e de execução demorada, ou quando precisam permitir que outro processo do Git acesse uma ramificação.  No entanto, dado que um repositório do Subversion com 30 GiB pode ser carregado no Git através do `fast-import` em cerca de 3 horas, talvez não seja necessário um `checkpoint` explícito."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr "Faz com que o `fast-import` imprima toda a linha `progress` sem modificação em seu canal de saída predefinido (descritor do arquivo 1) quando o comando é processado a partir do fluxo de entrada.  Caso contrário, o comando não tem impacto na importação atual ou em qualquer outro estado interno do `fast-import`."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -24592,67 +22717,67 @@ msgstr ""
 "\tLF?\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr "A parte `<any>` do comando pode conter qualquer sequência de bytes que não contenha um `LF`.  O `LF` após o comando é opcional.  Os chamadores podem desejar processar a saída por meio de uma ferramenta como sed para remover a parte principal da linha, por exemplo:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr "\tfrontend | git fast-import | sed 's/^progress //'\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr "A colocação de um comando `progress` imediatamente após um `checkpoint` informará ao leitor quando o `checkpoint` seja concluído e ele poderá acessar com segurança os `refs` que o `fast-import` atualizaram."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr "Faz com que o `fast-import` imprima o SHA-1 correspondente a uma marcação em `stdout` ou ao descritor de arquivo previamente organizado com o argumento `--cat-blob-fd`. Caso contrário, o comando não tem impacto na importação atual; seu objetivo é recuperar o SHA-1s que commits posteriores podem querer se referir em suas mensagens de commit."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr "\t'get-mark' SP ':' <idnum> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr "Consulte ``RESPOSTAS AOS COMANDOS'' abaixo para obter detalhes sobre como ler esta saída com segurança."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr "Faz com que o `fast-import` imprima uma bolha em um descritor do arquivo previamente organizado com o argumento `--cat-blob-fd`.  Caso contrário, o comando não tem impacto na importação atual; o seu principal objetivo é recuperar as bolhas que podem estar na memória do `fast-import`, mas não acessíveis no repositório de destino."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr "\t'cat-blob' SP <dataref> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr "O `<dataref>` pode ser uma marcação de referência (`:<idnum>`) definida anteriormente ou um SHA-1 completo com 40 bytes de uma bolha Git pré-existente ou pronto para ser gravado."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr "A saída usa o mesmo formato que `git cat-file --batch`:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -24662,309 +22787,283 @@ msgstr ""
 "\t<contents> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
-msgstr ""
-"Este comando pode ser usado onde uma diretiva `filemodify` possa aparecer, "
-"permitindo que ela seja usada no meio de um commit.  Para um `filemodify` "
-"usando uma diretiva 'inline', ele também pode aparecer logo antes da "
-"diretiva `data`."
+msgstr "Este comando pode ser usado onde uma diretiva `filemodify` possa aparecer, permitindo que ela seja usada no meio de um commit.  Para um `filemodify` usando uma diretiva 'inline', ele também pode aparecer logo antes da diretiva `data`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
-msgstr ""
-"Imprime as informações sobre o objeto em um caminho para um descritor do "
-"arquivo organizado anteriormente com a opção `--cat-blob-fd`.  Permite a "
-"impressão de uma bolha a partir do commit ativo (com `cat-blob`) ou copiando "
-"uma bolha ou árvore de um commit anterior para uso no atual (com "
-"`filemodify`)."
+msgstr "Imprime as informações sobre o objeto em um caminho para um descritor do arquivo organizado anteriormente com a opção `--cat-blob-fd`.  Permite a impressão de uma bolha a partir do commit ativo (com `cat-blob`) ou copiando uma bolha ou árvore de um commit anterior para uso no atual (com `filemodify`)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
-msgstr ""
-"O comando `ls` também pode ser usado onde uma diretiva `filemodify` possa "
-"aparecer, permitindo que ela seja usada no meio de um commit."
+msgstr "O comando `ls` também pode ser usado onde uma diretiva `filemodify` possa aparecer, permitindo que ela seja usada no meio de um commit."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr "Lendo a partir do commit ativo"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
-msgstr ""
-"Este formulário pode ser utilizado apenas no meio de um `commit`.  O caminho "
-"informa uma entrada do diretório no commit ativo do `fast-import`.  O "
-"caminho deve ser citado neste caso."
+msgstr "Este formulário pode ser utilizado apenas no meio de um `commit`.  O caminho informa uma entrada do diretório no commit ativo do `fast-import`.  O caminho deve ser citado neste caso."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr "\t'ls' SP <caminho> LF\n"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr "Lendo de uma árvore nomeada"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr "O `<dataref>` pode ser uma marcação de referência (`:<idnum>`) ou o SHA-1 completo com 40 bytes de uma tag, commit ou objeto da árvore Git pré-existente ou aguardando para ser gravado.  O caminho é relativo ao cume da árvore informada através do `<dataref>`."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr "\t'ls' SP <dataref> SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr "Consulte `filemodify` acima para uma descrição detalhada de `<caminho>`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr "A saída usa o mesmo formato que `git ls-tree <árvore> -- <caminho>`:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
-msgstr ""
-"O <dataref> representa o objeto bolha, árvore ou commit no <caminho> e pode "
-"ser utilizado posteriormente nos comandos `get-mark`, `cat-blob`, "
-"`filemodify` ou `ls`."
+msgstr "O <dataref> representa o objeto bolha, árvore ou commit no <caminho> e pode ser utilizado posteriormente nos comandos `get-mark`, `cat-blob`, `filemodify` ou `ls`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr "Caso não haja um arquivo ou subárvore nesse caminho, o `git fast-import` o reportará"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr "\tmissing SP <caminho> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr "Exija que a importação rápida ofereça suporte ao recurso especificado ou o anule."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr "\t'feature' SP <característica> ('=' <argumento>)? LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr "A parte <característica> do comando pode ser qualquer um dos seguintes:"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr "date-format"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr "export-marks"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr "relative-marks"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "no-relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "force"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr "Aja como se a opção da linha de comando coincida com um `--` inicial fosse passada na linha de comando (consulte OPÇÕES, acima)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr "import-marks"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr "import-marks-if-exists"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr "Como `--import-marks`, exceto em dois aspectos: primeiro, apenas um comando ´feature import-marks` ou `feature import-marks-if-exist` é permitido por fluxo; segundo, uma opção da linha de comando `--import-marks=` ou `--import-marks-if-existents` substitui qualquer um desses comandos \"feature\" no fluxo; terceiro, o `feature import-marks-if-exists` como uma opção da linha de comando coincidente ignora silenciosamente um arquivo inexistente."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr "get-mark"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "cat-blob"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr "ls"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
-msgstr ""
-"Exija que o o processo interno seja compatível com os comandos 'get-mark', "
-"'cat-blob' ou 'ls' respectivamente.  As versões do `fast-import` que não "
-"sejam compatíveis com o comando utilizado serão encerradas com uma "
-"mensagem.  Isso permite que o erro de importação encerre com uma mensagem "
-"clara, em vez de perder tempo na parte inicial de uma importação, antes que "
-"um comando não compatível seja detectado."
+msgstr "Exija que o o processo interno seja compatível com os comandos 'get-mark', 'cat-blob' ou 'ls' respectivamente.  As versões do `fast-import` que não sejam compatíveis com o comando utilizado serão encerradas com uma mensagem.  Isso permite que o erro de importação encerre com uma mensagem clara, em vez de perder tempo na parte inicial de uma importação, antes que um comando não compatível seja detectado."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr "notes"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
-msgstr ""
-"Exija que a estrutura seja compatível com o subcomando `notemodify` (N) com "
-"o comando `commit`.  As versões do `fast-import` que não sejam compatíveis "
-"com as anotações serão encerradas com uma mensagem."
+msgstr "Exija que a estrutura seja compatível com o subcomando `notemodify` (N) com o comando `commit`.  As versões do `fast-import` que não sejam compatíveis com as anotações serão encerradas com uma mensagem."
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr "done"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr "Indique um erro caso o fluxo termine sem um comando 'done'.  Sem este recurso, os erros que fazem com que o front-end termine abruptamente em um ponto conveniente no fluxo podem não ser detectados.  Isso pode ocorrer, por exemplo, caso um front end de importação morra no meio da operação sem emitir um `SIGTERM` ou um `SIGKILL` em sua instância subordinada do `git fast-import`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr "Processa a opção utilizada para que o `fast-import` do git se comporte de maneira que atenda às necessidades do front-end.  Observe que as opções utilizadas pelo front-end são substituídas por quaisquer opções que o usuário possa especificar para obter o próprio `fast-import`."
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr "    'option' SP <opção> LF\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr "A parte `<opção>` do comando pode conter qualquer uma das opções listadas na seção OPTIONS que não alteram a semântica de importação, sem o `--` principal e são tratadas da mesma maneira."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr "Os comandos de opção devem ser os primeiros comandos na entrada (sem contar os comandos de recurso), para fornecer um comando de opção após um erro que não seja de opção."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr "As seguintes opções de linha de comando alteram a semântica de importação e, portanto, não podem ser passadas como opção:"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr "cat-blob-fd"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr "Se o recurso `done` não estiver em uso, será tratado como se o `EOF` fosse lido.  Isso pode ser utilizado para dizer à importação rápida para terminar mais cedo."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr "Caso a opção de linha de comando `--done` ou o comando `feature done` estiver em uso, o comando `done` é obrigatório e marca o final do fluxo."
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr "RESPOSTAS AOS COMANDOS"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr "Os novos objetos gravados pelo `fast-import` que não estão disponíveis de forma imediata.  A maioria dos comandos `fast-import` não tem efeito visível até o próximo `checkpoint` (ou conclusão).  O frontend pode enviar os comandos para preencher o canal de entrada do `fast-import` sem se preocupar com a agilidade com que eles entrarão em vigor, o que melhora o desempenho ao simplificar o agendamento."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr "No entanto, para alguns front-end, é útil poder ler os dados do repositório atual à medida que estão sendo atualizados (quando o material de origem descreve objetos em termos de patches a serem aplicados a objetos importados anteriormente por exemplo).  Isso pode ser feito conectando o front-end e o `fast-import` por meio de tubos bidirecionais:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -24976,55 +23075,49 @@ msgstr ""
 "\tgit fast-import >fast-import-output\n"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
-msgstr ""
-"Um front-end configurado desta maneira pode usar os comandos `progress`, "
-"`get-mark`, `ls` e `cat-blob` para ler as informações das importações em "
-"andamento."
+msgstr "Um front-end configurado desta maneira pode usar os comandos `progress`, `get-mark`, `ls` e `cat-blob` para ler as informações das importações em andamento."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
-msgstr ""
-"Para evitar um impasse, tais front-ends devem consumir completamente "
-"quaisquer saída pendente que for gerada com `progress`, `ls`, `get-mark` e "
-"`cat-blob` antes de realizar as escritas que o `fast-import` possa bloquear."
+msgstr "Para evitar um impasse, tais front-ends devem consumir completamente quaisquer saída pendente que for gerada com `progress`, `ls`, `get-mark` e `cat-blob` antes de realizar as escritas que o `fast-import` possa bloquear."
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr "RELATÓRIOS DE CRASH"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr "Caso uma entrada inválida seja utilizada na entrada do `fast-import`, ele terminará com um status de saída diferente de zero e criará um relatório de falha no topo do repositório Git de onde estava sendo importado.  Os relatórios de falha contêm um instantâneo da condição interna do `fast-import`, bem como os comandos mais recentes que levaram à falha."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr "Todos os comandos recentes (incluindo os comentários do fluxo, alterações do arquivo e comandos de progresso) são exibidos no histórico de comandos no relatório, mas os dados brutos do arquivo e as mensagens dos commits são excluídos.  Essa exclusão economiza espaço no arquivo de relatório e reduz a quantidade de memória intermédia que a importação rápida deve realizar durante a execução."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr "Depois de escrever um relatório, o `fast-import` fechará o pacote atual e exportará a tabela de marcação.  Isso permite que o desenvolvedor front-end inspecione a condição do repositório e retome a importação a partir do ponto em que ele travou.  As ramificações e tags modificadas não são atualizados durante uma falha, pois a importação não foi concluída com êxito.  As informações do ramo e marcação podem ser encontrados no relatório da falha e devem ser aplicadas manualmente caso a atualização seja necessária."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr "Um exemplo de falha:"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -25058,7 +23151,7 @@ msgstr ""
 "\tEND_OF_INPUT\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -25070,7 +23163,7 @@ msgstr ""
 "\tfast-import: dumping crash report to .git/fast_import_crash_8434\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -25086,13 +23179,13 @@ msgstr ""
 "\t    at Sat Sep 1 00:58:12 2007\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr "\tfatal: Corrupt mode: M 777 inline bob\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -25116,13 +23209,13 @@ msgstr ""
 "\t  data <<EOF\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr "M 777 inline bob\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -25132,25 +23225,25 @@ msgstr ""
 "--------------\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr "active_branches = 1 cur, 5 max\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr "0 refs/heads/master"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -25162,7 +23255,7 @@ msgstr ""
 "refs/heads/master:\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -25180,335 +23273,307 @@ msgstr ""
 "last pack   :\n"
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr "------------------- END OF CRASH REPORT"
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr "DICAS E TRUQUES"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr "As dicas e truques a seguir foram coletadas de vários usuários do `fast-import` e são oferecidas aqui apenas como sugestões."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr "Utilize uma Marcação por Commit"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr "Ao fazer uma conversão de repositório, utilize uma marcação única por commit (`mark :<n>`) e forneça a opção `--export-marks` na linha de comando.  O `fast-import` despeja um arquivo que lista todas as marcações e o objeto Git SHA-1 que coincida com ela.  Se o front-end puder vincular as marcações ao repositório de origem, é fácil verificar a precisão e a integridade da importação comparando cada commit do Git com a revisão de origem coincidente."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr "Vindo de um sistema como o \"Perforce\" ou o \"Subversion\", isso deve ser bastante simples, pois a marcação do `fast-import` também pode ser o número do conjunto de alterações do \"Perforce\" ou o número da revisão do \"Subversion\"."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr "Ir Livremente em Torno dos Ramos"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr "Não tente otimizar o front-end para manter uma ramificação por vez durante uma importação.  Embora isso possa ser um pouco mais rápido para o `fast-import`, ele tende a aumentar consideravelmente a complexidade do código do front-end."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr "O LRU do ramo incorporado ao `fast-import` tende a se comportar muito bem e o custo de ativar uma ramo inativo é tão baixo que o movimento entre os ramos praticamente não tem impacto no desempenho da importação."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr "Manipulando Renomeações"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr "Ao importar um arquivo ou diretório renomeado, simplesmente exclua os nomes antigos e modifique os novos nomes durante o commit correspondente.  O Git executa a detecção de renomeação após o fato, em vez de explicitamente detectá-lo durante um commit."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr "Utilizando Ramificações para a Correção das Tags"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr "Alguns outros sistemas SCM permitem ao usuário criar uma tag a partir de vários arquivos que não pertencem ao mesmo commit/changeset.  Ou para criar as tags que são um subconjunto dos arquivos disponíveis no repositório."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr "A importação dessas tags como está no Git é impossível sem qe seja feito pelo menos um commit que ``corrija'' os arquivos para coincidir com o conteúdo da tag.  Utilize o comando `reset` do `fast-import` para redefinir uma ramificação fantasia fora do seu ramo normal para um commit base para a tag, depois confirme um ou mais correções dos arquivos de commits e por fim, identifique a ramificação fantasia."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
-msgstr ""
-"Uma vez que todas as ramificações normais são armazenadas em `refs/heads/`, "
-"nomeie a tag de manutenção como `TAG_FIXUP` por exemplo.  Dessa forma, é "
-"impossível que a ramificação de correção utilizada pelo importador tenha os "
-"conflitos do espaço de nomes com as ramificações reais importadas da origem ("
-"o nome `TAG_FIXUP` não é `refs/heads/TAG_FIXUP`)."
+msgstr "Uma vez que todas as ramificações normais são armazenadas em `refs/heads/`, nomeie a tag de manutenção como `TAG_FIXUP` por exemplo.  Dessa forma, é impossível que a ramificação de correção utilizada pelo importador tenha os conflitos do espaço de nomes com as ramificações reais importadas da origem (o nome `TAG_FIXUP` não é `refs/heads/TAG_FIXUP`)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr "Ao fazer os commits das correções, considere o uso de `merge` para conectar os commits para fornecer as revisões dos arquivos ao ramo de correção.  Isso permitirá que ferramentas como o 'git blame' rastreiem o histórico real do commit e anotem adequadamente os arquivos de origem."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr "Quando o `fast-import` encerrar, o front-end precisará executar o comando `rm .git/TAG_FIXUP` para remover a ramificação fantasia."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr "Importe Agora, Reembale Depois"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr "Logo que o `fast-import` conclua, o repositório Git estará completamente válido e pronto para uso.  Normalmente, o processo consome muito pouco tempo, mesmo para projetos consideravelmente grandes (com mais de 100.000 commits)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr "No entanto, é necessário reembalar o repositório para melhorar a localidade dos dados e melhorar o desempenho.  Projetos extremamente grandes pode levar horas (especialmente se `-f` e um parâmetro `--window` grande for utilizado).  Como a reembalagem é segura para ser executada ao lado de leitores e escritores, execute a re-embalagem em segundo plano e deixe acabar quando finalizar.  Não há motivo para esperar a exploração do seu novo projeto Git!"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr "Caso opte por aguardar o reembalo, não tente executar benchmarks ou testes de desempenho até que o processo termine.  o `fast-import` gera arquivos de pacotes otimizados que simplesmente nunca são vistos em situações de uso real."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr "Reempacotando Dados Históricos"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr "Se você estiver reembalando dados importados muito antigos (por exemplo, mais antigos que no ano passado), considere gastar algum tempo extra da CPU e fornecer --window = 50 (ou superior) ao executar o 'git repack'.  Isso levará mais tempo, mas também produzirá um pacote menor.  Você só precisa perder tempo uma vez e todos os usuários do seu projeto se beneficiarão do repositório menor."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr "Incluir Algumas Mensagens de Progresso"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr "Para importar rapidamente, de vez em quando o seu front-end emite uma mensagem de `progresso`.  O conteúdo das mensagens é totalmente livre, portanto, uma sugestão seria gerar a informação do mês e o ano atual cada vez que a data do commit atual passar para o próximo mês.  Os seus usuários se sentirão melhor ao saber quanto do fluxo de dados foi processado."
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr "OTIMIZAÇÃO DOS PACOTES"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr "Ao compactar uma bolha, o `fast-import` sempre tenta \"deltificar\" a última bolha gravada.  A menos que seja especificamente organizado pelo front-end, essa provavelmente não será uma versão anterior do mesmo arquivo, portanto o delta gerado não será o menor possível.  O pacote do arquivo resultante será compactado, mas não será otimizado."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr "Os front-ends que têm acesso eficiente a todas as revisões de um único arquivo (lendo um arquivo RCS/CVS, v por exemplo) podem optar por fornecer todas as revisões desse arquivo como uma sequência de comandos consecutivos do `blob` (bolha).  Isso permite que o `fast-import` \"deltifique\" as diferentes revisões dos arquivos, economizando espaço no arquivo do pacote final.  As Marcações podem ser utilizadas para posterior identificação das revisões individuais dos arquivos durante uma sequência de comandos `commit`."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
-msgstr ""
-"Os arquivos de pacotes criados pelo `fast-import` não incentivam bons "
-"padrões de acesso ao disco.  Isso é cautilizado pela gravação dos dados do "
-"`fast-import` na ordem em que são recebidos na entrada padrão, enquanto o "
-"Git normalmente organiza os dados nos pacotes dos arquivos para fazer com "
-"que os dados mais recentes (dica atual) apareçam antes dos dados "
-"históricos.  O Git também agrupa os commits acelerando o percurso de revisão "
-"através de uma melhor localidade do cache."
+msgstr "Os arquivos de pacotes criados pelo `fast-import` não incentivam bons padrões de acesso ao disco.  Isso é cautilizado pela gravação dos dados do `fast-import` na ordem em que são recebidos na entrada padrão, enquanto o Git normalmente organiza os dados nos pacotes dos arquivos para fazer com que os dados mais recentes (dica atual) apareçam antes dos dados históricos.  O Git também agrupa os commits acelerando o percurso de revisão através de uma melhor localidade do cache."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr "Por esse motivo é altamente recomendável que os usuários reembalem o repositório com o comando `git repack -a -d` após a conclusão do `fast-import`, permitindo que o Git reorganize os pacotes dos arquivos para um acesso mais rápido aos dados.  Caso os deltas da bolha estejam abaixo do ideal (veja acima), a adição da opção `-f` para impor que todos os deltas sejam recalculados podendo reduzir significativamente o tamanho final do pacote do arquivo (30-50% menor pode ser bastante comum)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
-msgstr ""
-"Em vez de executar o `git repack`, é possível também executar o `git gc "
-"--aggressive`, que também otimizará outras coisas após uma importação ("
-"refazer os pacotes refs soltos por exemplo). Como observado na seção "
-"\"AGGRESSIVE\" no linkgit:git-gc[1] a opção `--aggressive` encontrará os "
-"novos deltas com a opção `-f` para linkgit:git-repack[1]. Pelas razões "
-"descritas acima, a utilização da opção `--aggressive` após uma importação "
-"rápida, este é um dos poucos casos em que se sabe que vale a pena ser feito."
+msgstr "Em vez de executar o `git repack`, é possível também executar o `git gc --aggressive`, que também otimizará outras coisas após uma importação (refazer os pacotes refs soltos por exemplo). Como observado na seção \"AGGRESSIVE\" no linkgit:git-gc[1] a opção `--aggressive` encontrará os novos deltas com a opção `-f` para linkgit:git-repack[1]. Pelas razões descritas acima, a utilização da opção `--aggressive` após uma importação rápida, este é um dos poucos casos em que se sabe que vale a pena ser feito."
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr "UTILIZAÇÃO DE MEMÓRIA"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr "Há uma quantidade de fatores que afetam a quantidade de memória consumida pelo `fast-import`  durante a execução de uma importação.  Como as seções críticas do Git principal, o `fast-import` usa os seus próprios alocadores de memória para amortizar o consumo geral associadas ao \"malloc\".  Na prática, o `fast-import` tende a amortizar o consumo geral do malloc para 0, devido ao uso de grandes alocações dos blocos."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr "por objeto"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr "O `fast-import` mantém uma estrutura na memória para todos os objetos gravados nesta execução.  Em um sistema de 32 bits a estrutura é de 32 bytes; em um sistema de 64 bits a estrutura é de 40 bytes (devido aos tamanhos maiores do ponteiro).  Os objetos na tabela não são desalocados até que o `fast-import` termine.  A importação de 2 milhões de objetos em um sistema de 32 bits exigirá aproximadamente 64 MiB de memória."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
-msgstr ""
-"A tabela de objetos é na verdade uma \"hashtable\" (tabela hash) codificada "
-"no nome do objeto com o SHA-1.  Essa configuração de armazenamento permite "
-"que o `fast-import` reutilize um objeto existente ou já gravado e evite "
-"gravar duplicatas no saída do arquivo de pacote.  Em uma importação, as "
-"bolhas duplicadas são muito comuns, geralmente devido a mesclagem do ramo na "
-"origem."
+msgstr "A tabela de objetos é na verdade uma \"hashtable\" (tabela hash) codificada no nome do objeto com o SHA-1.  Essa configuração de armazenamento permite que o `fast-import` reutilize um objeto existente ou já gravado e evite gravar duplicatas no saída do arquivo de pacote.  Em uma importação, as bolhas duplicadas são muito comuns, geralmente devido a mesclagem do ramo na origem."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr "por marcação"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr "As marcações são armazenadas em uma origem esparsa, utilizando 1 ponteiro (4 bytes ou 8 bytes, dependendo do tamanho do ponteiro) por marcação.  Embora a origem seja escassa, os front-end ainda são fortemente incentivados a usar marcas entre 1 e n, onde n é a quantidade total de marcações necessárias para essa importação."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr "por ramo"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr "Os ramos são classificados como ativos e inativos.  O uso de memória das duas classes é significativamente diferente."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr "As ramificações inativas são armazenadas em uma estrutura que usa entre 96 ou 120 bytes (sistemas de 32 ou 64 bits, respectivamente), mais o comprimento do nome do ramo (normalmente com menos de 200 bytes), por ramificação.  O `fast-import` processa facilmente até 10.000 ramificações inativas com menos de 2 MiB de memória."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr "As ramificações ativas têm a mesma sobrecarga das ramificações inativas, mas também contêm as cópias de todas as árvores que foram modificadas recentemente nesta ramificação.  Se a subárvore `include` não tenha sido modificada, desde o momento que a ramificação se tornou ativa, o seu conteúdo não será carregado na memória, mas o seu conteúdo será carregado na memória caso a subárvore `src` tenha sido modificada por um commit."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
-msgstr ""
-"À medida que as ramificações ativas armazenam metadados sobre os arquivos "
-"existentes nessa ramificação, o tamanho do armazenamento na memória pode "
-"aumentar consideravelmente (veja abaixo)."
+msgstr "À medida que as ramificações ativas armazenam metadados sobre os arquivos existentes nessa ramificação, o tamanho do armazenamento na memória pode aumentar consideravelmente (veja abaixo)."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr "Com base num algoritmo simples, o `fast-import` move automaticamente as ramificações ativas para a condição inativa utilizando um algorítimo simples.  A cadeia LRU é atualizada a cada comando `commit`.  A quantidade máxima de ramificações ativas pode se aumentado ou diminuído na linha de comando com a opção `--active-branches=`."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr "por árvore ativa"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr "As árvores (também conhecidas como diretórios) usam apenas 12 bytes de memória no topo da memória necessária para as suas entradas (consulte ``por arquivo ativo'' abaixo).  O custo de uma árvore é praticamente 0, pois sua sobrecarga é amortizada pelas entradas de arquivo individuais."
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr "por entrada de arquivo ativa"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr "Os arquivos (e os ponteiros para as subárvores) nas árvores ativas requerem 52 ou 64 bytes (plataformas de 32/64 bits) por entrada.  Para economizar espaço, os nomes dos arquivos e as árvores são agrupados em uma tabela de cadeias comuns, permitindo que o nome do arquivo ``Makefile'' utilize apenas 16 bytes (depois de incluir a sobrecarga do cabeçalho da cadeia), não importa quantas vezes isso ocorra no projeto."
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr "O LRU do ramo ativo, quando associado ao conjunto da cadeia de caracteres do nome do arquivo e ao carregamento lento das subárvores, permite que a eficiência da importação rápida dos projetos com mais de 2.000 ramificações e mais de 45.114 arquivos em um espaço de memória muito limitado (menos de 2,7 MiB por ramo ativo)."
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr "SINAIS"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr "Enviar um *SIGUSR1* para o processo 'git fast-import' encerra antes o arquivo do pacote atual, simulando um comando `checkpoint`.  O operador mais impaciente pode usar esse recurso para espiar os objetos e as referências de uma importação em andamento, ao custo de um tempo de execução adicional e de uma pior compactação."
@@ -25731,12 +23796,7 @@ msgstr ""
 #: en/git-fetch.txt:24
 #, priority:220
 msgid "Fetch branches and/or tags (collectively, \"refs\") from one or more other repositories, along with the objects necessary to complete their histories.  Remote-tracking branches are updated (see the description of <refspec> below for ways to control this behavior)."
-msgstr ""
-"Busque as ramificações ou as tags (coletivamente, refs) de um ou mais "
-"repositórios, juntamente com os objetos necessários para completar seus "
-"históricos.  As ramificações de rastreamento remoto são atualizadas ("
-"consulte a descrição de `<refspec>` abaixo para conhecer maneiras de "
-"controlar esse comportamento)."
+msgstr "Busque as ramificações ou as tags (coletivamente, refs) de um ou mais repositórios, juntamente com os objetos necessários para completar seus históricos.  As ramificações de rastreamento remoto são atualizadas (consulte a descrição de `<refspec>` abaixo para conhecer maneiras de controlar esse comportamento)."
 
 #. type: Plain text
 #: en/git-fetch.txt:32
@@ -25748,11 +23808,7 @@ msgstr "É predefinido que qualquer tag que aponte para os históricos que estã
 #: en/git-fetch.txt:37
 #, priority:220
 msgid "'git fetch' can fetch from either a single named repository or URL, or from several repositories at once if <group> is given and there is a remotes.<group> entry in the configuration file.  (See linkgit:git-config[1])."
-msgstr ""
-"O 'git fetch' pode capturar em um único repositório ou em uma determinada "
-"URL assim como em vários repositórios de uma vez caso `<grupo>` seja "
-"utilizado e exista um entrada `remotes.<grupo>` no arquivo de configuração.  "
-"(Consulte linkgit:git-config[1])."
+msgstr "O 'git fetch' pode capturar em um único repositório ou em uma determinada URL assim como em vários repositórios de uma vez caso `<grupo>` seja utilizado e exista um entrada `remotes.<grupo>` no arquivo de configuração.  (Consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-fetch.txt:40
@@ -25872,12 +23928,7 @@ msgstr "Para remover as referências como parte do seu fluxo de trabalho normal
 #: en/git-fetch.txt:135
 #, priority:220
 msgid "Here's where things get tricky and more specific. The pruning feature doesn't actually care about branches, instead it'll prune local <-> remote-references as a function of the refspec of the remote (see `<refspec>` and <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> above)."
-msgstr ""
-"Aqui é onde as coisas ficam complicadas e bem específicas. O recurso de "
-"remoção não se importa muito com as ramificações; em vez disso, remove as "
-"referências locais <-> remotas como uma função do `refspec` remoto (consulte "
-"`<refspec>` e <<CONFIGURAÇÕES DOS RAMOS MONITORADOS REMOTAMENTE, CRTB>> "
-"acima)."
+msgstr "Aqui é onde as coisas ficam complicadas e bem específicas. O recurso de remoção não se importa muito com as ramificações; em vez disso, remove as referências locais <-> remotas como uma função do `refspec` remoto (consulte `<refspec>` e <<CONFIGURAÇÕES DOS RAMOS MONITORADOS REMOTAMENTE, CRTB>> acima)."
 
 #. type: Plain text
 #: en/git-fetch.txt:141
@@ -25889,11 +23940,7 @@ msgstr "Portanto, caso o `refspec` remoto inclua `refs/tags/*:refs/tags/*` por e
 #: en/git-fetch.txt:146
 #, priority:220
 msgid "This might not be what you expect, i.e. you want to prune remote `<name>`, but also explicitly fetch tags from it, so when you fetch from it you delete all your local tags, most of which may not have come from the `<name>` remote in the first place."
-msgstr ""
-"Senão for o que você deseja, caso queira remover remotamente o `<nome>` por "
-"exemplo e também capturar explicitamente as tags a partir dele; "
-"primeiramente, ao recolher dele você exclui todas as tags locais, a maioria "
-"das quais podem não terem vindo do `<nome>` remoto."
+msgstr "Senão for o que você deseja, caso queira remover remotamente o `<nome>` por exemplo e também capturar explicitamente as tags a partir dele; primeiramente, ao recolher dele você exclui todas as tags locais, a maioria das quais podem não terem vindo do `<nome>` remoto."
 
 #. type: Plain text
 #: en/git-fetch.txt:150
@@ -25905,13 +23952,7 @@ msgstr "Assim, tenha cuidado ao utilizar isso com um `refspec` como `refs/tags/*
 #: en/git-fetch.txt:157
 #, priority:220
 msgid "Since keeping up-to-date with both branches and tags on the remote is a common use-case the `--prune-tags` option can be supplied along with `--prune` to prune local tags that don't exist on the remote, and force-update those tags that differ. Tag pruning can also be enabled with `fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-config[1]."
-msgstr ""
-"Como manter-se atualizado com as ramificações e as tags remotamente é um "
-"caso de uso comum, a opção `--prune-tags` pode ser utilizada junto com o "
-"`--prune` para remover as tags locais que não existam no ponto remoto e "
-"impor a atualização dessas tags que estiverem diferentes. A remoção de tags "
-"também podem ser ativadas com `fetch.pruneTags` ou `remote.<nome>.pruneTags` "
-"nas configurações. Consulte linkgit:git-config[1]."
+msgstr "Como manter-se atualizado com as ramificações e as tags remotamente é um caso de uso comum, a opção `--prune-tags` pode ser utilizada junto com o `--prune` para remover as tags locais que não existam no ponto remoto e impor a atualização dessas tags que estiverem diferentes. A remoção de tags também podem ser ativadas com `fetch.pruneTags` ou `remote.<nome>.pruneTags` nas configurações. Consulte linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-fetch.txt:161
@@ -26153,11 +24194,7 @@ msgstr "$ git fetch origin\n"
 #: en/git-fetch.txt:254
 #, priority:220
 msgid "The above command copies all branches from the remote refs/heads/ namespace and stores them to the local refs/remotes/origin/ namespace, unless the branch.<name>.fetch option is used to specify a non-default refspec."
-msgstr ""
-"O comando acima copia todas as ramificações do `refs/heads/` do espaço de "
-"nomes remoto e as armazena em `refs/remotes/origin/` com um espaço de nomes "
-"local, a menos que a opção `branch.<nome>.fetch` seja utilizada para definir "
-"um `refspec` fora do que já vem predefinido."
+msgstr "O comando acima copia todas as ramificações do `refs/heads/` do espaço de nomes remoto e as armazena em `refs/remotes/origin/` com um espaço de nomes local, a menos que a opção `branch.<nome>.fetch` seja utilizada para definir um `refspec` fora do que já vem predefinido."
 
 #. type: Plain text
 #: en/git-fetch.txt:256
@@ -26167,23 +24204,24 @@ msgstr "Utilizando `refspecs` de forma explicita:"
 
 #. type: delimited block -
 #: en/git-fetch.txt:259
-#, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+#, fuzzy, no-wrap, priority:220
+#| msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr "$ git fetch origin +pu:pu maint:tmp\n"
 
 #. type: Plain text
 #: en/git-fetch.txt:264
-#, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+#, fuzzy, priority:220
+#| msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr "Faz a atualização (ou cria, conforme seja necessário) as ramificações `pu` e` tmp` no repositório local, capturando as ramificações (respectivamente) `pu` e` maint` no repositório remoto."
 
 #. type: Plain text
 #: en/git-fetch.txt:267
-#, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
-msgstr ""
-"O ramo `pu` será atualizado ainda que não faça um avanço rápido, porque é "
-"prefixado com um sinal de mais; já o `tmp` não será."
+#, fuzzy, priority:220
+#| msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgstr "O ramo `pu` será atualizado ainda que não faça um avanço rápido, porque é prefixado com um sinal de mais; já o `tmp` não será."
 
 #. type: Plain text
 #: en/git-fetch.txt:270
@@ -26211,13 +24249,7 @@ msgstr "O primeiro comando captura a ramificação `maint` do repositório em `g
 #: en/git-fetch.txt:292 en/git-pull.txt:248
 #, priority:220
 msgid "Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself cannot be fetched, making it impossible to check out that submodule later without having to do a fetch again. This is expected to be fixed in a future Git version."
-msgstr ""
-"Com a opção `--recurse-submodules` só pode buscar novos commits nos "
-"submódulos que já foram averiguados no momento. Quando, por exemplo, a "
-"\"upstream\" adicionou um novo submódulo nos commits recém-buscados do "
-"superprojeto, o submódulo em si não pode ser buscado, tornando impossível "
-"verificar o submódulo sendo necessário fazer uma nova busca mais tarde. "
-"Espera-se que isso seja corrigido em uma versão futura do Git."
+msgstr "Com a opção `--recurse-submodules` só pode buscar novos commits nos submódulos que já foram averiguados no momento. Quando, por exemplo, a \"upstream\" adicionou um novo submódulo nos commits recém-buscados do superprojeto, o submódulo em si não pode ser buscado, tornando impossível verificar o submódulo sendo necessário fazer uma nova busca mais tarde. Espera-se que isso seja corrigido em uma versão futura do Git."
 
 #. type: Title =
 #: en/git-filter-branch.txt:2
@@ -26267,26 +24299,13 @@ msgstr "O 'git filter-branch' possui uma infinidade de armadilhas que podem prod
 #: en/git-filter-branch.txt:40
 #, priority:100
 msgid "Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision.  Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit.  Otherwise, all information (including original commit times or merge information) will be preserved."
-msgstr ""
-"Permite reescrever o histórico de revisões do Git, reescrevendo as "
-"ramificações mencionadas em `<opções da rev-list>` aplicando os filtros "
-"personalizados em cada revisão.  Esses filtros podem modificar cada árvore ("
-"por exemplo, remover um arquivo ou executar uma reescrita perl em todos os "
-"arquivos) ou informações sobre cada commit.  Caso contrário, todas as "
-"informações (incluindo a quantidade de commits originais ou as informações "
-"de mesclagem) serão preservadas."
+msgstr "Permite reescrever o histórico de revisões do Git, reescrevendo as ramificações mencionadas em `<opções da rev-list>` aplicando os filtros personalizados em cada revisão.  Esses filtros podem modificar cada árvore (por exemplo, remover um arquivo ou executar uma reescrita perl em todos os arquivos) ou informações sobre cada commit.  Caso contrário, todas as informações (incluindo a quantidade de commits originais ou as informações de mesclagem) serão preservadas."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:47
 #, priority:100
 msgid "The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten).  If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect.  Nevertheless, this may be useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted."
-msgstr ""
-"O comando reescreverá apenas as \"refs _positivas_ mencionados na linha de "
-"comando (caso passer 'a..b', apenas 'b' será reescrito por exemplo).  Caso "
-"você não defina nenhum filtro, os commits serão refeitos sem qualquer "
-"alteração, o que normalmente não teria nenhum efeito.  No entanto, isso pode "
-"ser útil no futuro para compensar alguns bugs do Git ou algo assim, "
-"portanto, este uso é permitido."
+msgstr "O comando reescreverá apenas as \"refs _positivas_ mencionados na linha de comando (caso passer 'a..b', apenas 'b' será reescrito por exemplo).  Caso você não defina nenhum filtro, os commits serão refeitos sem qualquer alteração, o que normalmente não teria nenhum efeito.  No entanto, isso pode ser útil no futuro para compensar alguns bugs do Git ou algo assim, portanto, este uso é permitido."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:52
@@ -26328,10 +24347,7 @@ msgstr ""
 #: en/git-filter-branch.txt:65
 #, priority:100
 msgid "Always verify that the rewritten version is correct: The original refs, if different from the rewritten ones, will be stored in the namespace 'refs/original/'."
-msgstr ""
-"Sempre verifique se a versão reescrita está correta: As refs originais, caso "
-"sejam diferentes das que foram reescritas, serão armazenadas no espaço de "
-"nomes `refs/original/`."
+msgstr "Sempre verifique se a versão reescrita está correta: As refs originais, caso sejam diferentes das que foram reescritas, serão armazenadas no espaço de nomes `refs/original/`."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:69
@@ -26349,17 +24365,7 @@ msgstr "Filtros"
 #: en/git-filter-branch.txt:84
 #, priority:100
 msgid "The filters are applied in the order as listed below.  The <command> argument is always evaluated in the shell context using the 'eval' command (with the notable exception of the commit filter, for technical reasons).  Prior to that, the `$GIT_COMMIT` environment variable will be set to contain the id of the commit being rewritten.  Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, and GIT_COMMITTER_DATE are taken from the current commit and exported to the environment, in order to affect the author and committer identities of the replacement commit created by linkgit:git-commit-tree[1] after the filters have run."
-msgstr ""
-"Os filtros são aplicados na ordem listada abaixo.  O argumento <comando> é "
-"sempre avaliado no shell utilizando o comando 'eval' como contexto (exceto o "
-"filtro do commit, devido a uma mera tecnicalidade).  Antes disso, a variável "
-"do ambiente `$GIT_COMMIT` será configurada para conter o ID do commit que "
-"está sendo reescrito.  Além disso as variáveis `GIT_AUTHOR_NAME`, "
-"`GIT_AUTHOR_EMAIL`, `GIT_AUTHOR_DATE`, `GIT_COMMITTER_NAME`, "
-"`GIT_COMMITTER_EMAIL` e `GIT_COMMITTER_DATE` são retirados do commit atual e "
-"exportados para o ambiente, a fim de afetar as identidades autor e de quem "
-"fez o commit do commit que está sendo criado por linkgit:git-commit-tree[1] "
-"após a execução dos filtros."
+msgstr "Os filtros são aplicados na ordem listada abaixo.  O argumento <comando> é sempre avaliado no shell utilizando o comando 'eval' como contexto (exceto o filtro do commit, devido a uma mera tecnicalidade).  Antes disso, a variável do ambiente `$GIT_COMMIT` será configurada para conter o ID do commit que está sendo reescrito.  Além disso as variáveis `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL`, `GIT_AUTHOR_DATE`, `GIT_COMMITTER_NAME`, `GIT_COMMITTER_EMAIL` e `GIT_COMMITTER_DATE` são retirados do commit atual e exportados para o ambiente, a fim de afetar as identidades autor e de quem fez o commit do commit que está sendo criado por linkgit:git-commit-tree[1] após a execução dos filtros."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:87
@@ -26455,10 +24461,7 @@ msgstr "--msg-filter <comando>"
 #: en/git-filter-branch.txt:144
 #, priority:100
 msgid "This is the filter for rewriting the commit messages.  The argument is evaluated in the shell with the original commit message on standard input; its standard output is used as the new commit message."
-msgstr ""
-"Este filtro serve para reescrever as mensagens dos commits.  O argumento é "
-"avaliado no shell com a mensagem original do commit em sua entrada padrão; "
-"já a sua saída padrão é utilizada como uma nova mensagem do commit."
+msgstr "Este filtro serve para reescrever as mensagens dos commits.  O argumento é avaliado no shell com a mensagem original do commit em sua entrada padrão; já a sua saída padrão é utilizada como uma nova mensagem do commit."
 
 #. type: Labeled list
 #: en/git-filter-branch.txt:145
@@ -26500,12 +24503,7 @@ msgstr "--tag-name-filter <comando>"
 #: en/git-filter-branch.txt:171
 #, priority:100
 msgid "This is the filter for rewriting tag names. When passed, it will be called for every tag ref that points to a rewritten object (or to a tag object which points to a rewritten object).  The original tag name is passed via standard input, and the new tag name is expected on standard output."
-msgstr ""
-"Este filtro serve para reescrever os nomes das tags. Quando aprovada, será "
-"chamada para cada tag de referência que aponte para um objeto reescrito (ou "
-"para um objeto tag que aponte para um objeto reescrito).  O nome da tag "
-"original é passado através da entrada padrão e seu novo nome é esperado na "
-"saída padrão."
+msgstr "Este filtro serve para reescrever os nomes das tags. Quando aprovada, será chamada para cada tag de referência que aponte para um objeto reescrito (ou para um objeto tag que aponte para um objeto reescrito).  O nome da tag original é passado através da entrada padrão e seu novo nome é esperado na saída padrão."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:176
@@ -26517,18 +24515,7 @@ msgstr "As tags originais não são excluídas, mas podem ser substituídas; uti
 #: en/git-filter-branch.txt:187
 #, priority:100
 msgid "Nearly proper rewriting of tag objects is supported. If the tag has a message attached, a new tag object will be created with the same message, author, and timestamp. If the tag has a signature attached, the signature will be stripped. It is by definition impossible to preserve signatures. The reason this is \"nearly\" proper, is because ideally if the tag did not change (points to the same object, has the same name, etc.)  it should retain any signature. That is not the case, signatures will always be removed, buyer beware. There is also no support for changing the author or timestamp (or the tag message for that matter). Tags which point to other tags will be rewritten to point to the underlying commit."
-msgstr ""
-"A reescrita quase apropriada dos objetos tag são suportados. Caso a tag "
-"tenha uma mensagem anexada, um novo objeto tag será criado com a mesma "
-"mensagem, autor e registro de data e hora. Caso a tag tenha uma assinatura "
-"anexada, a assinatura será removida. Devido a predefinição retorna para "
-"impossível preservar as assinaturas. O motivo do \"quase\" apropriado, "
-"significa que idealmente caso uma tag não mude (aponta para o mesmo objeto, "
-"tem o mesmo nome etc.), ela deve manter qualquer assinatura. Não é este o "
-"caso, as assinaturas sempre serão removidas, portanto cuidado. Também não há "
-"compatibilidade para alterar o autor ou o registro de data e hora (ou a "
-"mensagem da tag). As tags que apontem para as outras tags, serão reescritas "
-"para apontar para o commit subjacente."
+msgstr "A reescrita quase apropriada dos objetos tag são suportados. Caso a tag tenha uma mensagem anexada, um novo objeto tag será criado com a mesma mensagem, autor e registro de data e hora. Caso a tag tenha uma assinatura anexada, a assinatura será removida. Devido a predefinição retorna para impossível preservar as assinaturas. O motivo do \"quase\" apropriado, significa que idealmente caso uma tag não mude (aponta para o mesmo objeto, tem o mesmo nome etc.), ela deve manter qualquer assinatura. Não é este o caso, as assinaturas sempre serão removidas, portanto cuidado. Também não há compatibilidade para alterar o autor ou o registro de data e hora (ou a mensagem da tag). As tags que apontem para as outras tags, serão reescritas para apontar para o commit subjacente."
 
 #. type: Labeled list
 #: en/git-filter-branch.txt:188
@@ -26552,9 +24539,7 @@ msgstr "--original <espaço-de-nomes>"
 #: en/git-filter-branch.txt:199
 #, priority:100
 msgid "Use this option to set the namespace where the original commits will be stored. The default value is 'refs/original'."
-msgstr ""
-"Utilize esta opção para definir o espaço de nomes onde os commits originais "
-"serão armazenados. O valor predefinido é 'refs/original'."
+msgstr "Utilize esta opção para definir o espaço de nomes onde os commits originais serão armazenados. O valor predefinido é 'refs/original'."
 
 #. type: Labeled list
 #: en/git-filter-branch.txt:200
@@ -26566,13 +24551,7 @@ msgstr "-d <diretório>"
 #: en/git-filter-branch.txt:207
 #, priority:100
 msgid "Use this option to set the path to the temporary directory used for rewriting.  When applying a tree filter, the command needs to temporarily check out the tree to some directory, which may consume considerable space in case of large projects.  By default it does this in the `.git-rewrite/` directory but you can override that choice by this parameter."
-msgstr ""
-"Use esta opção para definir o caminho para o diretório temporário usado para "
-"a reescrita.  Ao aplicar um filtro na árvore, o comando precisa fazer a "
-"averiguação da árvore em algum diretório, o que pode consumir um espaço "
-"considerável no caso dos grandes projetos.  É predefinido que ele faça isso "
-"no diretório `.git-rewrite/`, porém é possível substituir esta opção por "
-"este parâmetro."
+msgstr "Use esta opção para definir o caminho para o diretório temporário usado para a reescrita.  Ao aplicar um filtro na árvore, o comando precisa fazer a averiguação da árvore em algum diretório, o que pode consumir um espaço considerável no caso dos grandes projetos.  É predefinido que ele faça isso no diretório `.git-rewrite/`, porém é possível substituir esta opção por este parâmetro."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:213
@@ -26820,10 +24799,7 @@ msgstr ""
 #: en/git-filter-branch.txt:358
 #, priority:100
 msgid "If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command:"
-msgstr ""
-"Caso precise adicionar as linhas 'Acked-by' (Reinformado por) aos últimos 10 "
-"commits por exemplo (nenhum dos quais seja uma mesclagem), utilize este "
-"comando:"
+msgstr "Caso precise adicionar as linhas 'Acked-by' (Reinformado por) aos últimos 10 commits por exemplo (nenhum dos quais seja uma mesclagem), utilize este comando:"
 
 #. type: delimited block -
 #: en/git-filter-branch.txt:364
@@ -27009,134 +24985,67 @@ msgstr "O lixo é coletado de todos os objetos sem referências utilizando o com
 #: en/git-filter-branch.txt:467
 #, priority:100
 msgid "The performance of git-filter-branch is glacially slow; its design makes it impossible for a backward-compatible implementation to ever be fast:"
-msgstr ""
-"O desempenho do ramo do 'git-filter-branch' é bem lento; o seu design torna "
-"impossível a implementação de retrocompatibilidade rápida com versões "
-"anteriores:"
+msgstr "O desempenho do ramo do 'git-filter-branch' é bem lento; o seu design torna impossível a implementação de retrocompatibilidade rápida com versões anteriores:"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:473
 #, priority:100
 msgid "In editing files, git-filter-branch by design checks out each and every commit as it existed in the original repo.  If your repo has `10^5` files and `10^5` commits, but each commit only modifies five files, then git-filter-branch will make you do `10^10` modifications, despite only having (at most) `5*10^5` unique blobs."
-msgstr ""
-"Na edição dos arquivos, o `git-filter-branch` por design faz a averiguação "
-"de todos os commits conforme existiam no repositório original.  Caso o seu "
-"repositório tenha `10^5` arquivos e `10^5` commits, porém cada commit altere "
-"apenas cinco arquivos, o `git-filter-branch` fará com que você faça `10^10` "
-"alterações, apesar de ter apenas (no máximo) `5*10^5` bolhas únicas."
+msgstr "Na edição dos arquivos, o `git-filter-branch` por design faz a averiguação de todos os commits conforme existiam no repositório original.  Caso o seu repositório tenha `10^5` arquivos e `10^5` commits, porém cada commit altere apenas cinco arquivos, o `git-filter-branch` fará com que você faça `10^10` alterações, apesar de ter apenas (no máximo) `5*10^5` bolhas únicas."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:476
 #, priority:100
 msgid "If you try and cheat and try to make git-filter-branch only work on files modified in a commit, then two things happen"
-msgstr ""
-"Caso tente trapacear e tente fazer com que o 'git-filter-branch' funcione "
-"apenas nos arquivos modificados de um commit, ocorrerão duas coisas"
+msgstr "Caso tente trapacear e tente fazer com que o 'git-filter-branch' funcione apenas nos arquivos modificados de um commit, ocorrerão duas coisas"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:482
 #, priority:100
 msgid "you run into problems with deletions whenever the user is simply trying to rename files (because attempting to delete files that don't exist looks like a no-op; it takes some chicanery to remap deletes across file renames when the renames happen via arbitrary user-provided shell)"
-msgstr ""
-"você enfrenta problemas com exclusões sempre que o usuário está simplesmente "
-"tentando renomear os arquivos (porque tentar excluir os que não existem "
-"parece um no-op; é preciso alguma trapaça para remapear as exclusões entre "
-"as renomeações dos arquivos quando as renomeações acontecem por meio de "
-"usuários com o seu próprio shell)"
+msgstr "você enfrenta problemas com exclusões sempre que o usuário está simplesmente tentando renomear os arquivos (porque tentar excluir os que não existem parece um no-op; é preciso alguma trapaça para remapear as exclusões entre as renomeações dos arquivos quando as renomeações acontecem por meio de usuários com o seu próprio shell)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:488
 #, priority:100
 msgid "even if you succeed at the map-deletes-for-renames chicanery, you still technically violate backward compatibility because users are allowed to filter files in ways that depend upon topology of commits instead of filtering solely based on file contents or names (though this has not been observed in the wild)."
-msgstr ""
-"mesmo caso consiga excluir a zombaria do 'map-deletes-for-renames' ("
-"renomeações para mapas excluídos), ainda assim violará tecnicamente a "
-"compatibilidade com as versões anteriores, porque os usuários podem filtrar "
-"os arquivos de maneiras que dependem da topologia dos commits, em vez de "
-"filtrar apenas com base no conteúdo ou nos nomes dos arquivos (embora isso "
-"não tenha sido observado ainda)."
+msgstr "mesmo caso consiga excluir a zombaria do 'map-deletes-for-renames' (renomeações para mapas excluídos), ainda assim violará tecnicamente a compatibilidade com as versões anteriores, porque os usuários podem filtrar os arquivos de maneiras que dependem da topologia dos commits, em vez de filtrar apenas com base no conteúdo ou nos nomes dos arquivos (embora isso não tenha sido observado ainda)."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:495
 #, priority:100
 msgid "Even if you don't need to edit files but only want to e.g. rename or remove some and thus can avoid checking out each file (i.e. you can use --index-filter), you still are passing shell snippets for your filters.  This means that for every commit, you have to have a prepared git repo where those filters can be run.  That's a significant setup."
-msgstr ""
-"Mesmo que você não precise editar os arquivos, porém apenas queira, por "
-"exemplo, renomear ou remover alguns e assim, evitar a averiguação de cada "
-"arquivo (como por exemplo, você pode utilizar a opção `--index-filter`), "
-"você ainda está passando trechos do shell para os seus filtros.  Isso "
-"significa que, para cada commit, é necessário ter um repositório git "
-"preparado onde estes filtros possam ser executados.  Esta é uma configuração "
-"significativa."
+msgstr "Mesmo que você não precise editar os arquivos, porém apenas queira, por exemplo, renomear ou remover alguns e assim, evitar a averiguação de cada arquivo (como por exemplo, você pode utilizar a opção `--index-filter`), você ainda está passando trechos do shell para os seus filtros.  Isso significa que, para cada commit, é necessário ter um repositório git preparado onde estes filtros possam ser executados.  Esta é uma configuração significativa."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:507
 #, priority:100
 msgid "Further, several additional files are created or updated per commit by git-filter-branch.  Some of these are for supporting the convenience functions provided by git-filter-branch (such as map()), while others are for keeping track of internal state (but could have also been accessed by user filters; one of git-filter-branch's regression tests does so).  This essentially amounts to using the filesystem as an IPC mechanism between git-filter-branch and the user-provided filters.  Disks tend to be a slow IPC mechanism, and writing these files also effectively represents a forced synchronization point between separate processes that we hit with every commit."
-msgstr ""
-"Além disso, os vários arquivos adicionais são criados ou são atualizados por "
-"commits através do comando git-filter-branch.  Alguns deles são para apoiar "
-"as funções de conveniência fornecidas pelo 'git-filter-branch' (como map()), "
-"enquanto outros são para acompanhar a condição interna (mas também podem ter "
-"sido acessados através dos filtros do usuário; com um dos testes de "
-"regressão 'git-filter-branch' do ramo fazem).  Basicamente significa "
-"utilizar o sistema dos arquivos como um mecanismo IPC entre o 'git-filter-"
-"branch' e os filtros fornecidos pelo usuário.  Os discos tendem a ser um "
-"mecanismo IPC lento e a gravação destes arquivos também representa "
-"efetivamente um ponto de sincronização imposto entre os processos separados "
-"que atingimos com cada commit."
+msgstr "Além disso, os vários arquivos adicionais são criados ou são atualizados por commits através do comando git-filter-branch.  Alguns deles são para apoiar as funções de conveniência fornecidas pelo 'git-filter-branch' (como map()), enquanto outros são para acompanhar a condição interna (mas também podem ter sido acessados através dos filtros do usuário; com um dos testes de regressão 'git-filter-branch' do ramo fazem).  Basicamente significa utilizar o sistema dos arquivos como um mecanismo IPC entre o 'git-filter-branch' e os filtros fornecidos pelo usuário.  Os discos tendem a ser um mecanismo IPC lento e a gravação destes arquivos também representa efetivamente um ponto de sincronização imposto entre os processos separados que atingimos com cada commit."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:513
 #, priority:100
 msgid "The user-provided shell commands will likely involve a pipeline of commands, resulting in the creation of many processes per commit.  Creating and running another process takes a widely varying amount of time between operating systems, but on any platform it is very slow relative to invoking a function."
-msgstr ""
-"Os comandos do usuário informados pelo shell provavelmente envolverão um "
-"pipeline de comandos, resultando na criação de muitos processos por commit.  "
-"Criar e executar um outro processo leva uma certa quantidade bastante de "
-"tempo entre os sistemas operacionais, porém em qualquer outra plataforma é "
-"muito lento em relação à chamada de uma função."
+msgstr "Os comandos do usuário informados pelo shell provavelmente envolverão um pipeline de comandos, resultando na criação de muitos processos por commit.  Criar e executar um outro processo leva uma certa quantidade bastante de tempo entre os sistemas operacionais, porém em qualquer outra plataforma é muito lento em relação à chamada de uma função."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:519
 #, priority:100
 msgid "git-filter-branch itself is written in shell, which is kind of slow.  This is the one performance issue that could be backward-compatibly fixed, but compared to the above problems that are intrinsic to the design of git-filter-branch, the language of the tool itself is a relatively minor issue."
-msgstr ""
-"O próprio 'git-filter-branch' é escrito em shell, o que o torna um pouco "
-"lento.  Esse é o único problema de desempenho que pode ser corrigido de "
-"forma compatível com as versões anteriores, porém se  comparado aos "
-"problemas acima, intrínsecos ao design do 'git-filter-branch', o idioma "
-"usado pela própria ferramenta é um problema relativamente menor."
+msgstr "O próprio 'git-filter-branch' é escrito em shell, o que o torna um pouco lento.  Esse é o único problema de desempenho que pode ser corrigido de forma compatível com as versões anteriores, porém se  comparado aos problemas acima, intrínsecos ao design do 'git-filter-branch', o idioma usado pela própria ferramenta é um problema relativamente menor."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:530
 #, priority:100
 msgid "Side note: Unfortunately, people tend to fixate on the written-in-shell aspect and periodically ask if git-filter-branch could be rewritten in another language to fix the performance issues.  Not only does that ignore the bigger intrinsic problems with the design, it'd help less than you'd expect: if git-filter-branch itself were not shell, then the convenience functions (map(), skip_commit(), etc) and the `--setup` argument could no longer be executed once at the beginning of the program but would instead need to be prepended to every user filter (and thus re-executed with every commit)."
-msgstr ""
-"Nota: Infelizmente, as pessoas tendem a se fixar no aspecto \"escrito em "
-"shell\" e periodicamente perguntam se o 'git-filter-branch' pode ser "
-"reescrito em outra linguagem para corrigir os problemas com o desempenho.  "
-"Isso não apenas ignora os maiores problemas intrínsecos na questão do "
-"design, como também ajuda menos do que você espera: se o ramo do 'git-filter-"
-"branch' em si não fosse em shell, as funções de conveniência (map(), "
-"skip_commit(), etc) e a opção `--setup` não poderiam mais ser executadas uma "
-"vez durante o início do programa, porém precisariam ser anexadas em todo o "
-"filtro do usuário (e portanto, ser executado com cada commit)."
+msgstr "Nota: Infelizmente, as pessoas tendem a se fixar no aspecto \"escrito em shell\" e periodicamente perguntam se o 'git-filter-branch' pode ser reescrito em outra linguagem para corrigir os problemas com o desempenho.  Isso não apenas ignora os maiores problemas intrínsecos na questão do design, como também ajuda menos do que você espera: se o ramo do 'git-filter-branch' em si não fosse em shell, as funções de conveniência (map(), skip_commit(), etc) e a opção `--setup` não poderiam mais ser executadas uma vez durante o início do programa, porém precisariam ser anexadas em todo o filtro do usuário (e portanto, ser executado com cada commit)."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:541
 #, priority:100
 msgid "The https://github.com/newren/git-filter-repo/[git filter-repo] tool is an alternative to git-filter-branch which does not suffer from these performance problems or the safety problems (mentioned below). For those with existing tooling which relies upon git-filter-branch, 'git repo-filter' also provides https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], a drop-in git-filter-branch replacement (with a few caveats).  While filter-lamely suffers from all the same safety issues as git-filter-branch, it at least ameliorates the performance issues a little."
-msgstr ""
-"A ferramenta https://github.com/newren/git-filter-repo/[git filter-repo] é "
-"uma alternativa ao 'git-filter-branch' que não sofre com estes problemas de "
-"desempenho ou problemas com segurança (mencionados abaixo). Para aqueles com "
-"ferramentas já existentes que dependam do 'git-filter-branch', o comando "
-"'git repo-filter' também oferece https://github.com/newren/git-filter-repo/"
-"blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], um "
-"substituto do 'git-filter-branch' (com algumas ressalvas).  Embora o filtro "
-"sofra dos mesmos problemas de segurança que o 'git-filter-branch', ele pelo "
-"menos melhora um pouco as questões de desempenho."
+msgstr "A ferramenta https://github.com/newren/git-filter-repo/[git filter-repo] é uma alternativa ao 'git-filter-branch' que não sofre com estes problemas de desempenho ou problemas com segurança (mencionados abaixo). Para aqueles com ferramentas já existentes que dependam do 'git-filter-branch', o comando 'git repo-filter' também oferece https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely], um substituto do 'git-filter-branch' (com algumas ressalvas).  Embora o filtro sofra dos mesmos problemas de segurança que o 'git-filter-branch', ele pelo menos melhora um pouco as questões de desempenho."
 
 #. type: Title -
 #: en/git-filter-branch.txt:544
@@ -27148,93 +25057,43 @@ msgstr "SEGURANÇA"
 #: en/git-filter-branch.txt:549
 #, priority:100
 msgid "git-filter-branch is riddled with gotchas resulting in various ways to easily corrupt repos or end up with a mess worse than what you started with:"
-msgstr ""
-"O 'git-filter-branch' está cheio de pegadinhas, em várias maneiras o "
-"resultando pode corromper facilmente os repositórios ou acabar com uma "
-"bagunça pior do que a que você começou:"
+msgstr "O 'git-filter-branch' está cheio de pegadinhas, em várias maneiras o resultando pode corromper facilmente os repositórios ou acabar com uma bagunça pior do que a que você começou:"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:563
 #, priority:100
 msgid "Someone can have a set of \"working and tested filters\" which they document or provide to a coworker, who then runs them on a different OS where the same commands are not working/tested (some examples in the git-filter-branch manpage are also affected by this).  BSD vs. GNU userland differences can really bite.  If lucky, error messages are spewed.  But just as likely, the commands either don't do the filtering requested, or silently corrupt by making some unwanted change.  The unwanted change may only affect a few commits, so it's not necessarily obvious either.  (The fact that problems won't necessarily be obvious means they are likely to go unnoticed until the rewritten history is in use for quite a while, at which point it's really hard to justify another flag-day for another rewrite.)"
-msgstr ""
-"Alguém pode ter um conjunto de \"filtros testados e que funcionam\" que eles "
-"documentam ou provê a um colega de trabalho, que os executa em um SO "
-"diferente onde os mesmos comandos não estão funcionando ou foram testados ("
-"alguns exemplos na página do manual do 'git-filter-branch' também são "
-"afetados por este).  Os usuários do BSD vs. GNU podem sentir grandes "
-"diferenças.  Se tiver sorte, algumas mensagens de erros serão exibidas.  "
-"Mas, com a mesma probabilidade, os comandos não fazem a filtragem solicitada "
-"ou silenciosamente, corrompem ao fazer algumas alterações indesejadas.  A "
-"alteração indesejada pode afetar apenas alguns commits, portanto também não "
-"é necessariamente óbvia.  (O fato onde os problemas não serão "
-"necessariamente óbvios significa que eles provavelmente passarão "
-"despercebidos até que o histórico reescrito esteja em uso por um bom tempo, "
-"quando for realmente difícil justificar outro alerta para outra reescrita.)"
+msgstr "Alguém pode ter um conjunto de \"filtros testados e que funcionam\" que eles documentam ou provê a um colega de trabalho, que os executa em um SO diferente onde os mesmos comandos não estão funcionando ou foram testados (alguns exemplos na página do manual do 'git-filter-branch' também são afetados por este).  Os usuários do BSD vs. GNU podem sentir grandes diferenças.  Se tiver sorte, algumas mensagens de erros serão exibidas.  Mas, com a mesma probabilidade, os comandos não fazem a filtragem solicitada ou silenciosamente, corrompem ao fazer algumas alterações indesejadas.  A alteração indesejada pode afetar apenas alguns commits, portanto também não é necessariamente óbvia.  (O fato onde os problemas não serão necessariamente óbvios significa que eles provavelmente passarão despercebidos até que o histórico reescrito esteja em uso por um bom tempo, quando for realmente difícil justificar outro alerta para outra reescrita.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:573
 #, priority:100
 msgid "Filenames with spaces are often mishandled by shell snippets since they cause problems for shell pipelines.  Not everyone is familiar with find -print0, xargs -0, git-ls-files -z, etc.  Even people who are familiar with these may assume such flags are not relevant because someone else renamed any such files in their repo back before the person doing the filtering joined the project.  And often, even those familiar with handling arguments with spaces may not do so just because they aren't in the mindset of thinking about everything that could possibly go wrong."
-msgstr ""
-"Os nomes dos arquivos com espaços geralmente não são tratados de forma "
-"correta pelos trechos em shell scripts, pois causam problemas nas "
-"pipelines.  Nem todo mundo está familiarizado com 'find -print0', 'xargs -"
-"0', 'git-ls-files -z', etc. Mesmo as pessoas familiarizadas com isso podem "
-"assumir que tais opções não sejam relevantes porque alguém renomeou esses "
-"arquivos no seu repositório antes da pessoa que fez a filtragem entrar no "
-"projeto.  E muitas vezes, mesmo aqueles familiarizados com o tratamento dos "
-"argumentos com espaços podem não fazê-lo apenas porque não estão com a "
-"mentalidade de pensar em tudo o que poderia dar errado."
+msgstr "Os nomes dos arquivos com espaços geralmente não são tratados de forma correta pelos trechos em shell scripts, pois causam problemas nas pipelines.  Nem todo mundo está familiarizado com 'find -print0', 'xargs -0', 'git-ls-files -z', etc. Mesmo as pessoas familiarizadas com isso podem assumir que tais opções não sejam relevantes porque alguém renomeou esses arquivos no seu repositório antes da pessoa que fez a filtragem entrar no projeto.  E muitas vezes, mesmo aqueles familiarizados com o tratamento dos argumentos com espaços podem não fazê-lo apenas porque não estão com a mentalidade de pensar em tudo o que poderia dar errado."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:584
 #, priority:100
 msgid "Non-ascii filenames can be silently removed despite being in a desired directory.  Keeping only wanted paths is often done using pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`.  ls-files will only quote filenames if needed, so folks may not notice that one of the files didn't match the regex (at least not until it's much too late).  Yes, someone who knows about core.quotePath can avoid this (unless they have other special characters like \\t, \\n, or \"), and people who use ls-files -z with something other than grep can avoid this, but that doesn't mean they will."
-msgstr ""
-"Os nomes de arquivos não ascii podem ser removidos silenciosamente, apesar "
-"de estarem no diretório desejado.  Manter apenas os caminhos desejados "
-"geralmente é feito utilizando pipelines como `git ls-files | grep -v ^"
-"WANTED_DIR/ | xargs git rm`.  O ls-files só citará os nomes dos arquivos "
-"caso seja necessário, portanto, as pessoas podem não perceber que um dos "
-"arquivos não coincide com o regex (pelo menos não até que seja tarde demais)"
-".  Sim, alguém que conhece a opção de configuração `core.quotePath` pode "
-"evitar isso (a menos que tenha outros caracteres especiais como '\\t', '\\n"
-"' ou '\"'), e as pessoas que utilizam `ls-files -z` com algo diferente de "
-"'grep' podem evitar isso, porém não significa que eles irão."
+msgstr "Os nomes de arquivos não ascii podem ser removidos silenciosamente, apesar de estarem no diretório desejado.  Manter apenas os caminhos desejados geralmente é feito utilizando pipelines como `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`.  O ls-files só citará os nomes dos arquivos caso seja necessário, portanto, as pessoas podem não perceber que um dos arquivos não coincide com o regex (pelo menos não até que seja tarde demais).  Sim, alguém que conhece a opção de configuração `core.quotePath` pode evitar isso (a menos que tenha outros caracteres especiais como '\\t', '\\n' ou '\"'), e as pessoas que utilizam `ls-files -z` com algo diferente de 'grep' podem evitar isso, porém não significa que eles irão."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:591
 #, priority:100
 msgid "Similarly, when moving files around, one can find that filenames with non-ascii or special characters end up in a different directory, one that includes a double quote character.  (This is technically the same issue as above with quoting, but perhaps an interesting different way that it can and has manifested as a problem.)"
-msgstr ""
-"Da mesma forma, ao mover os arquivos, pode-se descobrir que os nomes dos "
-"arquivos com caracteres não ASCII ou especiais, acabam em um diretório "
-"diferente, um que inclua um caractere com aspas duplas.  (Tecnicamente, este "
-"é o mesmo problema acima, com citações, porém talvez seja uma maneira "
-"interessante e diferente de se manifestar como um problema.)"
+msgstr "Da mesma forma, ao mover os arquivos, pode-se descobrir que os nomes dos arquivos com caracteres não ASCII ou especiais, acabam em um diretório diferente, um que inclua um caractere com aspas duplas.  (Tecnicamente, este é o mesmo problema acima, com citações, porém talvez seja uma maneira interessante e diferente de se manifestar como um problema.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:600
 #, priority:100
 msgid "It's far too easy to accidentally mix up old and new history.  It's still possible with any tool, but git-filter-branch almost invites it.  If lucky, the only downside is users getting frustrated that they don't know how to shrink their repo and remove the old stuff.  If unlucky, they merge old and new history and end up with multiple \"copies\" of each commit, some of which have unwanted or sensitive files and others which don't.  This comes about in multiple different ways:"
-msgstr ""
-"É muito fácil misturar acidentalmente o histórico antigo e com o novo.  Com "
-"qualquer ferramenta ainda é possível, mas o comando git-filter-branch é "
-"quase um convite pra isso.  Caso tenha sorte, a única desvantagem é que os "
-"usuários fiquem frustrados por não saberem como encolher o seu repositório e "
-"remover as coisas antigas.  Caso tenha azar, eles mesclam o histórico antigo "
-"e o novo e acabam com várias \"cópias\" de cada commit, algumas das quais "
-"com arquivos confidenciais ou indesejados e outras que não.  Isso ocorre de "
-"várias maneiras diferentes:"
+msgstr "É muito fácil misturar acidentalmente o histórico antigo e com o novo.  Com qualquer ferramenta ainda é possível, mas o comando git-filter-branch é quase um convite pra isso.  Caso tenha sorte, a única desvantagem é que os usuários fiquem frustrados por não saberem como encolher o seu repositório e remover as coisas antigas.  Caso tenha azar, eles mesclam o histórico antigo e o novo e acabam com várias \"cópias\" de cada commit, algumas das quais com arquivos confidenciais ou indesejados e outras que não.  Isso ocorre de várias maneiras diferentes:"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:603
 #, priority:100
 msgid "the default to only doing a partial history rewrite ('--all' is not the default and few examples show it)"
-msgstr ""
-"a predefinição para reescrever apenas um histórico parcial ('--all' não é a "
-"predefinição e poucos exemplos o mostram)"
+msgstr "a predefinição para reescrever apenas um histórico parcial ('--all' não é a predefinição e poucos exemplos o mostram)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:605
@@ -27246,180 +25105,97 @@ msgstr "o fato de não haver limpeza automática após a execução"
 #: en/git-filter-branch.txt:608
 #, priority:100
 msgid "the fact that --tag-name-filter (when used to rename tags) doesn't remove the old tags but just adds new ones with the new name"
-msgstr ""
-"o fato da opção `--tag-name-filter` (quando usado para renomear as tags) não "
-"remover as tags antigas, mas apenas adicionar novas com um novo nome"
+msgstr "o fato da opção `--tag-name-filter` (quando usado para renomear as tags) não remover as tags antigas, mas apenas adicionar novas com um novo nome"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:617
 #, priority:100
 msgid "the fact that little educational information is provided to inform users of the ramifications of a rewrite and how to avoid mixing old and new history.  For example, this man page discusses how users need to understand that they need to rebase their changes for all their branches on top of new history (or delete and reclone), but that's only one of multiple concerns to consider.  See the \"DISCUSSION\" section of the git filter-repo manual page for more details."
-msgstr ""
-"o fato de poucas informações educacionais serem fornecidas aos usuários das "
-"ramificações de uma reescrita e como evitar misturar o histórico antigo e o "
-"novo.  Por exemplo, esta página do manual discute como os usuários precisam "
-"entender que precisam refazer as suas alterações para todas as suas "
-"ramificações no topo do novo histórico (ou excluir ou refazer a clonagem), "
-"porém essa é apenas uma das várias preocupações a serem consideradas.  Para "
-"mais detalhes, consulte a seção \"DISCUSSÃO\" da página do manual do 'filter-"
-"repo'."
+msgstr "o fato de poucas informações educacionais serem fornecidas aos usuários das ramificações de uma reescrita e como evitar misturar o histórico antigo e o novo.  Por exemplo, esta página do manual discute como os usuários precisam entender que precisam refazer as suas alterações para todas as suas ramificações no topo do novo histórico (ou excluir ou refazer a clonagem), porém essa é apenas uma das várias preocupações a serem consideradas.  Para mais detalhes, consulte a seção \"DISCUSSÃO\" da página do manual do 'filter-repo'."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:620
 #, priority:100
 msgid "Annotated tags can be accidentally converted to lightweight tags, due to either of two issues:"
-msgstr ""
-"As tags anotadas podem ser convertidas acidentalmente em tags leves, devido "
-"a um de dois problemas:"
+msgstr "As tags anotadas podem ser convertidas acidentalmente em tags leves, devido a um de dois problemas:"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:625
 #, priority:100
 msgid "Someone can do a history rewrite, realize they messed up, restore from the backups in refs/original/, and then redo their git-filter-branch command.  (The backup in refs/original/ is not a real backup; it dereferences tags first.)"
-msgstr ""
-"Alguém pode reescrever o histórico, perceber que errou, restaurar a partir "
-"de um dos backups no 'refs/original/' e depois refazer o comando 'git-filter-"
-"branch'.  (O backup no 'refs/original/' não é um backup real; ele primeiro "
-"remove a referência das tags.)"
+msgstr "Alguém pode reescrever o histórico, perceber que errou, restaurar a partir de um dos backups no 'refs/original/' e depois refazer o comando 'git-filter-branch'.  (O backup no 'refs/original/' não é um backup real; ele primeiro remove a referência das tags.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:630
 #, priority:100
 msgid "Running git-filter-branch with either --tags or --all in your <rev-list options>.  In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite)."
-msgstr ""
-"Execute o comando 'git-filter-branch' com '--tags' ou '--all' mas suas `"
-"<opções da rev-list>`.  Para manter as tags que já estejam anotadas como "
-"anotadas, utilize '--tag-name-filter' (não deve ter sido restaurado a partir "
-"de um 'refs/original/' vindo anteriormente de uma reescrita danificada)."
+msgstr "Execute o comando 'git-filter-branch' com '--tags' ou '--all' mas suas `<opções da rev-list>`.  Para manter as tags que já estejam anotadas como anotadas, utilize '--tag-name-filter' (não deve ter sido restaurado a partir de um 'refs/original/' vindo anteriormente de uma reescrita danificada)."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:636
 #, priority:100
 msgid "Any commit messages that specify an encoding will become corrupted by the rewrite; git-filter-branch ignores the encoding, takes the original bytes, and feeds it to commit-tree without telling it the proper encoding.  (This happens whether or not --msg-filter is used.)"
-msgstr ""
-"Qualquer mensagem dos commits que defina uma codificação, se tornará "
-"corrompida pela reescrita; O 'git-filter-branch' ignora a codificação, pega "
-"os bytes originais e o alimenta para a árvore do commit sem informar a "
-"codificação adequada.  (Isso ocorre caso o filtro `--msg-filter` seja "
-"utilizado ou não.)"
+msgstr "Qualquer mensagem dos commits que defina uma codificação, se tornará corrompida pela reescrita; O 'git-filter-branch' ignora a codificação, pega os bytes originais e o alimenta para a árvore do commit sem informar a codificação adequada.  (Isso ocorre caso o filtro `--msg-filter` seja utilizado ou não.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:641
 #, priority:100
 msgid "Commit messages (even if they are all UTF-8) by default become corrupted due to not being updated -- any references to other commit hashes in commit messages will now refer to no-longer-extant commits."
-msgstr ""
-"É predefinido que as mensagens dos commits (mesmo que todas sejam UTF-8) "
-"fiquem corrompidas por não serem atualizadas -- quaisquer referências a "
-"outros hashes dos commits, nas mensagens dos commits, agora se referem a "
-"commits que não existem mais."
+msgstr "É predefinido que as mensagens dos commits (mesmo que todas sejam UTF-8) fiquem corrompidas por não serem atualizadas -- quaisquer referências a outros hashes dos commits, nas mensagens dos commits, agora se referem a commits que não existem mais."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:652
 #, priority:100
 msgid "There are no facilities for helping users find what unwanted crud they should delete, which means they are much more likely to have incomplete or partial cleanups that sometimes result in confusion and people wasting time trying to understand.  (For example, folks tend to just look for big files to delete instead of big directories or extensions, and once they do so, then sometime later folks using the new repository who are going through history will notice a build artifact directory that has some files but not others, or a cache of dependencies (node_modules or similar) which couldn't have ever been functional since it's missing some files.)"
-msgstr ""
-"Não há facilidades para ajudar os usuários a encontrarem os itens "
-"indesejados que devem ser excluídos, o que significa que são muito mais "
-"propensos a fazer limpezas incompletas ou parciais que às vezes resultam em "
-"confusão e pessoas perdendo tempo tentando compreender.  (Como, por exemplo, "
-"as pessoas tendem a procurar excluir apenas os arquivos grandes, em vez dos "
-"grandes diretórios ou extensões, e uma vez que o fazem algum tempo depois, "
-"as pessoas que usam o novo repositório que estão passando pelo histórico "
-"notarão alguns artefatos de construção onde alguns arquivos existem e outros "
-"não, ou um cache com dependências (node_modules ou similar) que nunca "
-"poderiam estar funcionais, pois alguns arquivos estão faltando.)"
+msgstr "Não há facilidades para ajudar os usuários a encontrarem os itens indesejados que devem ser excluídos, o que significa que são muito mais propensos a fazer limpezas incompletas ou parciais que às vezes resultam em confusão e pessoas perdendo tempo tentando compreender.  (Como, por exemplo, as pessoas tendem a procurar excluir apenas os arquivos grandes, em vez dos grandes diretórios ou extensões, e uma vez que o fazem algum tempo depois, as pessoas que usam o novo repositório que estão passando pelo histórico notarão alguns artefatos de construção onde alguns arquivos existem e outros não, ou um cache com dependências (node_modules ou similar) que nunca poderiam estar funcionais, pois alguns arquivos estão faltando.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:655
 #, priority:100
 msgid "If --prune-empty isn't specified, then the filtering process can create hoards of confusing empty commits"
-msgstr ""
-"Caso a opção `--prune-empty` não seja utilizado, o processo de filtragem "
-"poderá criar hordas confusas com commits vazios"
+msgstr "Caso a opção `--prune-empty` não seja utilizado, o processo de filtragem poderá criar hordas confusas com commits vazios"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:659
 #, priority:100
 msgid "If --prune-empty is specified, then intentionally placed empty commits from before the filtering operation are also pruned instead of just pruning commits that became empty due to filtering rules."
-msgstr ""
-"Caso a opção `--prune-empty` seja utilizado, os commits vazios que foram "
-"intencionalmente colocados antes da operação de filtragem também serão "
-"removidos, em vez de apenas os commits removidos que ficaram vazios devido "
-"às regras de filtragem."
+msgstr "Caso a opção `--prune-empty` seja utilizado, os commits vazios que foram intencionalmente colocados antes da operação de filtragem também serão removidos, em vez de apenas os commits removidos que ficaram vazios devido às regras de filtragem."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:662
 #, ignore-ellipsis, priority:100
 msgid "If --prune-empty is specified, sometimes empty commits are missed and left around anyway (a somewhat rare bug, but it happens...)"
-msgstr ""
-"Caso a opção `--prune-empty` seja utilizado, algumas vezes os commits vazios "
-"são perdidos e deixados de qualquer maneira (um bug um tanto raro, mas "
-"acontece...)"
+msgstr "Caso a opção `--prune-empty` seja utilizado, algumas vezes os commits vazios são perdidos e deixados de qualquer maneira (um bug um tanto raro, mas acontece...)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:666
 #, priority:100
 msgid "A minor issue, but users who have a goal to update all names and emails in a repository may be led to --env-filter which will only update authors and committers, missing taggers."
-msgstr ""
-"Um problema menor, porém os usuários que têm o objetivo de atualizar todos "
-"os nomes e os e-mails em um repositório podem ser levados ao '--env-filter', "
-"que atualizará apenas os autores e que fez os commits, sem as tags."
+msgstr "Um problema menor, porém os usuários que têm o objetivo de atualizar todos os nomes e os e-mails em um repositório podem ser levados ao '--env-filter', que atualizará apenas os autores e que fez os commits, sem as tags."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:672
 #, priority:100
 msgid "If the user provides a --tag-name-filter that maps multiple tags to the same name, no warning or error is provided; git-filter-branch simply overwrites each tag in some undocumented pre-defined order resulting in only one tag at the end.  (A git-filter-branch regression test requires this surprising behavior.)"
-msgstr ""
-"Caso o usuário utilize um comando `--tag-name-filter` que mapeie várias tags "
-"para o mesmo nome, nenhum aviso ou erro será exibido; O comando `git-filter-"
-"branch` simplesmente sobrescreve cada tag em uma ordem predefinida não "
-"documentada, resultando em apenas uma tag no final.  (Um teste de regressão "
-"`git-filter-branch` requer este comportamento.)"
+msgstr "Caso o usuário utilize um comando `--tag-name-filter` que mapeie várias tags para o mesmo nome, nenhum aviso ou erro será exibido; O comando `git-filter-branch` simplesmente sobrescreve cada tag em uma ordem predefinida não documentada, resultando em apenas uma tag no final.  (Um teste de regressão `git-filter-branch` requer este comportamento.)"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:675
 #, priority:100
 msgid "Also, the poor performance of git-filter-branch often leads to safety issues:"
-msgstr ""
-"Além disso, o baixo desempenho do comando 'git-filter-branch' geralmente "
-"leva a problemas de segurança:"
+msgstr "Além disso, o baixo desempenho do comando 'git-filter-branch' geralmente leva a problemas de segurança:"
 
 #. type: Plain text
 #: en/git-filter-branch.txt:692
 #, priority:100
 msgid "Coming up with the correct shell snippet to do the filtering you want is sometimes difficult unless you're just doing a trivial modification such as deleting a couple files.  Unfortunately, people often learn if the snippet is right or wrong by trying it out, but the rightness or wrongness can vary depending on special circumstances (spaces in filenames, non-ascii filenames, funny author names or emails, invalid timezones, presence of grafts or replace objects, etc.), meaning they may have to wait a long time, hit an error, then restart.  The performance of git-filter-branch is so bad that this cycle is painful, reducing the time available to carefully re-check (to say nothing about what it does to the patience of the person doing the rewrite even if they do technically have more time available).  This problem is extra compounded because errors from broken filters may not be shown for a long time and/or get lost in a sea of output.  Even worse, broken filters often just result in silent incorrect rewrites."
-msgstr ""
-"Chegar com o trecho shell correto para fazer a filtragem desejada algumas "
-"vezes é difícil, a menos que você não esteja fazendo uma alteração trivial "
-"como a exclusão de alguns arquivos.  Infelizmente, as pessoas geralmente "
-"aprendem se o trecho está certo ou errado ao testá-lo, porém o certo ou "
-"errado pode variar dependendo de circunstâncias especiais (espaços nos nomes "
-"dos arquivos, dos nomes dos arquivos não-ascii, nomes ou e-mails engraçados "
-"dos autores, fusos horários inválidos, a presença de enxertos ou a reposição "
-"dos objetos, etc.), o que significa que eles podem ter que esperar muito "
-"tempo, encontrar um erro e reiniciar.  O desempenho do comando 'git-filter-"
-"branch' é tão ruim que este ciclo é doloroso, reduzindo o tempo disponível "
-"para uma nova verificação mais cuidadosa (isso sem falar sobre o que isso "
-"faz com a paciência da pessoa que está reescrevendo, ainda que tecnicamente "
-"tenham mais recursos e tempo disponível).  Este problema é mais complexo "
-"porque os erros vindos dos filtros quebrados podem não ser exibidos por um "
-"longo período de tempo e/ou estarem perdidos uma imensidão do que for "
-"gerado.  Pior ainda, os filtros quebrados geralmente resultam em reescritas "
-"incorretas e silenciosas."
+msgstr "Chegar com o trecho shell correto para fazer a filtragem desejada algumas vezes é difícil, a menos que você não esteja fazendo uma alteração trivial como a exclusão de alguns arquivos.  Infelizmente, as pessoas geralmente aprendem se o trecho está certo ou errado ao testá-lo, porém o certo ou errado pode variar dependendo de circunstâncias especiais (espaços nos nomes dos arquivos, dos nomes dos arquivos não-ascii, nomes ou e-mails engraçados dos autores, fusos horários inválidos, a presença de enxertos ou a reposição dos objetos, etc.), o que significa que eles podem ter que esperar muito tempo, encontrar um erro e reiniciar.  O desempenho do comando 'git-filter-branch' é tão ruim que este ciclo é doloroso, reduzindo o tempo disponível para uma nova verificação mais cuidadosa (isso sem falar sobre o que isso faz com a paciência da pessoa que está reescrevendo, ainda que tecnicamente tenham mais recursos e tempo disponível).  Este problema é mais complexo porque os erros vindos dos filtros quebrados podem não ser exibidos por um longo período de tempo e/ou estarem perdidos uma imensidão do que for gerado.  Pior ainda, os filtros quebrados geralmente resultam em reescritas incorretas e silenciosas."
 
 #. type: Plain text
 #: en/git-filter-branch.txt:700
 #, priority:100
 msgid "To top it all off, even when users finally find working commands, they naturally want to share them.  But they may be unaware that their repo didn't have some special cases that someone else's does.  So, when someone else with a different repository runs the same commands, they get hit by the problems above.  Or, the user just runs commands that really were vetted for special cases, but they run it on a different OS where it doesn't work, as noted above."
-msgstr ""
-"E acima de tudo, mesmo quando os usuários finalmente encontram os comandos "
-"que funcionam, eles naturalmente querem compartilhá-los.  Porém eles podem "
-"não estar cientes que o repositório deles não teve algumas questões "
-"especiais que outros tiveram.  Portanto, quando alguém com um repositório "
-"diferente executa os mesmos comandos, é atingido pelos problemas acima.  Ou "
-"então, o usuário apenas executa os comandos que foram realmente examinados "
-"para questões especiais, mas eles o executam em um sistema operacional "
-"diferente, onde não funciona, conforme observado acima."
+msgstr "E acima de tudo, mesmo quando os usuários finalmente encontram os comandos que funcionam, eles naturalmente querem compartilhá-los.  Porém eles podem não estar cientes que o repositório deles não teve algumas questões especiais que outros tiveram.  Portanto, quando alguém com um repositório diferente executa os mesmos comandos, é atingido pelos problemas acima.  Ou então, o usuário apenas executa os comandos que foram realmente examinados para questões especiais, mas eles o executam em um sistema operacional diferente, onde não funciona, conforme observado acima."
 
 #. type: Title =
 #: en/git-fmt-merge-msg.txt:2
@@ -27465,12 +25241,7 @@ msgstr "--log[=<n>]"
 #: en/git-fmt-merge-msg.txt:33
 #, priority:100
 msgid "In addition to branch names, populate the log message with one-line descriptions from the actual commits that are being merged.  At most <n> commits from each merge parent will be used (20 if <n> is omitted).  This overrides the `merge.log` configuration variable."
-msgstr ""
-"Além dos nomes das ramificações, preencha a mensagem do registro log com "
-"descrições de uma linha dos commits que estão sendo mesclados atualmente.  "
-"Serão utilizadas no máximo <n> mesclagens dos commits de cada origem (20 "
-"caso <n> seja omitido).  Isso substitui a variável de configuração `merge."
-"log`."
+msgstr "Além dos nomes das ramificações, preencha a mensagem do registro log com descrições de uma linha dos commits que estão sendo mesclados atualmente.  Serão utilizadas no máximo <n> mesclagens dos commits de cada origem (20 caso <n> seja omitido).  Isso substitui a variável de configuração `merge.log`."
 
 #. type: Labeled list
 #: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:72
@@ -27580,13 +25351,7 @@ msgstr ""
 #: en/git-for-each-ref.txt:26
 #, priority:100
 msgid "Iterate over all refs that match `<pattern>` and show them according to the given `<format>`, after sorting them according to the given set of `<key>`.  If `<count>` is given, stop after showing that many refs.  The interpolated values in `<format>` can optionally be quoted as string literals in the specified host language allowing their direct evaluation in that language."
-msgstr ""
-"Reitere todos as referências que coincidam com `<padrão>` e mostre-os de "
-"acordo com o `<formato>` utilizado depois de classificá-los de acordo com o "
-"conjunto informado por `<chave>`.  Caso `<count>` seja utilizado, pare "
-"depois de exibir referências demais.  Os valores interpolados no `<formato>` "
-"podem opcionalmente ser citados como literais de uma cadeia de caracteres no "
-"idioma do host utilizado, permitindo a sua avaliação direta neste idioma."
+msgstr "Reitere todos as referências que coincidam com `<padrão>` e mostre-os de acordo com o `<formato>` utilizado depois de classificá-los de acordo com o conjunto informado por `<chave>`.  Caso `<count>` seja utilizado, pare depois de exibir referências demais.  Os valores interpolados no `<formato>` podem opcionalmente ser citados como literais de uma cadeia de caracteres no idioma do host utilizado, permitindo a sua avaliação direta neste idioma."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:29 en/git-show-ref.txt:88
@@ -27628,18 +25393,7 @@ msgstr "--format=<formato>"
 #: en/git-for-each-ref.txt:59
 #, priority:100
 msgid "A string that interpolates `%(fieldname)` from a ref being shown and the object it points at.  If `fieldname` is prefixed with an asterisk (`*`) and the ref points at a tag object, use the value for the field in the object which the tag object refers to (instead of the field in the tag object).  When unspecified, `<format>` defaults to `%(objectname) SPC %(objecttype) TAB %(refname)`.  It also interpolates `%%` to `%`, and `%xx` where `xx` are hex digits interpolates to character with hex code `xx`; for example `%00` interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
-msgstr ""
-"Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma "
-"referência sendo exibida e o objeto para o qual aponta.  Caso `fieldname` "
-"seja prefixada com um asterisco (`*`) e a referência aponte para um objeto "
-"tag, utilize o valor do campo no objeto ao qual o objeto tag se refere (em "
-"vez do campo no objeto tag).  Quando não especificado, o `<formato>` retorna "
-"para a predefinição `%(objectname) SPC %(objecttype) TAB %(refname)`.  "
-"Também interpola `%%` para `%` e `% xx` onde `xx` são dígitos hexadecimais "
-"interpolados com caracteres que tenha um código hexadecimal `xx`; `% 00` "
-"interpola para `\\0` (NUL) por exemplo, `%09` para `\\t` (TAB) e `%0a` para `"
-"\\n"
-"` (LF)."
+msgstr "Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma referência sendo exibida e o objeto para o qual aponta.  Caso `fieldname` seja prefixada com um asterisco (`*`) e a referência aponte para um objeto tag, utilize o valor do campo no objeto ao qual o objeto tag se refere (em vez do campo no objeto tag).  Quando não especificado, o `<formato>` retorna para a predefinição `%(objectname) SPC %(objecttype) TAB %(refname)`.  Também interpola `%%` para `%` e `% xx` onde `xx` são dígitos hexadecimais interpolados com caracteres que tenha um código hexadecimal `xx`; `% 00` interpola para `\\0` (NUL) por exemplo, `%09` para `\\t` (TAB) e `%0a` para `\\n` (LF)."
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:64 en/git-tag.txt:129
@@ -27675,11 +25429,7 @@ msgstr "--tcl"
 #: en/git-for-each-ref.txt:73
 #, priority:100
 msgid "If given, strings that substitute `%(fieldname)` placeholders are quoted as string literals suitable for the specified host language.  This is meant to produce a scriptlet that can directly be `eval`ed."
-msgstr ""
-"Se informado, as strings que substituem os espaços reservados `% (fieldname)`"
-" são citadas como literais de strings adequadas para o idioma do host "
-"especificado.  Isso tem a intenção de produzir um \"scriptlet\" que possa "
-"ser diretamente \"avaliado\"."
+msgstr "Se informado, as strings que substituem os espaços reservados `% (fieldname)` são citadas como literais de strings adequadas para o idioma do host especificado.  Isso tem a intenção de produzir um \"scriptlet\" que possa ser diretamente \"avaliado\"."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:74
@@ -27817,12 +25567,7 @@ msgstr "objectname"
 #: en/git-for-each-ref.txt:139
 #, priority:100
 msgid "The object name (aka SHA-1).  For a non-ambiguous abbreviation of the object name append `:short`.  For an abbreviation of the object name with desired length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. The length may be exceeded to ensure unique object names."
-msgstr ""
-"O nome do objeto (também informado como SHA-1)  Para uma abreviação não "
-"ambígua do nome do objeto, adicione `: short`.  Para uma abreviação do nome "
-"do objeto com o comprimento desejado, inclua `:short=<comprimento>`, onde o "
-"comprimento mínimo é `MINIMUM_ABBREV`. O comprimento pode ser excedido para "
-"garantir que os nomes dos objetos sejam únicos."
+msgstr "O nome do objeto (também informado como SHA-1)  Para uma abreviação não ambígua do nome do objeto, adicione `: short`.  Para uma abreviação do nome do objeto com o comprimento desejado, inclua `:short=<comprimento>`, onde o comprimento mínimo é `MINIMUM_ABBREV`. O comprimento pode ser excedido para garantir que os nomes dos objetos sejam únicos."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:139
@@ -27846,16 +25591,7 @@ msgstr "upstream"
 #: en/git-for-each-ref.txt:154
 #, priority:100
 msgid "The name of a local ref which can be considered ``upstream'' from the displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as `refname` above.  Additionally respects `:track` to show \"[ahead N, behind M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:track,nobracket` to show tracking information without brackets (i.e \"ahead N, behind M\")."
-msgstr ""
-"É o nome de uma \"ref\" local que pode ser considerada ``upstream'' da \"ref"
-"\" que está sendo exibida. Respeita `:short`, `:lstrip` e `:rstrip` da mesma "
-"maneira que o `refname` acima.  Além disso, respeita também `:track` para "
-"exibir \"[à frente N, atrás M]\"e `:trackshort` para exibir a versão concisa:"
-" \">\" (à frente), \"<\" (atrás), \"<>\" (à frente e atrás) ou \"=\" (em "
-"sincronia). `:track` também imprime \"[gone]\" sempre que uma \"ref\" "
-"\"upstream\" desconhecida seja encontrada. Acrescente `:track,nobracket` "
-"para exibir as informações de rastreamento sem colchetes (ou seja, \"à "
-"frente de N, atrás de M\")."
+msgstr "É o nome de uma \"ref\" local que pode ser considerada ``upstream'' da \"ref\" que está sendo exibida. Respeita `:short`, `:lstrip` e `:rstrip` da mesma maneira que o `refname` acima.  Além disso, respeita também `:track` para exibir \"[à frente N, atrás M]\"e `:trackshort` para exibir a versão concisa: \">\" (à frente), \"<\" (atrás), \"<>\" (à frente e atrás) ou \"=\" (em sincronia). `:track` também imprime \"[gone]\" sempre que uma \"ref\" \"upstream\" desconhecida seja encontrada. Acrescente `:track,nobracket` para exibir as informações de rastreamento sem colchetes (ou seja, \"à frente de N, atrás de M\")."
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:161
@@ -27879,12 +25615,7 @@ msgstr "push"
 #: en/git-for-each-ref.txt:172
 #, priority:100
 msgid "The name of a local ref which represents the `@{push}` location for the displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. Produces an empty string if no `@{push}` ref is configured."
-msgstr ""
-"O nome de uma \"ref\" local que representa a localização `@{push}` para uma "
-"ref que está sendo exibido. Respeita as opções `:short`, `:lstrip`, `:rstrip`"
-", `:track`, `:trackshort`, `:remotename`, e `:remoteref`; assim como a opção "
-"`upstream`. Produz uma cadeia de caracteres vazia caso nenhum `@{push}` \"ref"
-"\" esteja configurada."
+msgstr "O nome de uma \"ref\" local que representa a localização `@{push}` para uma ref que está sendo exibido. Respeita as opções `:short`, `:lstrip`, `:rstrip`, `:track`, `:trackshort`, `:remotename`, e `:remoteref`; assim como a opção `upstream`. Produz uma cadeia de caracteres vazia caso nenhum `@{push}` \"ref\" esteja configurada."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:173 en/git.txt:376
@@ -27914,18 +25645,7 @@ msgstr "align"
 #: en/git-for-each-ref.txt:197
 #, ignore-ellipsis, priority:100
 msgid "Left-, middle-, or right-align the content between %(align:...) and %(end). The \"align:\" is followed by `width=<width>` and `position=<position>` in any order separated by a comma, where the `<position>` is either left, right or middle, default being left and `<width>` is the total length of the content with alignment. For brevity, the \"width=\" and/or \"position=\" prefixes may be omitted, and bare <width> and <position> used instead.  For instance, `%(align:<width>,<position>)`. If the contents length is more than the width then no alignment is performed. If used with `--quote` everything in between %(align:...) and %(end) is quoted, but if nested then only the topmost level performs quoting."
-msgstr ""
-"Alinhe o conteúdo à esquerda (Left-), ao meio (Middle-) ou à direita entre "
-"%(align:...) e %(end). O \"align:\" é seguido por `width=<largura>` e "
-"`position=<posição>` em qualquer ordem separado por vírgula, onde a "
-"`<posição>` é esquerda, direita ou meio, a predefinição retorna para "
-"esquerda e `<largura>` é o comprimento total do conteúdo com alinhamento. "
-"Por questões de brevidade, os prefixos \"width=\" ou \"position=\" podem ser "
-"omitidos, podendo ser utilizados <largura> e <posição> apenas.  Por exemplo, "
-"`%(align:<largura>,<posição>)`. Caso o comprimento do conteúdo seja maior "
-"que a largura, nenhum alinhamento será realizado. Se utilizado com `--quote`"
-", tudo entre %(align:...) e %(end) será citado, porém se aninhado, a citação "
-"ocorrerá apenas no nível mais alto."
+msgstr "Alinhe o conteúdo à esquerda (Left-), ao meio (Middle-) ou à direita entre %(align:...) e %(end). O \"align:\" é seguido por `width=<largura>` e `position=<posição>` em qualquer ordem separado por vírgula, onde a `<posição>` é esquerda, direita ou meio, a predefinição retorna para esquerda e `<largura>` é o comprimento total do conteúdo com alinhamento. Por questões de brevidade, os prefixos \"width=\" ou \"position=\" podem ser omitidos, podendo ser utilizados <largura> e <posição> apenas.  Por exemplo, `%(align:<largura>,<posição>)`. Caso o comprimento do conteúdo seja maior que a largura, nenhum alinhamento será realizado. Se utilizado com `--quote`, tudo entre %(align:...) e %(end) será citado, porém se aninhado, a citação ocorrerá apenas no nível mais alto."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:198
@@ -27937,16 +25657,7 @@ msgstr "if"
 #: en/git-for-each-ref.txt:210
 #, ignore-ellipsis, priority:100
 msgid "Used as %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end).  If there is an atom with value or string literal after the %(if) then everything after the %(then) is printed, else if the %(else) atom is used, then everything after %(else) is printed. We ignore space when evaluating the string before %(then), this is useful when we use the %(HEAD) atom which prints either \"*\" or \" \" and we want to apply the 'if' condition only on the 'HEAD' ref.  Append \":equals=<string>\" or \":notequals=<string>\" to compare the value between the %(if:...) and %(then) atoms with the given string."
-msgstr ""
-"Utilizado como %(if)...%(then)...%(end) ou %(if)...%(then)...%(else)...%(end)"
-".  Caso haja um átomo com um valor ou uma cadeia de caracteres literal após "
-"o %(if), tudo após o %(then) será impresso; caso contrário, caso o átomo em "
-"%(else) seja utilizado, tudo será impresso após o %(else). Ignoramos o "
-"espaço ao avaliar uma cadeia de caracteres antes de %(then), isso é útil "
-"quando usamos o átomo %(HEAD) que imprime \"*\" ou \" \" e queremos aplicar "
-"a condição 'if' apenas no ref 'HEAD'.  Anexar \":equals=<texto>\" ou \""
-":notequals=<texto>\" para comparar o valor entre os átomos de %(if:...) e "
-"%(then) com a sequência especificada."
+msgstr "Utilizado como %(if)...%(then)...%(end) ou %(if)...%(then)...%(else)...%(end).  Caso haja um átomo com um valor ou uma cadeia de caracteres literal após o %(if), tudo após o %(then) será impresso; caso contrário, caso o átomo em %(else) seja utilizado, tudo será impresso após o %(else). Ignoramos o espaço ao avaliar uma cadeia de caracteres antes de %(then), isso é útil quando usamos o átomo %(HEAD) que imprime \"*\" ou \" \" e queremos aplicar a condição 'if' apenas no ref 'HEAD'.  Anexar \":equals=<texto>\" ou \":notequals=<texto>\" para comparar o valor entre os átomos de %(if:...) e %(then) com a sequência especificada."
 
 #. type: Labeled list
 #: en/git-for-each-ref.txt:211
@@ -27970,10 +25681,7 @@ msgstr "worktreepath"
 #: en/git-for-each-ref.txt:221
 #, priority:100
 msgid "The absolute path to the worktree in which the ref is checked out, if it is checked out in any linked worktree. Empty string otherwise."
-msgstr ""
-"O caminho absoluto para a árvore de trabalho onde a \"ref\" foi averiguada, "
-"caso estiveja em qualquer árvore de trabalho vinculada. Caso contrário, uma "
-"sequência vazia."
+msgstr "O caminho absoluto para a árvore de trabalho onde a \"ref\" foi averiguada, caso estiveja em qualquer árvore de trabalho vinculada. Caso contrário, uma sequência vazia."
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:225
@@ -27991,31 +25699,13 @@ msgstr "Para os objetos commit e tag, os campos especiais `creatordate` e `creat
 #: en/git-for-each-ref.txt:234
 #, priority:100
 msgid "Fields that have name-email-date tuple as its value (`author`, `committer`, and `tagger`) can be suffixed with `name`, `email`, and `date` to extract the named component."
-msgstr ""
-"Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`"
-", `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` "
-"para extrair o componente informado."
+msgstr "Os campos que possuam um termo ordenado nome-email-data como o valor (`autor`, `committer` e `tagger`) podem ser sufixados com `nome`, `email` e `data` para extrair o componente informado."
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:247
 #, priority:100
 msgid "The complete message in a commit and tag object is `contents`.  Its first line is `contents:subject`, where subject is the concatenation of all lines of the commit message up to the first blank line.  The next line is `contents:body`, where body is all of the lines after the first blank line.  The optional GPG signature is `contents:signature`.  The first `N` lines of the message is obtained using `contents:lines=N`.  Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as `trailers` (or by using the historical alias `contents:trailers`).  Non-trailer lines from the trailer block can be omitted with `trailers:only`. Whitespace-continuations can be removed from trailers so that each trailer appears on a line by itself with its full content with `trailers:unfold`. Both can be used together as `trailers:unfold,only`."
-msgstr ""
-"A mensagem completa em um objeto commit e tag são `conteúdos`.  A sua "
-"primeira linha é `contents:subject` onde \"subject\" (assunto) é a "
-"concatenação de todas as linhas da mensagem do commit até a primeira linha "
-"em branco.  A próxima linha é `contents:body`, onde \"body\" (corpo da "
-"mensagem) são todas as linhas após a primeira linha em branco.  A assinatura "
-"opcional GPG é `contents:signature`.  As primeiras `N` linhas da mensagem "
-"são obtidas usando `contents:lines=N`.  Além disso, os trailers "
-"interpretados através do linkgit:git-interpret-trailers[1] são obtidos como `"
-"caractere de resposta` (ou utilizando o alias do histórico "
-"`contents:trailers`).  As linhas que não forem caractere de resposta do "
-"bloco dos caracteres de resposta, podem ser omitidos com `trailers:only`. As "
-"continuações dos espaços podem ser removidos dos caracteres de resposta, "
-"para que cada caractere apareça em uma linha por si só e com o seu conteúdo "
-"completo, utilizando `trailers:unfold`. Ambos podem ser utilizados juntos "
-"como `trailers:unfold,only`."
+msgstr "A mensagem completa em um objeto commit e tag são `conteúdos`.  A sua primeira linha é `contents:subject` onde \"subject\" (assunto) é a concatenação de todas as linhas da mensagem do commit até a primeira linha em branco.  A próxima linha é `contents:body`, onde \"body\" (corpo da mensagem) são todas as linhas após a primeira linha em branco.  A assinatura opcional GPG é `contents:signature`.  As primeiras `N` linhas da mensagem são obtidas usando `contents:lines=N`.  Além disso, os trailers interpretados através do linkgit:git-interpret-trailers[1] são obtidos como `caractere de resposta` (ou utilizando o alias do histórico `contents:trailers`).  As linhas que não forem caractere de resposta do bloco dos caracteres de resposta, podem ser omitidos com `trailers:only`. As continuações dos espaços podem ser removidos dos caracteres de resposta, para que cada caractere apareça em uma linha por si só e com o seu conteúdo completo, utilizando `trailers:unfold`. Ambos podem ser utilizados juntos como `trailers:unfold,only`."
 
 #. type: Plain text
 #: en/git-for-each-ref.txt:251
@@ -28355,27 +26045,13 @@ msgstr "A primeira regra tem precedência no caso de um único `<commit>`.  Para
 #: en/git-format-patch.txt:65
 #, priority:100
 msgid "By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the `--numbered-files` option, the output file names will only be numbers, without the first line of the commit appended.  The names of the output files are printed to standard output, unless the `--stdout` option is specified."
-msgstr ""
-"É predefinido que cada arquivo de saída seja numerado sequencialmente a "
-"partir de 1 e usa a primeira linha da mensagem do commit (trabalhada para a "
-"segurança do pathname) como o pathname. Com a opção `--numbered-files`, os "
-"nomes dos arquivos na saída serão apenas números, sem a primeira linha "
-"anexada do commit.  Os nomes dos arquivos na saída são impressos na saída "
-"padrão a menos que a opção `--stdout` seja utilizada."
+msgstr "É predefinido que cada arquivo de saída seja numerado sequencialmente a partir de 1 e usa a primeira linha da mensagem do commit (trabalhada para a segurança do pathname) como o pathname. Com a opção `--numbered-files`, os nomes dos arquivos na saída serão apenas números, sem a primeira linha anexada do commit.  Os nomes dos arquivos na saída são impressos na saída padrão a menos que a opção `--stdout` seja utilizada."
 
 #. type: Plain text
 #: en/git-format-patch.txt:73
 #, priority:100
 msgid "If `-o` is specified, output files are created in <dir>.  Otherwise they are created in the current working directory. The default path can be set with the `format.outputDirectory` configuration option.  The `-o` option takes precedence over `format.outputDirectory`.  To store patches in the current working directory even when `format.outputDirectory` points elsewhere, use `-o .`. All directory components will be created."
-msgstr ""
-"Caso a opção `-o` seja utilizada, os arquivos gerados serão criados no "
-"<dir>.  Caso contrário, eles serão criados no diretório de trabalho atual. O "
-"caminho predefinido pode ser definido com a opção de configuração `format."
-"outputDirectory`.  A opção `-o` tem precedência sobre a opção de "
-"configuração `format.outputDirectory`.  Para armazenar as correções no "
-"diretório de trabalho atual, mesmo quando a opção de configuração `format."
-"outputDirectory` apontar para um outro lugar, utilize `-o .`. Todos os "
-"componentes do diretório serão criados."
+msgstr "Caso a opção `-o` seja utilizada, os arquivos gerados serão criados no <dir>.  Caso contrário, eles serão criados no diretório de trabalho atual. O caminho predefinido pode ser definido com a opção de configuração `format.outputDirectory`.  A opção `-o` tem precedência sobre a opção de configuração `format.outputDirectory`.  Para armazenar as correções no diretório de trabalho atual, mesmo quando a opção de configuração `format.outputDirectory` apontar para um outro lugar, utilize `-o .`. Todos os componentes do diretório serão criados."
 
 #. type: Plain text
 #: en/git-format-patch.txt:77
@@ -28501,9 +26177,7 @@ msgstr "--stdout"
 #: en/git-format-patch.txt:129
 #, priority:100
 msgid "Print all commits to the standard output in mbox format, instead of creating a file for each one."
-msgstr ""
-"Imprima todos os commits na saída padrão no formato mbox em vez de criar um "
-"arquivo individual para cada um."
+msgstr "Imprima todos os commits na saída padrão no formato mbox em vez de criar um arquivo individual para cada um."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:130
@@ -28563,23 +26237,13 @@ msgstr "Controla a adição dos cabeçalhos `In-Reply-To` (Em resposta a) e `Ref
 #: en/git-format-patch.txt:156
 #, priority:100
 msgid "The optional <style> argument can be either `shallow` or `deep`.  'shallow' threading makes every mail a reply to the head of the series, where the head is chosen from the cover letter, the `--in-reply-to`, and the first patch mail, in this order.  'deep' threading makes every mail a reply to the previous one."
-msgstr ""
-"O argumento opcional <estilo> pode ser `shallow` (superficial) ou `deep` "
-"(profundo).  O argumento 'shallow' (superficial) faz com que todo o e-mail "
-"respondido para o cabeçalho da série onde o cabeçalho é selecionado nessa "
-"ordem, pela carta de apresentação, pelo `--in-reply-to` e pelo primeiro "
-"patch.  O argumento 'deep' (profundo) faz com que cada e-mail seja uma uma "
-"resposta ao anterior."
+msgstr "O argumento opcional <estilo> pode ser `shallow` (superficial) ou `deep` (profundo).  O argumento 'shallow' (superficial) faz com que todo o e-mail respondido para o cabeçalho da série onde o cabeçalho é selecionado nessa ordem, pela carta de apresentação, pelo `--in-reply-to` e pelo primeiro patch.  O argumento 'deep' (profundo) faz com que cada e-mail seja uma uma resposta ao anterior."
 
 #. type: Plain text
 #: en/git-format-patch.txt:160
 #, priority:100
 msgid "The default is `--no-thread`, unless the `format.thread` configuration is set.  If `--thread` is specified without a style, it defaults to the style specified by `format.thread` if any, or else `shallow`."
-msgstr ""
-"A predefinição é `--no-thread`, a menos que a configuração `format.thread` "
-"esteja definida.  Caso `--thread` seja utilizado sem um estilo, a "
-"predefinição retorna para o estilo determinado na opção de configuração "
-"`format.thread` caso exista ou então, `shallow` (superficial)."
+msgstr "A predefinição é `--no-thread`, a menos que a configuração `format.thread` esteja definida.  Caso `--thread` seja utilizado sem um estilo, a predefinição retorna para o estilo determinado na opção de configuração `format.thread` caso exista ou então, `shallow` (superficial)."
 
 #. type: Plain text
 #: en/git-format-patch.txt:164
@@ -28597,10 +26261,7 @@ msgstr "--in-reply-to=<id-da-mensagem>"
 #: en/git-format-patch.txt:169
 #, priority:100
 msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given <message id>, which avoids breaking threads to provide a new patch series."
-msgstr ""
-"Faça com que o primeiro e-mail (ou todos os emails com `--no-thread`) "
-"apareça como uma resposta ao <id da mensagem> informado, o que evita quebras "
-"dos encadeamentos provendo uma nova série dos patches."
+msgstr "Faça com que o primeiro e-mail (ou todos os emails com `--no-thread`) apareça como uma resposta ao <id da mensagem> informado, o que evita quebras dos encadeamentos provendo uma nova série dos patches."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:170
@@ -28612,11 +26273,7 @@ msgstr "--ignore-if-in-upstream"
 #: en/git-format-patch.txt:176
 #, priority:100
 msgid "Do not include a patch that matches a commit in <until>..<since>.  This will examine all patches reachable from <since> but not from <until> and compare them with the patches being generated, and any patch that matches is ignored."
-msgstr ""
-"Não inclua um patch que coincida a um commit em <until>..<since> (até..desde)"
-".  Examina todos os patches acessíveis a partir de <since> (desde), mas não "
-"a partir de <until> (até), os comparará com os patches que estão sendo "
-"gerados e qualquer patch coincidente será ignorado."
+msgstr "Não inclua um patch que coincida a um commit em <until>..<since> (até..desde).  Examina todos os patches acessíveis a partir de <since> (desde), mas não a partir de <until> (até), os comparará com os patches que estão sendo gerados e qualquer patch coincidente será ignorado."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:177
@@ -28664,10 +26321,7 @@ msgstr "--subject-prefix=<subject prefix>"
 #: en/git-format-patch.txt:202
 #, priority:100
 msgid "Instead of the standard '[PATCH]' prefix in the subject line, instead use '[<subject prefix>]'. This allows for useful naming of a patch series, and can be combined with the `--numbered` option."
-msgstr ""
-"Em vez do prefixo '[PATCH]' predefinido na linha assunto, utilize '[<prefixo "
-"do assunto>]'. Permite a nomeação útil de uma série de patches e pode ser "
-"combinado com a opção `--numbered`."
+msgstr "Em vez do prefixo '[PATCH]' predefinido na linha assunto, utilize '[<prefixo do assunto>]'. Permite a nomeação útil de uma série de patches e pode ser combinado com a opção `--numbered`."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:203
@@ -28697,13 +26351,7 @@ msgstr "--reroll-count=<n>"
 #: en/git-format-patch.txt:216
 #, priority:100
 msgid "Mark the series as the <n>-th iteration of the topic. The output filenames have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, but configurable via the `--subject-prefix` option) has ` v<n>` appended to it.  E.g.  `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
-msgstr ""
-"Marque a série como a <n>-ésima iteração do tópico. Os nomes dos arquivos na "
-"saída têm `v<n>` anexado a eles e o prefixo do assunto (a predefinição "
-"retorna para \"PATCH\", porém pode ser alterado através da opção `--subject-"
-"prefix`).  Por exemplo. `--reroll-count=4` pode produzir o arquivo `v4-0001"
-"-add-makefile.patch` que contém \"Assunto: [PATCH v4 1/20] Adicione o "
-"makefile\"."
+msgstr "Marque a série como a <n>-ésima iteração do tópico. Os nomes dos arquivos na saída têm `v<n>` anexado a eles e o prefixo do assunto (a predefinição retorna para \"PATCH\", porém pode ser alterado através da opção `--subject-prefix`).  Por exemplo. `--reroll-count=4` pode produzir o arquivo `v4-0001-add-makefile.patch` que contém \"Assunto: [PATCH v4 1/20] Adicione o makefile\"."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:217
@@ -28745,12 +26393,7 @@ msgstr "--from=<ident>"
 #: en/git-format-patch.txt:236
 #, priority:100
 msgid "Use `ident` in the `From:` header of each commit email. If the author ident of the commit is not textually identical to the provided `ident`, place a `From:` header in the body of the message with the original author. If no `ident` is given, use the committer ident."
-msgstr ""
-"Utilize `ident` (identidade) no cabeçalho `De:` de cada email do commit. "
-"Caso o `ident` do autor do commit não seja textualmente idêntica ao `ident` "
-"informado, coloque um cabeçalho `De:` no corpo da mensagem com o autor "
-"original. Caso nenhum `ident` seja informado, utilize o `ident` de quem fez "
-"o commit."
+msgstr "Utilize `ident` (identidade) no cabeçalho `De:` de cada email do commit. Caso o `ident` do autor do commit não seja textualmente idêntica ao `ident` informado, coloque um cabeçalho `De:` no corpo da mensagem com o autor original. Caso nenhum `ident` seja informado, utilize o `ident` de quem fez o commit."
 
 #. type: Plain text
 #: en/git-format-patch.txt:243
@@ -28798,11 +26441,7 @@ msgstr "--no-encode-email-headers"
 #: en/git-format-patch.txt:263
 #, priority:100
 msgid "Encode email headers that have non-ASCII characters with \"Q-encoding\" (described in RFC 2047), instead of outputting the headers verbatim. Defaults to the value of the `format.encodeEmailHeaders` configuration variable."
-msgstr ""
-"Codifique os cabeçalhos do e-mail que possuam caracteres não ASCII com \"Q-"
-"encoding\" (descrito na RFC 2047), em vez de emitir os cabeçalhos de forma "
-"literal. A predefinição retorna para o valor da variável de configuração "
-"`format.encodeEmailHeaders`."
+msgstr "Codifique os cabeçalhos do e-mail que possuam caracteres não ASCII com \"Q-encoding\" (descrito na RFC 2047), em vez de emitir os cabeçalhos de forma literal. A predefinição retorna para o valor da variável de configuração `format.encodeEmailHeaders`."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:264
@@ -28814,14 +26453,7 @@ msgstr "--interdiff=<anterior>"
 #: en/git-format-patch.txt:272
 #, priority:100
 msgid "As a reviewer aid, insert an interdiff into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted. `previous` is a single revision naming the tip of the previous series which shares a common base with the series being formatted (for example `git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2`)."
-msgstr ""
-"Como um auxílio ao revisor, insira um \"interdiff\" na carta de apresentação "
-"ou como um comentário único do patch de uma série de 1, exibindo as "
-"diferenças entre a versão anterior da série do patch e a série atualmente "
-"sendo formatada. `previous` (anterior) é uma única revisão que informa a "
-"ponta da série anterior que compartilha uma base comum com a série que está "
-"sendo formatada (`git format-patch --cover-letter --interdiff=feature/v1 -3 "
-"feature/v2` por exemplo)."
+msgstr "Como um auxílio ao revisor, insira um \"interdiff\" na carta de apresentação ou como um comentário único do patch de uma série de 1, exibindo as diferenças entre a versão anterior da série do patch e a série atualmente sendo formatada. `previous` (anterior) é uma única revisão que informa a ponta da série anterior que compartilha uma base comum com a série que está sendo formatada (`git format-patch --cover-letter --interdiff=feature/v1 -3 feature/v2` por exemplo)."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:273
@@ -28833,17 +26465,7 @@ msgstr "--range-diff=<anterior>"
 #: en/git-format-patch.txt:284
 #, priority:100
 msgid "As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1])  into the cover letter, or as commentary of the lone patch of a 1-patch series, showing the differences between the previous version of the patch series and the series currently being formatted.  `previous` can be a single revision naming the tip of the previous series if it shares a common base with the series being formatted (for example `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of the series are disjoint (for example `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
-msgstr ""
-"Como um assistente revisor, insira um \"range-diff\" (consulte linkgit:git-"
-"range-diff[1]) na carta de apresentação ou como um comentário do patch "
-"solitário da série de 1-patch, exibindo as diferenças entre a versão "
-"anterior da série de patches e a série atualmente sendo formatada.  O "
-"`previous` pode ser uma única revisão informando a ponta da série anterior, "
-"caso ela compartilhe uma base comum com a série que está sendo formatada ("
-"como por exemplo,o comando `git format-patch --cover-letter --range-diff="
-"feature/v1 -3 feature/v2`), ou um intervalo das revisões caso as duas "
-"versões da série sejam separadas (como por exemplo, `git format-patch "
-"--cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
+msgstr "Como um assistente revisor, insira um \"range-diff\" (consulte linkgit:git-range-diff[1]) na carta de apresentação ou como um comentário do patch solitário da série de 1-patch, exibindo as diferenças entre a versão anterior da série de patches e a série atualmente sendo formatada.  O `previous` pode ser uma única revisão informando a ponta da série anterior, caso ela compartilhe uma base comum com a série que está sendo formatada (como por exemplo,o comando `git format-patch --cover-letter --range-diff=feature/v1 -3 feature/v2`), ou um intervalo das revisões caso as duas versões da série sejam separadas (como por exemplo, `git format-patch --cover-letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
 
 #. type: Plain text
 #: en/git-format-patch.txt:289
@@ -28861,11 +26483,7 @@ msgstr "--creation-factor=<percent>"
 #: en/git-format-patch.txt:295
 #, priority:100
 msgid "Used with `--range-diff`, tweak the heuristic which matches up commits between the previous and current series of patches by adjusting the creation/deletion cost fudge factor. See linkgit:git-range-diff[1])  for details."
-msgstr ""
-"Ao ser utilizado com a opção `--range-diff`, ajuste a heurística que "
-"coincida com os commits entre as séries de patches anteriores e atuais, "
-"ajustando o custo do fator de correção entre criação/exclusão. (Para mais "
-"detalhes, consulte linkgit:git-range-diff[1])."
+msgstr "Ao ser utilizado com a opção `--range-diff`, ajuste a heurística que coincida com os commits entre as séries de patches anteriores e atuais, ajustando o custo do fator de correção entre criação/exclusão. (Para mais detalhes, consulte linkgit:git-range-diff[1])."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:296 en/pretty-options.txt:60
@@ -28895,9 +26513,7 @@ msgstr "É esperado que seja utilizado para escrever uma explicação de suporte
 #: en/git-format-patch.txt:311
 #, priority:100
 msgid "The default is `--no-notes`, unless the `format.notes` configuration is set."
-msgstr ""
-"A predefinição é `--no-notes`, a menos que a configuração `format.notes` "
-"esteja definida."
+msgstr "A predefinição é `--no-notes`, a menos que a configuração `format.notes` esteja definida."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:312
@@ -28909,11 +26525,7 @@ msgstr "--[no-]signature=<assinatura>"
 #: en/git-format-patch.txt:317
 #, priority:100
 msgid "Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the signature option is omitted the signature defaults to the Git version number."
-msgstr ""
-"Adicione uma assinatura em cada mensagem produzida. De acordo com a RFC "
-"3676, a assinatura é separada do corpo por uma linha com '-- '. Caso a opção "
-"da assinatura seja omitida, a predefinição da assinatura retorna para o "
-"número da versão do Git."
+msgstr "Adicione uma assinatura em cada mensagem produzida. De acordo com a RFC 3676, a assinatura é separada do corpo por uma linha com '-- '. Caso a opção da assinatura seja omitida, a predefinição da assinatura retorna para o número da versão do Git."
 
 #. type: Labeled list
 #: en/git-format-patch.txt:318
@@ -29003,12 +26615,7 @@ msgstr "Exiba o progresso dos relatórios no stderr à medida que os patches sã
 #: en/git-format-patch.txt:368
 #, priority:100
 msgid "You can specify extra mail header lines to be added to each message, defaults for the subject prefix and file suffix, number patches when outputting more than one patch, add \"To:\" or \"Cc:\" headers, configure attachments, change the patch output directory, and sign off patches with configuration variables."
-msgstr ""
-"Você pode definir linhas extras no cabeçalho do e-mail que serão adicionadas "
-"em cada mensagem, predefinições para o prefixo do assunto e sufixo do "
-"arquivo, a quantidade das correções ao emitir mais de um patch, adicionar os "
-"cabeçalhos \"Para:\" ou \"Cc:\", configurar os anexos, alterar diretório de "
-"saída par ao patch e assinar os patches com variáveis de configuração."
+msgstr "Você pode definir linhas extras no cabeçalho do e-mail que serão adicionadas em cada mensagem, predefinições para o prefixo do assunto e sufixo do arquivo, a quantidade das correções ao emitir mais de um patch, adicionar os cabeçalhos \"Para:\" ou \"Cc:\", configurar os anexos, alterar diretório de saída par ao patch e assinar os patches com variáveis de configuração."
 
 #. type: delimited block -
 #: en/git-format-patch.txt:382
@@ -29028,8 +26635,7 @@ msgid ""
 "\tcoverFromDescription = auto\n"
 msgstr ""
 "[format]\n"
-"\theaders = \"Organização: git-foo\\n"
-"\"\n"
+"\theaders = \"Organização: git-foo\\n\"\n"
 "\tsubjectPrefix = CHANGE\n"
 "\tsuffix = .txt\n"
 "\tnumbered = auto\n"
@@ -29153,9 +26759,7 @@ msgstr "Verificando o corrompimento dos patches"
 #: en/git-format-patch.txt:446
 #, priority:100
 msgid "Many mailers if not set up properly will corrupt whitespace.  Here are two common types of corruption:"
-msgstr ""
-"Muitos clientes de e-mail se não configurados corretamente irão corromper os "
-"espaços.  Aqui estão dois tipos comuns de corrompimento:"
+msgstr "Muitos clientes de e-mail se não configurados corretamente irão corromper os espaços.  Aqui estão dois tipos comuns de corrompimento:"
 
 #. type: Plain text
 #: en/git-format-patch.txt:448
@@ -29473,15 +27077,7 @@ msgstr "INFORMAÇÃO BASE DA ÁRVORE"
 #: en/git-format-patch.txt:622
 #, priority:100
 msgid "The base tree information block is used for maintainers or third party testers to know the exact state the patch series applies to. It consists of the 'base commit', which is a well-known commit that is part of the stable part of the project history everybody else works off of, and zero or more 'prerequisite patches', which are well-known patches in flight that is not yet part of the 'base commit' that need to be applied on top of 'base commit' in topological order before the patches can be applied."
-msgstr ""
-"O bloco de informação da base da árvore é utilizado para que os mantenedores "
-"ou os testadores de terceiros saibam a condição exata ao qual a série de "
-"patches se aplicam. É a 'base do commit', é um commit informado que faz "
-"parte da parte estável do histórico do projeto onde todos os outros usam "
-"para trabalhar. Zero ou mais 'patches de pré-requisição' são patches "
-"informados em transição, porém ainda não fazem parte da 'base do commit' que "
-"precisam ser aplicados sobre o cume da 'base do commit' em ordem topológica "
-"antes que os patches possam ser aplicados."
+msgstr "O bloco de informação da base da árvore é utilizado para que os mantenedores ou os testadores de terceiros saibam a condição exata ao qual a série de patches se aplicam. É a 'base do commit', é um commit informado que faz parte da parte estável do histórico do projeto onde todos os outros usam para trabalhar. Zero ou mais 'patches de pré-requisição' são patches informados em transição, porém ainda não fazem parte da 'base do commit' que precisam ser aplicados sobre o cume da 'base do commit' em ordem topológica antes que os patches possam ser aplicados."
 
 #. type: Plain text
 #: en/git-format-patch.txt:628
@@ -29493,10 +27089,7 @@ msgstr "A 'base do commit' é exibido como \"base-commit:\" seguido por 40 hexad
 #: en/git-format-patch.txt:632
 #, priority:100
 msgid "Imagine that on top of the public commit P, you applied well-known patches X, Y and Z from somebody else, and then built your three-patch series A, B, C, the history would be like:"
-msgstr ""
-"Imagine que, em cima do commit público P, foi aplicado os patches informados "
-"X, Y e Z de outra pessoa e construiu a sua série de três patches A, B, C, o "
-"histórico ficaria assim:"
+msgstr "Imagine que, em cima do commit público P, foi aplicado os patches informados X, Y e Z de outra pessoa e construiu a sua série de três patches A, B, C, o histórico ficaria assim:"
 
 #. type: delimited block .
 #: en/git-format-patch.txt:635
@@ -29654,9 +27247,7 @@ msgstr "'git fsck-objects' ...\n"
 #: en/git-fsck-objects.txt:19
 #, priority:100
 msgid "This is a synonym for linkgit:git-fsck[1].  Please refer to the documentation of that command."
-msgstr ""
-"Este é um sinônimo para o comando linkgit:git-fsck[1].  Consulte a "
-"documentação para obter mais referências sobre este comando."
+msgstr "Este é um sinônimo para o comando linkgit:git-fsck[1].  Consulte a documentação para obter mais referências sobre este comando."
 
 #. type: Title =
 #: en/git-fsck.txt:2
@@ -29694,11 +27285,7 @@ msgstr "Um objeto a ser tratado como a cabeça de um rastreamento de inacessibil
 #: en/git-fsck.txt:29
 #, priority:100
 msgid "If no objects are given, 'git fsck' defaults to using the index file, all SHA-1 references in `refs` namespace, and all reflogs (unless --no-reflogs is given) as heads."
-msgstr ""
-"Caso nenhum objeto seja informado, a predefinição do comando 'git fsck' "
-"retorna para o arquivo do índice, todas as referências SHA-1 no espaço de "
-"nomes `refs` e todos os reflogs (a menos que a opção `--no-reflogs` seja "
-"utilizada) serão utilizados como cabeçalhos."
+msgstr "Caso nenhum objeto seja informado, a predefinição do comando 'git fsck' retorna para o arquivo do índice, todas as referências SHA-1 no espaço de nomes `refs` e todos os reflogs (a menos que a opção `--no-reflogs` seja utilizada) serão utilizados como cabeçalhos."
 
 #. type: Labeled list
 #: en/git-fsck.txt:30
@@ -29758,11 +27345,7 @@ msgstr "--no-reflogs"
 #: en/git-fsck.txt:53
 #, priority:100
 msgid "Do not consider commits that are referenced only by an entry in a reflog to be reachable.  This option is meant only to search for commits that used to be in a ref, but now aren't, but are still in that corresponding reflog."
-msgstr ""
-"Para serem acessíveis, não considere que os commits sejam referenciados "
-"apenas por uma entrada em um \"reflog\".  Esta opção serve apenas para "
-"procurar commits que costumavam estar em um \"ref\", mas agora não estão "
-"mais, mas ainda assim em um reflog equivalente."
+msgstr "Para serem acessíveis, não considere que os commits sejam referenciados apenas por uma entrada em um \"reflog\".  Esta opção serve apenas para procurar commits que costumavam estar em um \"ref\", mas agora não estão mais, mas ainda assim em um reflog equivalente."
 
 #. type: Labeled list
 #: en/git-fsck.txt:54
@@ -29786,24 +27369,13 @@ msgstr "--connectivity-only"
 #: en/git-fsck.txt:72
 #, priority:100
 msgid "Check only the connectivity of reachable objects, making sure that any objects referenced by a reachable tag, commit, or tree is present. This speeds up the operation by avoiding reading blobs entirely (though it does still check that referenced blobs exist). This will detect corruption in commits and trees, but not do any semantic checks (e.g., for format errors). Corruption in blob objects will not be detected at all."
-msgstr ""
-"Verifique apenas a conectividade dos objetos acessíveis, certificando-se de "
-"que todos os objetos referenciados por uma tag, commit ou árvore acessível "
-"estejam presentes. Isso acelera a operação evitando a leitura completa das "
-"bolhas (embora ainda verifique caso existam as bolhas referenciadas). Isso "
-"detectará a corrupção nos commits e nas árvores, porém não fará nenhuma "
-"verificação semântica (como por exemplo, erros no formato). A corrupção nos "
-"objetos bolha não será detectada de forma alguma."
+msgstr "Verifique apenas a conectividade dos objetos acessíveis, certificando-se de que todos os objetos referenciados por uma tag, commit ou árvore acessível estejam presentes. Isso acelera a operação evitando a leitura completa das bolhas (embora ainda verifique caso existam as bolhas referenciadas). Isso detectará a corrupção nos commits e nas árvores, porém não fará nenhuma verificação semântica (como por exemplo, erros no formato). A corrupção nos objetos bolha não será detectada de forma alguma."
 
 #. type: Plain text
 #: en/git-fsck.txt:76
 #, priority:100
 msgid "Unreachable tags, commits, and trees will also be accessed to find the tips of dangling segments of history. Use `--no-dangling` if you don't care about this output and want to speed it up further."
-msgstr ""
-"Tags, confirmações e árvores inacessíveis também serão acessadas para "
-"encontrar o topo dos segmentos pendentes na história. Use a opção `--no-"
-"dangling` caso não se importe com esta saída e queira acelerar um pouco as "
-"coisas ainda mais."
+msgstr "Tags, confirmações e árvores inacessíveis também serão acessadas para encontrar o topo dos segmentos pendentes na história. Use a opção `--no-dangling` caso não se importe com esta saída e queira acelerar um pouco as coisas ainda mais."
 
 #. type: Labeled list
 #: en/git-fsck.txt:77 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
@@ -29845,10 +27417,7 @@ msgstr "--name-objects"
 #: en/git-fsck.txt:99
 #, priority:100
 msgid "When displaying names of reachable objects, in addition to the SHA-1 also display a name that describes *how* they are reachable, compatible with linkgit:git-rev-parse[1], e.g.  `HEAD@{1234567890}~25^2:src/`."
-msgstr ""
-"Ao exibir os nomes dos objetos acessíveis além do SHA-1 que descrevam *como* "
-"eles são acessíveis, é compatível com linkgit:git-rev-parse[1], "
-"`HEAD@{1234567890}~25^2:src/` por exemplo."
+msgstr "Ao exibir os nomes dos objetos acessíveis além do SHA-1 que descrevam *como* eles são acessíveis, é compatível com linkgit:git-rev-parse[1], `HEAD@{1234567890}~25^2:src/` por exemplo."
 
 #. type: Plain text
 #: en/git-fsck.txt:106
@@ -29950,9 +27519,7 @@ msgstr "hash mismatch <objeto>"
 #: en/git-fsck.txt:160
 #, priority:100
 msgid "The database has an object whose hash doesn't match the object database value.  This indicates a serious data integrity problem."
-msgstr ""
-"O banco de dados tem um objeto cujo hash não coincide com o valor do banco "
-"de dados do objeto.  Isso indica um sério problema na integridade dos dados."
+msgstr "O banco de dados tem um objeto cujo hash não coincide com o valor do banco de dados do objeto.  Isso indica um sério problema na integridade dos dados."
 
 #. type: Title -
 #: en/git-fsck.txt:162 en/git.txt:408
@@ -30012,44 +27579,25 @@ msgstr "git-gc - Limpa os arquivos desnecessários e otimiza o repositório loca
 #: en/git-gc.txt:13
 #, no-wrap, priority:100
 msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
-msgstr ""
-"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<data> | --no-prune] "
-"[--force] [--keep-largest-pack]\n"
+msgstr "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<data> | --no-prune] [--force] [--keep-largest-pack]\n"
 
 #. type: Plain text
 #: en/git-gc.txt:22
 #, priority:100
 msgid "Runs a number of housekeeping tasks within the current repository, such as compressing file revisions (to reduce disk space and increase performance), removing unreachable objects which may have been created from prior invocations of 'git add', packing refs, pruning reflog, rerere metadata or stale working trees. May also update ancillary indexes such as the commit-graph."
-msgstr ""
-"Executa várias tarefas de limpeza no repositório atual, como a compactação "
-"dos arquivos das revisões (para reduzir o espaço em disco e aumentar o "
-"desempenho), a remoção dos objetos inacessíveis que podem ter sido criados a "
-"partir de invocações anteriores ao 'git add', pacotes refs, a remoção do "
-"\"reflog\", metadados reerere ou árvores de trabalho obsoletas. Pode também "
-"atualizar os índices auxiliares, como o grafo do commit."
+msgstr "Executa várias tarefas de limpeza no repositório atual, como a compactação dos arquivos das revisões (para reduzir o espaço em disco e aumentar o desempenho), a remoção dos objetos inacessíveis que podem ter sido criados a partir de invocações anteriores ao 'git add', pacotes refs, a remoção do \"reflog\", metadados reerere ou árvores de trabalho obsoletas. Pode também atualizar os índices auxiliares, como o grafo do commit."
 
 #. type: Plain text
 #: en/git-gc.txt:27
 #, priority:100
 msgid "When common porcelain operations that create objects are run, they will check whether the repository has grown substantially since the last maintenance, and if so run `git gc` automatically. See `gc.auto` below for how to disable this behavior."
-msgstr ""
-"Quando as operações porcelana tradicionais que criam os objetos são "
-"executadas, elas verificam se o repositório cresceu substancialmente desde a "
-"última manutenção e se for o caso, executam o o comando `git gc` "
-"automaticamente. Consulte `gc.auto` abaixo para saber como desativar este "
-"comportamento."
+msgstr "Quando as operações porcelana tradicionais que criam os objetos são executadas, elas verificam se o repositório cresceu substancialmente desde a última manutenção e se for o caso, executam o o comando `git gc` automaticamente. Consulte `gc.auto` abaixo para saber como desativar este comportamento."
 
 #. type: Plain text
 #: en/git-gc.txt:33
 #, priority:100
 msgid "Running `git gc` manually should only be needed when adding objects to a repository without regularly running such porcelain commands, to do a one-off repository optimization, or e.g. to clean up a suboptimal mass-import. See the \"PACKFILE OPTIMIZATION\" section in linkgit:git-fast-import[1] for more details on the import case."
-msgstr ""
-"A execução manual do comando `git gc` só é necessária ao adicionar objetos "
-"em um repositório quando não executar regularmente estes comandos porcelana, "
-"para executar uma otimização única do repositório ou como por exemplo, para "
-"limpar uma importação em massa que esteja abaixo do ideal. Consulte a seção "
-"\"OTIMIZAÇÃO DE PACOTE\" no linkgit:git-fast-import[1] para obter mais "
-"detalhes sobre o caso de importação."
+msgstr "A execução manual do comando `git gc` só é necessária ao adicionar objetos em um repositório quando não executar regularmente estes comandos porcelana, para executar uma otimização única do repositório ou como por exemplo, para limpar uma importação em massa que esteja abaixo do ideal. Consulte a seção \"OTIMIZAÇÃO DE PACOTE\" no linkgit:git-fast-import[1] para obter mais detalhes sobre o caso de importação."
 
 #. type: Labeled list
 #: en/git-gc.txt:37 en/git-read-tree.txt:72
@@ -30061,12 +27609,7 @@ msgstr "--aggressive"
 #: en/git-gc.txt:43
 #, priority:100
 msgid "Usually 'git gc' runs very quickly while providing good disk space utilization and performance.  This option will cause 'git gc' to more aggressively optimize the repository at the expense of taking much more time.  The effects of this optimization are mostly persistent. See the \"AGGRESSIVE\" section below for details."
-msgstr ""
-"Normalmente, o comando 'git gc' roda de forma muito rápida, proporcionando "
-"uma boa utilização do espaço e do desempenho em disco.  Esta opção fará com "
-"que o comando 'git gc' otimize de forma mais agressiva o repositório à custa "
-"de levar muito mais tempo.  Os efeitos dessa otimização em geral são "
-"persistentes. Consulte a seção \"AGRESSIVO\" abaixo para obter detalhes."
+msgstr "Normalmente, o comando 'git gc' roda de forma muito rápida, proporcionando uma boa utilização do espaço e do desempenho em disco.  Esta opção fará com que o comando 'git gc' otimize de forma mais agressiva o repositório à custa de levar muito mais tempo.  Os efeitos dessa otimização em geral são persistentes. Consulte a seção \"AGRESSIVO\" abaixo para obter detalhes."
 
 #. type: Labeled list
 #: en/git-gc.txt:44
@@ -30078,17 +27621,13 @@ msgstr "--auto"
 #: en/git-gc.txt:47
 #, priority:100
 msgid "With this option, 'git gc' checks whether any housekeeping is required; if not, it exits without performing any work."
-msgstr ""
-"Com esta opção, o comando 'git gc' verifica se é necessário alguma limpeza; "
-"caso contrário, sai sem fazer nada."
+msgstr "Com esta opção, o comando 'git gc' verifica se é necessário alguma limpeza; caso contrário, sai sem fazer nada."
 
 #. type: Plain text
 #: en/git-gc.txt:50
 #, priority:100
 msgid "See the `gc.auto` option in the \"CONFIGURATION\" section below for how this heuristic works."
-msgstr ""
-"Consulte a opção `gc.auto` na seção \"CONFIGURAÇÃO\" abaixo para saber como "
-"essa heurística funciona."
+msgstr "Consulte a opção `gc.auto` na seção \"CONFIGURAÇÃO\" abaixo para saber como essa heurística funciona."
 
 #. type: Plain text
 #: en/git-gc.txt:55
@@ -30106,13 +27645,7 @@ msgstr "--prune=<data>"
 #: en/git-gc.txt:64
 #, priority:100
 msgid "Prune loose objects older than date (default is 2 weeks ago, overridable by the config variable `gc.pruneExpire`).  --prune=now prunes loose objects regardless of their age and increases the risk of corruption if another process is writing to the repository concurrently; see \"NOTES\" below. --prune is on by default."
-msgstr ""
-"Elimine os objetos soltos anteriores à data (a predefinição retorna para de "
-"2 semanas atrás, substituível pela variável de configuração `gc.pruneExpire`)"
-".  A opção `--prune=now` elimina objetos soltos independentemente da idade e "
-"aumenta o risco de corrupção caso outro processo esteja gravando no "
-"repositório; consulte \"OBSERVAÇÕES\" abaixo. A predefinição é que a opção "
-"`--prune` esteja sempre ativada."
+msgstr "Elimine os objetos soltos anteriores à data (a predefinição retorna para de 2 semanas atrás, substituível pela variável de configuração `gc.pruneExpire`).  A opção `--prune=now` elimina objetos soltos independentemente da idade e aumenta o risco de corrupção caso outro processo esteja gravando no repositório; consulte \"OBSERVAÇÕES\" abaixo. A predefinição é que a opção `--prune` esteja sempre ativada."
 
 #. type: Labeled list
 #: en/git-gc.txt:65 en/git-pack-refs.txt:57
@@ -30160,45 +27693,25 @@ msgstr "AGRESSIVO"
 #: en/git-gc.txt:88
 #, priority:100
 msgid "When the `--aggressive` option is supplied, linkgit:git-repack[1] will be invoked with the `-f` flag, which in turn will pass `--no-reuse-delta` to linkgit:git-pack-objects[1]. This will throw away any existing deltas and re-compute them, at the expense of spending much more time on the repacking."
-msgstr ""
-"Quando a opção `--aggressive` é utilizada, linkgit:git-repack[1] será "
-"invocado com a opção `-f`, que por sua vez passará a opção `--no-reuse-delta`"
-" para linkgit:git-pack-objects[1]. Isso descartará quaisquer deltas "
-"existentes e os computará novamente, às custas de se gastar muito mais tempo "
-"na re-embalagem."
+msgstr "Quando a opção `--aggressive` é utilizada, linkgit:git-repack[1] será invocado com a opção `-f`, que por sua vez passará a opção `--no-reuse-delta` para linkgit:git-pack-objects[1]. Isso descartará quaisquer deltas existentes e os computará novamente, às custas de se gastar muito mais tempo na re-embalagem."
 
 #. type: Plain text
 #: en/git-gc.txt:93
 #, priority:100
 msgid "The effects of this are mostly persistent, e.g. when packs and loose objects are coalesced into one another pack the existing deltas in that pack might get re-used, but there are also various cases where we might pick a sub-optimal delta from a newer pack instead."
-msgstr ""
-"Os efeitos disso são predominantemente persistentes, como por exemplo, "
-"quando os pacotes e os objetos soltos são reunidos entre si, os deltas "
-"existentes neste pacote podem ser reutilizados, porém também existem vários "
-"casos onde em vez disso, podemos escolher um delta não otimizado de um "
-"pacote mais novo."
+msgstr "Os efeitos disso são predominantemente persistentes, como por exemplo, quando os pacotes e os objetos soltos são reunidos entre si, os deltas existentes neste pacote podem ser reutilizados, porém também existem vários casos onde em vez disso, podemos escolher um delta não otimizado de um pacote mais novo."
 
 #. type: Plain text
 #: en/git-gc.txt:99
 #, priority:100
 msgid "Furthermore, supplying `--aggressive` will tweak the `--depth` and `--window` options passed to linkgit:git-repack[1]. See the `gc.aggressiveDepth` and `gc.aggressiveWindow` settings below. By using a larger window size we're more likely to find more optimal deltas."
-msgstr ""
-"Além disso, utilizar `--aggressive` irá ajustar as opções `--depth` e "
-"`--window` encaminhadas para o linkgit:git-repack[1]. Consulte as "
-"configurações `gc.aggressiveDepth` e `gc.aggressiveWindow` abaixo. Ao "
-"utilizar um tamanho de janela maior, é mais provável que encontremos deltas "
-"mais otimizados."
+msgstr "Além disso, utilizar `--aggressive` irá ajustar as opções `--depth` e `--window` encaminhadas para o linkgit:git-repack[1]. Consulte as configurações `gc.aggressiveDepth` e `gc.aggressiveWindow` abaixo. Ao utilizar um tamanho de janela maior, é mais provável que encontremos deltas mais otimizados."
 
 #. type: Plain text
 #: en/git-gc.txt:105
 #, priority:100
 msgid "It's probably not worth it to use this option on a given repository without running tailored performance benchmarks on it. It takes a lot more time, and the resulting space/delta optimization may or may not be worth it. Not using this at all is the right trade-off for most users and their repositories."
-msgstr ""
-"Provavelmente não vale a pena utilizar esta opção em um determinado "
-"repositório sem antes executar um benchmark de desempenho sob medida. Leva "
-"muito mais tempo e a otimização de espaço/delta resultante pode ou não valer "
-"a pena. Não utilizar isso de forma alguma é um dilema para a maioria dos "
-"usuários e seus repositórios."
+msgstr "Provavelmente não vale a pena utilizar esta opção em um determinado repositório sem antes executar um benchmark de desempenho sob medida. Leva muito mais tempo e a otimização de espaço/delta resultante pode ou não valer a pena. Não utilizar isso de forma alguma é um dilema para a maioria dos usuários e seus repositórios."
 
 #. type: Plain text
 #: en/git-gc.txt:111
@@ -30210,17 +27723,7 @@ msgstr "A documentação abaixo é igual à encontrada no linkgit:git-config[1]:
 #: en/git-gc.txt:126
 #, priority:100
 msgid "'git gc' tries very hard not to delete objects that are referenced anywhere in your repository. In particular, it will keep not only objects referenced by your current set of branches and tags, but also objects referenced by the index, remote-tracking branches, notes saved by 'git notes' under refs/notes/, reflogs (which may reference commits in branches that were later amended or rewound), and anything else in the refs/* namespace.  If you are expecting some objects to be deleted and they aren't, check all of those locations and decide whether it makes sense in your case to remove those references."
-msgstr ""
-"O comando 'git gc' evita muito a não exclusão dos objetos que possuam "
-"referencias em qualquer lugar do seu repositório. Ele manterá não apenas os "
-"objetos referenciados pelo seu conjunto atual das ramificações e as tags, "
-"mas também os objetos referenciados através do índice, as ramificações "
-"monitoradas remotamente, as notas salvas através do comando 'git notes' no '"
-"refs/notes/', reflogs (que podem fazer referência no commit dos ramos que "
-"foram alterados ou retrocedido posteriormente) e qualquer outra coisa no "
-"espaço dos nomes 'refs/*'.  Caso você esteja esperando que alguns objetos "
-"sejam excluídos e não foram, verifique todos estes locais e decida se faz "
-"sentido remover as referências ou não."
+msgstr "O comando 'git gc' evita muito a não exclusão dos objetos que possuam referencias em qualquer lugar do seu repositório. Ele manterá não apenas os objetos referenciados pelo seu conjunto atual das ramificações e as tags, mas também os objetos referenciados através do índice, as ramificações monitoradas remotamente, as notas salvas através do comando 'git notes' no 'refs/notes/', reflogs (que podem fazer referência no commit dos ramos que foram alterados ou retrocedido posteriormente) e qualquer outra coisa no espaço dos nomes 'refs/*'.  Caso você esteja esperando que alguns objetos sejam excluídos e não foram, verifique todos estes locais e decida se faz sentido remover as referências ou não."
 
 #. type: Plain text
 #: en/git-gc.txt:133
@@ -30244,10 +27747,7 @@ msgstr "A maioria das operações que adicionam um objeto ao banco de dados atua
 #: en/git-gc.txt:144
 #, priority:100
 msgid "However, these features fall short of a complete solution, so users who run commands concurrently have to live with some risk of corruption (which seems to be low in practice)."
-msgstr ""
-"No entanto, estes recursos ficam aquém de uma solução completa; portanto, os "
-"usuários que executam comandos simultaneamente, precisam enfrentar algum "
-"risco de corrupção (o que na pratica, o risco parece ser baixo)."
+msgstr "No entanto, estes recursos ficam aquém de uma solução completa; portanto, os usuários que executam comandos simultaneamente, precisam enfrentar algum risco de corrupção (o que na pratica, o risco parece ser baixo)."
 
 #. type: Plain text
 #: en/git-gc.txt:150
@@ -30283,11 +27783,7 @@ msgstr "'git get-tar-commit-id'\n"
 #: en/git-get-tar-commit-id.txt:22
 #, priority:100
 msgid "Read a tar archive created by 'git archive' from the standard input and extract the commit ID stored in it.  It reads only the first 1024 bytes of input, thus its runtime is not influenced by the size of the tar archive very much."
-msgstr ""
-"Leia um arquivo tar criado pelo comando 'git archive' a partir da entrada "
-"padrão e extraia o ID do commit armazenado nele.  Ele lê apenas os primeiros "
-"1024 bytes da entrada, portanto, o seu tempo de execução não é influenciado "
-"pelo tamanho do arquivo tar."
+msgstr "Leia um arquivo tar criado pelo comando 'git archive' a partir da entrada padrão e extraia o ID do commit armazenado nele.  Ele lê apenas os primeiros 1024 bytes da entrada, portanto, o seu tempo de execução não é influenciado pelo tamanho do arquivo tar."
 
 #. type: Plain text
 #: en/git-get-tar-commit-id.txt:27
@@ -30332,8 +27828,7 @@ msgid ""
 "\t   [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <tree>...]\n"
 "\t   [--] [<pathspec>...]\n"
 msgstr ""
-"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-"
-"regexp]\n"
+"'git grep' [-a | --text] [-I] [--textconv] [-i | --ignore-case] [-w | --word-regexp]\n"
 "\t   [-v | --invert-match] [-h|-H] [--full-name]\n"
 "\t   [-E | --extended-regexp] [-G | --basic-regexp]\n"
 "\t   [-P | --perl-regexp]\n"
@@ -30351,8 +27846,7 @@ msgstr ""
 "\t   [-f <arquivo>] [-e] <padrão>\n"
 "\t   [--and|--or|--not|(|)|-e <padrão>...]\n"
 "\t   [--recurse-submodules] [--parent-basename <basename>]\n"
-"\t   [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | "
-"<árvore>...]\n"
+"\t   [ [--[no-]exclude-standard] [--cached | --no-index | --untracked] | <árvore>...]\n"
 "\t   [--] [<pathspec>...]\n"
 
 #. type: Plain text
@@ -30407,10 +27901,7 @@ msgstr "grep.extendedRegexp"
 #: en/git-grep.txt:60
 #, priority:100
 msgid "If set to true, enable `--extended-regexp` option by default. This option is ignored when the `grep.patternType` option is set to a value other than 'default'."
-msgstr ""
-"Caso seja definido como `true`, a predefinição é que a opção `--full-name` "
-"seja utilizada. Esta opção é ignorada quando a opção de configuração `grep."
-"patternType` for configurada com um valor diferente de 'default'."
+msgstr "Caso seja definido como `true`, a predefinição é que a opção `--full-name` seja utilizada. Esta opção é ignorada quando a opção de configuração `grep.patternType` for configurada com um valor diferente de 'default'."
 
 #. type: Labeled list
 #: en/git-grep.txt:61
@@ -30446,10 +27937,7 @@ msgstr "grep.fallbackToNoIndex"
 #: en/git-grep.txt:71
 #, priority:100
 msgid "If set to true, fall back to git grep --no-index if git grep is executed outside of a git repository.  Defaults to false."
-msgstr ""
-"Caso seja definido como `true`, retorne para `git grep --no-index` caso o `"
-"git grep` seja executado fora de um repositório Git.  A predefinição retorna "
-"para `false`."
+msgstr "Caso seja definido como `true`, retorne para `git grep --no-index` caso o `git grep` seja executado fora de um repositório Git.  A predefinição retorna para `false`."
 
 #. type: Plain text
 #: en/git-grep.txt:78
@@ -30497,20 +27985,13 @@ msgstr "--exclude-standard"
 #: en/git-grep.txt:94
 #, priority:100
 msgid "Do not pay attention to ignored files specified via the `.gitignore` mechanism.  Only useful when searching files in the current directory with `--no-index`."
-msgstr ""
-"Não preste atenção aos arquivos informados que foram ignorados através do "
-"mecanismo `.gitignore`.  Útil apenas ao pesquisar por arquivos no diretório "
-"atual sem a opção `--no-index'."
+msgstr "Não preste atenção aos arquivos informados que foram ignorados através do mecanismo `.gitignore`.  Útil apenas ao pesquisar por arquivos no diretório atual sem a opção `--no-index'."
 
 #. type: Plain text
 #: en/git-grep.txt:101
 #, priority:100
 msgid "Recursively search in each submodule that is active and checked out in the repository.  When used in combination with the <tree> option the prefix of all submodule output will be the name of the parent project's <tree> object. This option has no effect if `--no-index` is given."
-msgstr ""
-"Pesquise recursivamente em cada submódulo ativo e averiguado no "
-"repositório.  Quando utilizado em combinação com a opção `<tree>`, todo o "
-"prefixo gerado do submódulo será o nome do objeto `<tree>` na origem do "
-"projeto. Esta opção não tem qualquer efeito caso `--no-index` seja utilizado."
+msgstr "Pesquise recursivamente em cada submódulo ativo e averiguado no repositório.  Quando utilizado em combinação com a opção `<tree>`, todo o prefixo gerado do submódulo será o nome do objeto `<tree>` na origem do projeto. Esta opção não tem qualquer efeito caso `--no-index` seja utilizado."
 
 #. type: Plain text
 #: en/git-grep.txt:105
@@ -30612,11 +28093,7 @@ msgstr "Selecione as linhas que não coincidam."
 #: en/git-grep.txt:152
 #, priority:100
 msgid "By default, the command shows the filename for each match.  `-h` option is used to suppress this output.  `-H` is there for completeness and does not do anything except it overrides `-h` given earlier on the command line."
-msgstr ""
-"É predefinido que o comando exiba o nome do arquivo para cada coincidência.  "
-"A opção `-h` é utilizada para suprimir esta saída.  A opção `-H` existe para "
-"ser completo e não faz nada exceto a reposição do `-h` utilizado "
-"anteriormente na linha de comando."
+msgstr "É predefinido que o comando exiba o nome do arquivo para cada coincidência.  A opção `-h` é utilizada para suprimir esta saída.  A opção `-H` existe para ser completo e não faz nada exceto a reposição do `-h` utilizado anteriormente na linha de comando."
 
 #. type: Labeled list
 #: en/git-grep.txt:153 en/git-ls-files.txt:144 en/git-ls-tree.txt:68
@@ -30676,10 +28153,7 @@ msgstr "Para os padrões, utilize expressões regulares compatíveis com o Perl.
 #: en/git-grep.txt:173 en/rev-list-options.txt:100
 #, priority:260
 msgid "Support for these types of regular expressions is an optional compile-time dependency. If Git wasn't compiled with support for them providing this option will cause it to die."
-msgstr ""
-"A compatibilidade para estes tipos de expressões regulares é uma dependência "
-"opcional no momento da compilação. Caso o Git não tenha sido compilado com "
-"este suporte, o Git será encerrado caso esta opção seja utilizada."
+msgstr "A compatibilidade para estes tipos de expressões regulares é uma dependência opcional no momento da compilação. Caso o Git não tenha sido compilado com este suporte, o Git será encerrado caso esta opção seja utilizada."
 
 #. type: Labeled list
 #: en/git-grep.txt:174 en/git-repack.txt:74 en/rev-list-options.txt:87
@@ -30767,13 +28241,10 @@ msgstr "Abra os arquivos coincidentes no pager (não a saída do 'grep').  Caso
 
 #. type: Plain text
 #: en/git-grep.txt:213
-#, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
-msgstr ""
-"Use '\\0' como um delimitador para os nomes do caminho na saída, e as "
-"imprima literalmente. Sem esta opção, os nomes do caminho com caracteres "
-"\"incomuns\" são citados como explicado na variável de configuração `core."
-"quotePath` (consultelinkgit:git-config [1])."
+#, fuzzy, priority:100
+#| msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
+msgstr "Use '\\0' como um delimitador para os nomes do caminho na saída, e as imprima literalmente. Sem esta opção, os nomes do caminho com caracteres \"incomuns\" são citados como explicado na variável de configuração `core.quotePath` (consultelinkgit:git-config [1])."
 
 #. type: Labeled list
 #: en/git-grep.txt:215
@@ -30941,39 +28412,25 @@ msgstr "Leia os padrões vindos de um `<arquivo>`, um por linha."
 #: en/git-grep.txt:280
 #, priority:100
 msgid "Passing the pattern via <file> allows for providing a search pattern containing a \\0."
-msgstr ""
-"A passagem do padrão através do <arquivo> permite o provimento de um padrão "
-"de pesquisa contendo um '\\0'."
+msgstr "A passagem do padrão através do <arquivo> permite o provimento de um padrão de pesquisa contendo um '\\0'."
 
 #. type: Plain text
 #: en/git-grep.txt:285
 #, priority:100
 msgid "Not all pattern types support patterns containing \\0. Git will error out if a given pattern type can't support such a pattern. The `--perl-regexp` pattern type when compiled against the PCRE v2 backend has the widest support for these types of patterns."
-msgstr ""
-"Nem todos os tipos de padrões suportam padrões contendo '\\0'. O Git irá "
-"exibir um erro caso um determinado tipo de padrão não tiver compatibilidade "
-"com ele. O tipo do padrão `--perl-regexp` quando compilado contra a "
-"estrutura do PCRE v2 tem uma compatibilidade mais ampla para esses tipos de "
-"padrões."
+msgstr "Nem todos os tipos de padrões suportam padrões contendo '\\0'. O Git irá exibir um erro caso um determinado tipo de padrão não tiver compatibilidade com ele. O tipo do padrão `--perl-regexp` quando compilado contra a estrutura do PCRE v2 tem uma compatibilidade mais ampla para esses tipos de padrões."
 
 #. type: Plain text
 #: en/git-grep.txt:290
 #, priority:100
 msgid "In versions of Git before 2.23.0 patterns containing \\0 would be silently considered fixed. This was never documented, there were also odd and undocumented interactions between e.g. non-ASCII patterns containing \\0 and `--ignore-case`."
-msgstr ""
-"Nas versões do Git anteriores à 2.23.0, os padrões contendo '\\0' seriam "
-"silenciosamente considerados corrigidos. Isso nunca foi documentado, também "
-"houve interações ímpares e não documentadas entre, por exemplo, os padrões "
-"não ASCII contendo '\\0' e `--ignore-case`."
+msgstr "Nas versões do Git anteriores à 2.23.0, os padrões contendo '\\0' seriam silenciosamente considerados corrigidos. Isso nunca foi documentado, também houve interações ímpares e não documentadas entre, por exemplo, os padrões não ASCII contendo '\\0' e `--ignore-case`."
 
 #. type: Plain text
 #: en/git-grep.txt:294
 #, priority:100
 msgid "In future versions we may learn to support patterns containing \\0 for more search backends, until then we'll die when the pattern type in question doesn't support them."
-msgstr ""
-"Em futuras versões, podemos aprender a oferecer suporte aos padrões contendo "
-"'\\0' para mais estruturas de pesquisa, até então morreremos quando o tipo "
-"do padrão em questão não mais os suportar."
+msgstr "Em futuras versões, podemos aprender a oferecer suporte aos padrões contendo '\\0' para mais estruturas de pesquisa, até então morreremos quando o tipo do padrão em questão não mais os suportar."
 
 #. type: Plain text
 #: en/git-grep.txt:300
@@ -31111,21 +28568,13 @@ msgstr "NOTAS SOBRE OS ENCADEAMENTOS"
 #: en/git-grep.txt:358
 #, priority:100
 msgid "The `--threads` option (and the grep.threads configuration) will be ignored when `--open-files-in-pager` is used, forcing a single-threaded execution."
-msgstr ""
-"A opção `--threads` (e a configuração 'grep.threads') serão ignoradas quando "
-"a opção `--open-files-in-pager` for utilizado, impondo uma execução com "
-"thread único."
+msgstr "A opção `--threads` (e a configuração 'grep.threads') serão ignoradas quando a opção `--open-files-in-pager` for utilizado, impondo uma execução com thread único."
 
 #. type: Plain text
 #: en/git-grep.txt:363
 #, priority:100
 msgid "When grepping the object store (with `--cached` or giving tree objects), running with multiple threads might perform slower than single threaded if `--textconv` is given and there're too many text conversions. So if you experience low performance in this case, it might be desirable to use `--threads=1`."
-msgstr ""
-"Ao fazer um 'grep' em um objeto armazenado (com a opção `--cached` ou "
-"oferecendo três objetos), a execução com várias threads poderá ser mais "
-"lenta do que uma thread única caso `--textconv` seja informado e haja muitas "
-"conversões de texto. Portanto, caso esteja com baixo desempenho, pode ser "
-"desejável utilizar `--threads=1`."
+msgstr "Ao fazer um 'grep' em um objeto armazenado (com a opção `--cached` ou oferecendo três objetos), a execução com várias threads poderá ser mais lenta do que uma thread única caso `--textconv` seja informado e haja muitas conversões de texto. Portanto, caso esteja com baixo desempenho, pode ser desejável utilizar `--threads=1`."
 
 #. type: Title =
 #: en/git-gui.txt:2
@@ -31149,33 +28598,19 @@ msgstr "'git gui' [<comando>] [argumentos]\n"
 #: en/git-gui.txt:19
 #, priority:100
 msgid "A Tcl/Tk based graphical user interface to Git.  'git gui' focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories."
-msgstr ""
-"Uma interface gráfica baseada em Tcl / Tk para o Git.  O 'git gui' se "
-"concentra em permitir que os usuários façam alterações no seu repositório "
-"fazendo novos commit, melhorando os já existentes, criando ramificações, "
-"realizando mesclagens locais e buscando/impulsionando para os repositórios "
-"remotos."
+msgstr "Uma interface gráfica baseada em Tcl / Tk para o Git.  O 'git gui' se concentra em permitir que os usuários façam alterações no seu repositório fazendo novos commit, melhorando os já existentes, criando ramificações, realizando mesclagens locais e buscando/impulsionando para os repositórios remotos."
 
 #. type: Plain text
 #: en/git-gui.txt:24
 #, priority:100
 msgid "Unlike 'gitk', 'git gui' focuses on commit generation and single file annotation and does not show project history.  It does however supply menu actions to start a 'gitk' session from within 'git gui'."
-msgstr ""
-"Diferentemente do 'gitk', o comando 'git gui' se concentra na geração do "
-"commit e na anotação única do arquivo e não exibe o histórico do projeto.  "
-"No entanto, ele fornece as ações do menu para iniciar uma sessão 'gitk' a "
-"partir do comando 'git gui'."
+msgstr "Diferentemente do 'gitk', o comando 'git gui' se concentra na geração do commit e na anotação única do arquivo e não exibe o histórico do projeto.  No entanto, ele fornece as ações do menu para iniciar uma sessão 'gitk' a partir do comando 'git gui'."
 
 #. type: Plain text
 #: en/git-gui.txt:29
 #, priority:100
 msgid "'git gui' is known to work on all popular UNIX systems, Mac OS X, and Windows (under both Cygwin and MSYS).  To the extent possible OS specific user interface guidelines are followed, making 'git gui' a fairly native interface for users."
-msgstr ""
-"Sabe-se que o 'git gui' funciona em todos os sistemas UNIX populares, no Mac "
-"OS X e no Windows (tanto no Cygwin quanto no MSYS).  Na medida do possível, "
-"são seguidas as diretrizes específicas do Sistema Operacional quanto a "
-"interface do usuário, tornando o comando 'git gui' como uma interface "
-"bastante nativa para os usuários."
+msgstr "Sabe-se que o 'git gui' funciona em todos os sistemas UNIX populares, no Mac OS X e no Windows (tanto no Cygwin quanto no MSYS).  Na medida do possível, são seguidas as diretrizes específicas do Sistema Operacional quanto a interface do usuário, tornando o comando 'git gui' como uma interface bastante nativa para os usuários."
 
 #. type: Title -
 #: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32 en/git-shell.txt:25 en/git-stash.txt:48 en/git-submodule.txt:33 en/git-svn.txt:29 en/git-worktree.txt:46
@@ -31193,9 +28628,7 @@ msgstr "blame"
 #: en/git-gui.txt:35
 #, priority:100
 msgid "Start a blame viewer on the specified file on the given version (or working directory if not specified)."
-msgstr ""
-"Inicie um visualizador \"blame\" em determinado arquivo na versão informada ("
-"ou no diretório de trabalho, caso não seja informado)."
+msgstr "Inicie um visualizador \"blame\" em determinado arquivo na versão informada (ou no diretório de trabalho, caso não seja informado)."
 
 #. type: Labeled list
 #: en/git-gui.txt:36
@@ -31207,10 +28640,7 @@ msgstr "browser"
 #: en/git-gui.txt:40
 #, priority:100
 msgid "Start a tree browser showing all files in the specified commit.  Files selected through the browser are opened in the blame viewer."
-msgstr ""
-"Inicie a navegação na árvore exibindo todos os arquivos no commit "
-"especificado.  Os arquivos selecionados pelo navegador são abertos no "
-"visualizador \"blame\"."
+msgstr "Inicie a navegação na árvore exibindo todos os arquivos no commit especificado.  Os arquivos selecionados pelo navegador são abertos no visualizador \"blame\"."
 
 #. type: Labeled list
 #: en/git-gui.txt:41
@@ -31222,11 +28652,7 @@ msgstr "citool"
 #: en/git-gui.txt:46
 #, priority:100
 msgid "Start 'git gui' and arrange to make exactly one commit before exiting and returning to the shell.  The interface is limited to only commit actions, slightly reducing the application's startup time and simplifying the menubar."
-msgstr ""
-"Inicie o 'git gui' e organize para fazer exatamente um commit antes de "
-"encerrar e retornar ao shell.  A interface é limitada a apenas as ações do "
-"commit, reduzindo um pouco o tempo da inicialização do aplicativo e "
-"simplificando a barra de menus."
+msgstr "Inicie o 'git gui' e organize para fazer exatamente um commit antes de encerrar e retornar ao shell.  A interface é limitada a apenas as ações do commit, reduzindo um pouco o tempo da inicialização do aplicativo e simplificando a barra de menus."
 
 #. type: Labeled list
 #: en/git-gui.txt:47
@@ -31256,12 +28682,7 @@ msgstr "`git gui blame Makefile`"
 #: en/git-gui.txt:61
 #, priority:100
 msgid "Show the contents of the file 'Makefile' in the current working directory, and provide annotations for both the original author of each line, and who moved the line to its current location.  The uncommitted file is annotated, and uncommitted changes (if any) are explicitly attributed to 'Not Yet Committed'."
-msgstr ""
-"Exibe o conteúdo do arquivo 'Makefile' no diretório de trabalho atual e "
-"fornece as anotações do autor original de cada linha, informando quem foi "
-"que moveu a linha para o seu local atual e respectivas alterações.  O "
-"arquivo que não foi feito o commit é anotado e as alterações não confirmadas "
-"(se houver) são explicitamente atribuídas a 'Ainda não confirmado'."
+msgstr "Exibe o conteúdo do arquivo 'Makefile' no diretório de trabalho atual e fornece as anotações do autor original de cada linha, informando quem foi que moveu a linha para o seu local atual e respectivas alterações.  O arquivo que não foi feito o commit é anotado e as alterações não confirmadas (se houver) são explicitamente atribuídas a 'Ainda não confirmado'."
 
 #. type: Labeled list
 #: en/git-gui.txt:62
@@ -31273,10 +28694,7 @@ msgstr "`git gui blame v0.99.8 Makefile`"
 #: en/git-gui.txt:68
 #, priority:100
 msgid "Show the contents of 'Makefile' in revision 'v0.99.8' and provide annotations for each line.  Unlike the above example the file is read from the object database and not the working directory."
-msgstr ""
-"Exibe o conteúdo da versão do 'Makefile' na revisão 'v0.99.8' e informa as "
-"suas respectivas anotações em cada linha.  Diferente do exemplo acima, o "
-"arquivo é lido no banco de dados do objeto e não no diretório de trabalho."
+msgstr "Exibe o conteúdo da versão do 'Makefile' na revisão 'v0.99.8' e informa as suas respectivas anotações em cada linha.  Diferente do exemplo acima, o arquivo é lido no banco de dados do objeto e não no diretório de trabalho."
 
 #. type: Labeled list
 #: en/git-gui.txt:69
@@ -31288,9 +28706,7 @@ msgstr "`git gui blame --line=100 Makefile`"
 #: en/git-gui.txt:73
 #, priority:100
 msgid "Loads annotations as described above and automatically scrolls the view to center on line '100'."
-msgstr ""
-"Carrega anotações conforme descrito acima e rola automaticamente a exibição "
-"para centralizar na linha de número '100'."
+msgstr "Carrega anotações conforme descrito acima e rola automaticamente a exibição para centralizar na linha de número '100'."
 
 #. type: Labeled list
 #: en/git-gui.txt:74
@@ -31302,10 +28718,7 @@ msgstr "`git gui citool`"
 #: en/git-gui.txt:79
 #, priority:100
 msgid "Make one commit and return to the shell when it is complete.  This command returns a non-zero exit code if the window was closed in any way other than by making a commit."
-msgstr ""
-"Faça um commit e retorne ao shell quando estiver concluído.  Este comando "
-"retorna um código diferente de zero na saída caso a janela seja fechada de "
-"alguma outra maneira que não seja ao fazer um commit."
+msgstr "Faça um commit e retorne ao shell quando estiver concluído.  Este comando retorna um código diferente de zero na saída caso a janela seja fechada de alguma outra maneira que não seja ao fazer um commit."
 
 #. type: Labeled list
 #: en/git-gui.txt:80
@@ -31329,11 +28742,7 @@ msgstr "`git gui citool --nocommit`"
 #: en/git-gui.txt:91
 #, priority:100
 msgid "Behave as normal citool, but instead of making a commit simply terminate with a zero exit code. It still checks that the index does not contain any unmerged entries, so you can use it as a GUI version of linkgit:git-mergetool[1]"
-msgstr ""
-"Se comporta como o \"citool\" normal mas em vez de fazer um commit, "
-"simplesmente encerre com um código de saída igual a zero. Ele ainda verifica "
-"se o índice não contém entradas que não foram mescladas, para que você possa "
-"utilizá-lo como uma versão gráfica do linkgit:git-mergetool[1]"
+msgstr "Se comporta como o \"citool\" normal mas em vez de fazer um commit, simplesmente encerre com um código de saída igual a zero. Ele ainda verifica se o índice não contém entradas que não foram mescladas, para que você possa utilizá-lo como uma versão gráfica do linkgit:git-mergetool[1]"
 
 #. type: Labeled list
 #: en/git-gui.txt:92
@@ -31357,18 +28766,13 @@ msgstr "`git gui browser maint`"
 #: en/git-gui.txt:101
 #, priority:100
 msgid "Show a browser for the tree of the 'maint' branch.  Files selected in the browser can be viewed with the internal blame viewer."
-msgstr ""
-"Exibe um navegador para a árvore do ramo 'maint'.  Os arquivos selecionados "
-"no navegador podem ser visualizados com o visualizador interno."
+msgstr "Exibe um navegador para a árvore do ramo 'maint'.  Os arquivos selecionados no navegador podem ser visualizados com o visualizador interno."
 
 #. type: Plain text
 #: en/git-gui.txt:108
 #, priority:100
 msgid "The Git repository browser.  Shows branches, commit history and file differences.  gitk is the utility started by 'git gui''s Repository Visualize actions."
-msgstr ""
-"O navegador do repositório Git.  Exibe as ramificações, o histórico do "
-"commit e a diferença dos arquivos. O gitk é o utilitário iniciado através "
-"das ações da Visualização do Repositório 'git gui'."
+msgstr "O navegador do repositório Git.  Exibe as ramificações, o histórico do commit e a diferença dos arquivos. O gitk é o utilitário iniciado através das ações da Visualização do Repositório 'git gui'."
 
 #. type: Title -
 #: en/git-gui.txt:110
@@ -31380,10 +28784,7 @@ msgstr "Outros"
 #: en/git-gui.txt:114
 #, priority:100
 msgid "'git gui' is actually maintained as an independent project, but stable versions are distributed as part of the Git suite for the convenience of end users."
-msgstr ""
-"O 'git gui' é atualmente mantido como um projeto independente, porém as "
-"versões estáveis são distribuídas como parte do pacote Git para a "
-"conveniência dos usuários finais."
+msgstr "O 'git gui' é atualmente mantido como um projeto independente, porém as versões estáveis são distribuídas como parte do pacote Git para a conveniência dos usuários finais."
 
 #. type: Plain text
 #: en/git-gui.txt:116
@@ -31407,9 +28808,7 @@ msgstr "git-hash-object(1)"
 #: en/git-hash-object.txt:7
 #, priority:100
 msgid "git-hash-object - Compute object ID and optionally creates a blob from a file"
-msgstr ""
-"git-hash-object - Compute a ID do objeto e opcionalmente crie uma bolha a "
-"partir de um arquivo"
+msgstr "git-hash-object - Compute a ID do objeto e opcionalmente crie uma bolha a partir de um arquivo"
 
 #. type: Plain text
 #: en/git-hash-object.txt:14
@@ -31418,20 +28817,14 @@ msgid ""
 "'git hash-object' [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin [--literally]] [--] <file>...\n"
 "'git hash-object' [-t <type>] [-w] --stdin-paths [--no-filters]\n"
 msgstr ""
-"'git hash-object' [-t <tipo>] [-w] [--path=<arquivo>|--no-filters] [--stdin "
-"[--literally]] [--] <arquivo>...\n"
+"'git hash-object' [-t <tipo>] [-w] [--path=<arquivo>|--no-filters] [--stdin [--literally]] [--] <arquivo>...\n"
 "'git hash-object' [-t <tipo>] [-w] --stdin-paths [--no-filters]\n"
 
 #. type: Plain text
 #: en/git-hash-object.txt:22
 #, priority:100
 msgid "Computes the object ID value for an object with specified type with the contents of the named file (which can be outside of the work tree), and optionally writes the resulting object into the object database.  Reports its object ID to its standard output.  When <type> is not specified, it defaults to \"blob\"."
-msgstr ""
-"Calcula o valor do ID do objeto para um objeto com o tipo especificado com o "
-"conteúdo do nome do arquivo (que pode estar fora da árvore de trabalho) e "
-"opcionalmente, grava o objeto gerado no banco de dados do objeto.  Informa o "
-"ID do objeto na saída padrão.  A predefinição retorna para \"blob\" quando o "
-"<tipo> não é informado."
+msgstr "Calcula o valor do ID do objeto para um objeto com o tipo especificado com o conteúdo do nome do arquivo (que pode estar fora da árvore de trabalho) e opcionalmente, grava o objeto gerado no banco de dados do objeto.  Informa o ID do objeto na saída padrão.  A predefinição retorna para \"blob\" quando o <tipo> não é informado."
 
 #. type: Labeled list
 #: en/git-hash-object.txt:26
@@ -31467,23 +28860,13 @@ msgstr "--stdin-paths"
 #: en/git-hash-object.txt:38
 #, priority:100
 msgid "Read file names from the standard input, one per line, instead of from the command-line."
-msgstr ""
-"Leia os nomes dos arquivos na entrada padrão, um por linha, em vez de ler da "
-"linha de comando."
+msgstr "Leia os nomes dos arquivos na entrada padrão, um por linha, em vez de ler da linha de comando."
 
 #. type: Plain text
 #: en/git-hash-object.txt:48
 #, priority:100
 msgid "Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing temporary files located outside of the working directory or files read from stdin."
-msgstr ""
-"O objeto hash da maneira como ele foi encontrado no caminho informado. O "
-"local do arquivo não influencia diretamente o valor do hash, mas o caminho é "
-"utilizado para determinar quais os filtros Git que devem ser aplicados ao "
-"objeto antes de serem colocados no banco de dados do objeto, como resultado "
-"da aplicação dos filtros, a bolha real que foi colocada no banco de dados do "
-"objeto pode diferir do arquivo informado. Essa opção é útil principalmente "
-"para fazer o hash dos arquivos temporários localizados fora do diretório de "
-"trabalho ou nos arquivos lidos através do stdin."
+msgstr "O objeto hash da maneira como ele foi encontrado no caminho informado. O local do arquivo não influencia diretamente o valor do hash, mas o caminho é utilizado para determinar quais os filtros Git que devem ser aplicados ao objeto antes de serem colocados no banco de dados do objeto, como resultado da aplicação dos filtros, a bolha real que foi colocada no banco de dados do objeto pode diferir do arquivo informado. Essa opção é útil principalmente para fazer o hash dos arquivos temporários localizados fora do diretório de trabalho ou nos arquivos lidos através do stdin."
 
 #. type: Labeled list
 #: en/git-hash-object.txt:49
@@ -31495,12 +28878,7 @@ msgstr "--no-filters"
 #: en/git-hash-object.txt:54
 #, priority:100
 msgid "Hash the contents as is, ignoring any input filter that would have been chosen by the attributes mechanism, including the end-of-line conversion. If the file is read from standard input then this is always implied, unless the `--path` option is given."
-msgstr ""
-"Faça o hash do conteúdo da forma que estiver, ignorando qualquer filtro na "
-"entrada que teria sido selecionado pelo mecanismo dos atributos, incluindo a "
-"conversão da quebra de linha. Se o arquivo foi lido a partir da entrada "
-"padrão, isso sempre será feito de forma implícita, a menos que a opção "
-"`--path` seja utilizada."
+msgstr "Faça o hash do conteúdo da forma que estiver, ignorando qualquer filtro na entrada que teria sido selecionado pelo mecanismo dos atributos, incluindo a conversão da quebra de linha. Se o arquivo foi lido a partir da entrada padrão, isso sempre será feito de forma implícita, a menos que a opção `--path` seja utilizada."
 
 #. type: Labeled list
 #: en/git-hash-object.txt:55
@@ -31512,12 +28890,7 @@ msgstr "--literally"
 #: en/git-hash-object.txt:60
 #, priority:100
 msgid "Allow `--stdin` to hash any garbage into a loose object which might not otherwise pass standard object parsing or git-fsck checks. Useful for stress-testing Git itself or reproducing characteristics of corrupt or bogus objects encountered in the wild."
-msgstr ""
-"Permita que a opção `--stdin` faça o hash de qualquer lixo em um objeto "
-"solto que, de outra forma, não passaria na análise do objeto predefinido ou "
-"nas verificações do 'git-fsck'. Útil para realizar testes extensivos no Git "
-"ou reproduzir as características dos objetos corrompidos ou falsos "
-"encontrados por aí."
+msgstr "Permita que a opção `--stdin` faça o hash de qualquer lixo em um objeto solto que, de outra forma, não passaria na análise do objeto predefinido ou nas verificações do 'git-fsck'. Útil para realizar testes extensivos no Git ou reproduzir as características dos objetos corrompidos ou falsos encontrados por aí."
 
 #. type: Title =
 #: en/git-help.txt:2
@@ -31545,61 +28918,43 @@ msgstr ""
 #: en/git-help.txt:20
 #, priority:100
 msgid "With no options and no COMMAND or GUIDE given, the synopsis of the 'git' command and a list of the most commonly used Git commands are printed on the standard output."
-msgstr ""
-"Sem opções e sem informar \"COMMAND\" ou \"GUIDE\", serão exibidos na saída "
-"padrão um resumo do comando 'git' e uma lista dos comandos Git mais "
-"comumente utilizados."
+msgstr "Sem opções e sem informar \"COMMAND\" ou \"GUIDE\", serão exibidos na saída padrão um resumo do comando 'git' e uma lista dos comandos Git mais comumente utilizados."
 
 #. type: Plain text
 #: en/git-help.txt:23
 #, priority:100
 msgid "If the option `--all` or `-a` is given, all available commands are printed on the standard output."
-msgstr ""
-"Caso a opção `--all` ou `-a` seja utilizada, todos os comandos disponíveis "
-"serão exibidos na saída padrão."
+msgstr "Caso a opção `--all` ou `-a` seja utilizada, todos os comandos disponíveis serão exibidos na saída padrão."
 
 #. type: Plain text
 #: en/git-help.txt:26
 #, priority:100
 msgid "If the option `--guide` or `-g` is given, a list of the useful Git guides is also printed on the standard output."
-msgstr ""
-"Caso a opção `--guide` ou `-g` seja utilizada, uma lista dos guias úteis do "
-"Git também será exibida na saída padrão."
+msgstr "Caso a opção `--guide` ou `-g` seja utilizada, uma lista dos guias úteis do Git também será exibida na saída padrão."
 
 #. type: Plain text
 #: en/git-help.txt:31
 #, priority:100
 msgid "If a command, or a guide, is given, a manual page for that command or guide is brought up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables."
-msgstr ""
-"Caso um comando, ou um guia, seja utilizado, uma página do manual para esse "
-"comando ou guia será exibido. É predefinido que o programa 'man' seja "
-"utilizado para esta finalidade, porém pode ser substituído por outras opções "
-"ou variáveis de configuração."
+msgstr "Caso um comando, ou um guia, seja utilizado, uma página do manual para esse comando ou guia será exibido. É predefinido que o programa 'man' seja utilizado para esta finalidade, porém pode ser substituído por outras opções ou variáveis de configuração."
 
 #. type: Plain text
 #: en/git-help.txt:35
 #, priority:100
 msgid "If an alias is given, git shows the definition of the alias on standard output. To get the manual page for the aliased command, use `git COMMAND --help`."
-msgstr ""
-"Caso um apelido seja utilizado, o git exibe a definição do apelido na saída "
-"padrão. Para ver a página do manual para o comando ou apelido em questão, "
-"utilize `git COMMAND --help`."
+msgstr "Caso um apelido seja utilizado, o git exibe a definição do apelido na saída padrão. Para ver a página do manual para o comando ou apelido em questão, utilize `git COMMAND --help`."
 
 #. type: Plain text
 #: en/git-help.txt:38
 #, ignore-ellipsis, priority:100
 msgid "Note that `git --help ...` is identical to `git help ...` because the former is internally converted into the latter."
-msgstr ""
-"Observe que o `git --help ...` é idêntico ao `git help ...` porque o "
-"primeiro é convertido internamente para o último."
+msgstr "Observe que o `git --help ...` é idêntico ao `git help ...` porque o primeiro é convertido internamente para o último."
 
 #. type: Plain text
 #: en/git-help.txt:40
 #, priority:100
 msgid "To display the linkgit:git[1] man page, use `git help git`."
-msgstr ""
-"Para exibir a página do manual linkgit:git[1], utilize o comando `git help "
-"git`."
+msgstr "Para exibir a página do manual linkgit:git[1], utilize o comando `git help git`."
 
 #. type: Plain text
 #: en/git-help.txt:42
@@ -31611,9 +28966,7 @@ msgstr "Esta página pode ser exibida com 'git help help' ou `git help --help`"
 #: en/git-help.txt:49
 #, priority:100
 msgid "Prints all the available commands on the standard output. This option overrides any given command or guide name."
-msgstr ""
-"Exiba todos os comandos disponíveis na saída padrão. Esta opção substitui "
-"qualquer outro comando ou nome da guia."
+msgstr "Exiba todos os comandos disponíveis na saída padrão. Esta opção substitui qualquer outro comando ou nome da guia."
 
 #. type: Plain text
 #: en/git-help.txt:53
@@ -31631,9 +28984,7 @@ msgstr "--config"
 #: en/git-help.txt:58
 #, priority:100
 msgid "List all available configuration variables. This is a short summary of the list in linkgit:git-config[1]."
-msgstr ""
-"Liste todas as variáveis de configuração disponíveis. Este é um breve resumo "
-"da lista em linkgit:git-config[1]."
+msgstr "Liste todas as variáveis de configuração disponíveis. Este é um breve resumo da lista em linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-help.txt:60
@@ -31645,9 +28996,7 @@ msgstr "--guides"
 #: en/git-help.txt:63
 #, priority:100
 msgid "Prints a list of useful guides on the standard output. This option overrides any given command or guide name."
-msgstr ""
-"Exibe uma lista das guias úteis na saída padrão. Esta opção substitui "
-"qualquer outro comando ou nome da guia."
+msgstr "Exibe uma lista das guias úteis na saída padrão. Esta opção substitui qualquer outro comando ou nome da guia."
 
 #. type: Labeled list
 #: en/git-help.txt:65
@@ -31659,9 +29008,7 @@ msgstr "--info"
 #: en/git-help.txt:68
 #, priority:100
 msgid "Display manual page for the command in the 'info' format. The 'info' program will be used for that purpose."
-msgstr ""
-"Exiba a página do manual do comando no formato 'info'. O programa 'info' "
-"será utilizado para este fim."
+msgstr "Exiba a página do manual do comando no formato 'info'. O programa 'info' será utilizado para este fim."
 
 #. type: Labeled list
 #: en/git-help.txt:70
@@ -31673,19 +29020,13 @@ msgstr "--man"
 #: en/git-help.txt:74
 #, priority:100
 msgid "Display manual page for the command in the 'man' format. This option may be used to override a value set in the `help.format` configuration variable."
-msgstr ""
-"Exiba a página do manual para o comando no formato 'man'. Esta opção pode "
-"ser utilizada para substituir um valor definido na variável de configuração "
-"`help.format`."
+msgstr "Exiba a página do manual para o comando no formato 'man'. Esta opção pode ser utilizada para substituir um valor definido na variável de configuração `help.format`."
 
 #. type: Plain text
 #: en/git-help.txt:78
 #, priority:100
 msgid "By default the 'man' program will be used to display the manual page, but the `man.viewer` configuration variable may be used to choose other display programs (see below)."
-msgstr ""
-"É predefinido que o programa 'man' será utilizado para exibir a página do "
-"manual, mas a variável de configuração `man.viewer` pode ser utilizada para "
-"configurar outros programas de exibição (veja abaixo)."
+msgstr "É predefinido que o programa 'man' será utilizado para exibir a página do manual, mas a variável de configuração `man.viewer` pode ser utilizada para configurar outros programas de exibição (veja abaixo)."
 
 #. type: Labeled list
 #: en/git-help.txt:80
@@ -31697,9 +29038,7 @@ msgstr "--web"
 #: en/git-help.txt:83
 #, priority:100
 msgid "Display manual page for the command in the 'web' (HTML)  format. A web browser will be used for that purpose."
-msgstr ""
-"Exiba a página do manual do comando no formato 'web' (HTML). Um navegador da "
-"web será utilizado para este fim."
+msgstr "Exiba a página do manual do comando no formato 'web' (HTML). Um navegador da web será utilizado para este fim."
 
 #. type: Plain text
 #: en/git-help.txt:89
@@ -31723,11 +29062,7 @@ msgstr "help.format"
 #: en/git-help.txt:100
 #, priority:100
 msgid "If no command-line option is passed, the `help.format` configuration variable will be checked. The following values are supported for this variable; they make 'git help' behave as their corresponding command- line option:"
-msgstr ""
-"A variável de configuração `help.format` será verificada caso nenhuma opção "
-"na linha de comando for utilizada. Os seguintes valores são compatíveis com "
-"esta variável; eles fazem com que 'git help' se comporte como a sua opção na "
-"linha de comando correspondente:"
+msgstr "A variável de configuração `help.format` será verificada caso nenhuma opção na linha de comando for utilizada. Os seguintes valores são compatíveis com esta variável; eles fazem com que 'git help' se comporte como a sua opção na linha de comando correspondente:"
 
 #. type: Plain text
 #: en/git-help.txt:102
@@ -31757,11 +29092,7 @@ msgstr "help.browser, web.browser e browser.<ferramenta>.path"
 #: en/git-help.txt:112
 #, priority:100
 msgid "The `help.browser`, `web.browser` and `browser.<tool>.path` will also be checked if the 'web' format is chosen (either by command-line option or configuration variable). See '-w|--web' in the OPTIONS section above and linkgit:git-web{litdd}browse[1]."
-msgstr ""
-"O `help.browser`, `web.browser` e `browser.<ferramenta>.path` também serão "
-"averiguados caso o formato 'web' seja selecionado (seja por uma opção na "
-"linha de comando ou por uma variável de configuração). Consulte '-w|--web' "
-"na seção OPÇÕES acima e linkgit:git-web{litdd}browse[1]."
+msgstr "O `help.browser`, `web.browser` e `browser.<ferramenta>.path` também serão averiguados caso o formato 'web' seja selecionado (seja por uma opção na linha de comando ou por uma variável de configuração). Consulte '-w|--web' na seção OPÇÕES acima e linkgit:git-web{litdd}browse[1]."
 
 #. type: Title ~
 #: en/git-help.txt:114
@@ -31773,9 +29104,7 @@ msgstr "man.viewer"
 #: en/git-help.txt:118
 #, priority:100
 msgid "The `man.viewer` configuration variable will be checked if the 'man' format is chosen. The following values are currently supported:"
-msgstr ""
-"A variável de configuração `man.viewer` será verificada caso o formato 'man' "
-"seja selecionado. Os seguintes valores são compatíveis atualmente:"
+msgstr "A variável de configuração `man.viewer` será verificada caso o formato 'man' seja selecionado. Os seguintes valores são compatíveis atualmente:"
 
 #. type: Plain text
 #: en/git-help.txt:120
@@ -31787,34 +29116,25 @@ msgstr "O \"man\": utiliza o programa 'man' como de costume,"
 #: en/git-help.txt:122
 #, priority:100
 msgid "\"woman\": use 'emacsclient' to launch the \"woman\" mode in emacs (this only works starting with emacsclient versions 22),"
-msgstr ""
-"o \"woman\": utiliza o 'emacsclient' para iniciar o modo \"woman\" no emacs ("
-"isso só funciona a partir das versões 22 do emacsclient),"
+msgstr "o \"woman\": utiliza o 'emacsclient' para iniciar o modo \"woman\" no emacs (isso só funciona a partir das versões 22 do emacsclient),"
 
 #. type: Plain text
 #: en/git-help.txt:124
 #, priority:100
 msgid "\"konqueror\": use 'kfmclient' to open the man page in a new konqueror tab (see 'Note about konqueror' below)."
-msgstr ""
-"o \"konqueror\": utiliza o 'kfmclient' para abrir a página do manual em uma "
-"nova guia do konqueror (consulte 'Nota sobre o konqueror' abaixo)."
+msgstr "o \"konqueror\": utiliza o 'kfmclient' para abrir a página do manual em uma nova guia do konqueror (consulte 'Nota sobre o konqueror' abaixo)."
 
 #. type: Plain text
 #: en/git-help.txt:127
 #, priority:100
 msgid "Values for other tools can be used if there is a corresponding `man.<tool>.cmd` configuration entry (see below)."
-msgstr ""
-"Os valores para as outras ferramentas podem ser utilizadas caso haja uma "
-"entrada de configuração correspondente `man.<ferramenta>.cmd` (veja abaixo)."
+msgstr "Os valores para as outras ferramentas podem ser utilizadas caso haja uma entrada de configuração correspondente `man.<ferramenta>.cmd` (veja abaixo)."
 
 #. type: Plain text
 #: en/git-help.txt:131
 #, priority:100
 msgid "Multiple values may be given to the `man.viewer` configuration variable. Their corresponding programs will be tried in the order listed in the configuration file."
-msgstr ""
-"Vários valores que podem ser utilizados na variável de configuração `man."
-"viewer`. Os seus programas correspondentes serão tentados na ordem listada "
-"no arquivo de configuração."
+msgstr "Vários valores que podem ser utilizados na variável de configuração `man.viewer`. Os seus programas correspondentes serão tentados na ordem listada no arquivo de configuração."
 
 #. type: Plain text
 #: en/git-help.txt:133
@@ -31838,20 +29158,13 @@ msgstr ""
 #: en/git-help.txt:142
 #, priority:100
 msgid "will try to use konqueror first. But this may fail (for example, if DISPLAY is not set) and in that case emacs' woman mode will be tried."
-msgstr ""
-"tentará utilizar o konqueror primeiro. Mas isso pode falhar (caso a variável "
-"DISPLAY não estiver definido por exemplo) e nesse caso, será feito a "
-"tentativa no modo woman do emacs."
+msgstr "tentará utilizar o konqueror primeiro. Mas isso pode falhar (caso a variável DISPLAY não estiver definido por exemplo) e nesse caso, será feito a tentativa no modo woman do emacs."
 
 #. type: Plain text
 #: en/git-help.txt:146
 #, priority:100
 msgid "If everything fails, or if no viewer is configured, the viewer specified in the `GIT_MAN_VIEWER` environment variable will be tried.  If that fails too, the 'man' program will be tried anyway."
-msgstr ""
-"Caso tudo falhe, ou caso nenhum visualizador esteja configurado, será feito "
-"uma tentativa no visualizador especificado na variável de ambiente "
-"`GIT_MAN_VIEWER`.  Caso isso também falhe, o programa 'man' será testado "
-"mesmo assim."
+msgstr "Caso tudo falhe, ou caso nenhum visualizador esteja configurado, será feito uma tentativa no visualizador especificado na variável de ambiente `GIT_MAN_VIEWER`.  Caso isso também falhe, o programa 'man' será testado mesmo assim."
 
 #. type: Title ~
 #: en/git-help.txt:148
@@ -31863,12 +29176,7 @@ msgstr "man.<ferramenta>.path"
 #: en/git-help.txt:155
 #, priority:100
 msgid "You can explicitly provide a full path to your preferred man viewer by setting the configuration variable `man.<tool>.path`. For example, you can configure the absolute path to konqueror by setting 'man.konqueror.path'. Otherwise, 'git help' assumes the tool is available in PATH."
-msgstr ""
-"Você pode informar de forma explicita um caminho completo para o seu "
-"visualizador man preferido, definindo a variável de configuração "
-"`man.<ferramenta>.path`. Por exemplo, você pode configurar o caminho "
-"absoluto para o konqueror, configurando 'man.konqueror.path'. Caso "
-"contrário, 'git help' assume que a ferramenta está disponível no seu `PATH`."
+msgstr "Você pode informar de forma explicita um caminho completo para o seu visualizador man preferido, definindo a variável de configuração `man.<ferramenta>.path`. Por exemplo, você pode configurar o caminho absoluto para o konqueror, configurando 'man.konqueror.path'. Caso contrário, 'git help' assume que a ferramenta está disponível no seu `PATH`."
 
 #. type: Title ~
 #: en/git-help.txt:157
@@ -31880,13 +29188,7 @@ msgstr "man.<ferramenta>.cmd"
 #: en/git-help.txt:165
 #, priority:100
 msgid "When the man viewer, specified by the `man.viewer` configuration variables, is not among the supported ones, then the corresponding `man.<tool>.cmd` configuration variable will be looked up. If this variable exists then the specified tool will be treated as a custom command and a shell eval will be used to run the command with the man page passed as arguments."
-msgstr ""
-"Quando o visualizador man, definido através das variáveis de configuração "
-"`man.viewer`, não estiver entre as que são compatíveis, a variável de "
-"configuração correspondente `man.<ferramenta>.cmd` será pesquisada. Caso "
-"essa variável exista, a ferramenta informada será tratada como um comando "
-"personalizado e um shell eval será utilizado para executar o comando com a "
-"página do manual passada como argumentos."
+msgstr "Quando o visualizador man, definido através das variáveis de configuração `man.viewer`, não estiver entre as que são compatíveis, a variável de configuração correspondente `man.<ferramenta>.cmd` será pesquisada. Caso essa variável exista, a ferramenta informada será tratada como um comando personalizado e um shell eval será utilizado para executar o comando com a página do manual passada como argumentos."
 
 #. type: Title ~
 #: en/git-help.txt:167
@@ -31898,27 +29200,19 @@ msgstr "Uma observação sobre o konqueror"
 #: en/git-help.txt:172
 #, priority:100
 msgid "When 'konqueror' is specified in the `man.viewer` configuration variable, we launch 'kfmclient' to try to open the man page on an already opened konqueror in a new tab if possible."
-msgstr ""
-"Quando o 'konqueror' for definido na variável de configuração `man.viewer`, "
-"iniciamos o 'kfmclient' para tentar abrir a página do manual em um konqueror "
-"já aberto porém, em uma nova guia, se for possível."
+msgstr "Quando o 'konqueror' for definido na variável de configuração `man.viewer`, iniciamos o 'kfmclient' para tentar abrir a página do manual em um konqueror já aberto porém, em uma nova guia, se for possível."
 
 #. type: Plain text
 #: en/git-help.txt:176
 #, priority:100
 msgid "For consistency, we also try such a trick if 'man.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
-msgstr ""
-"Para uma maior consistência, também tentamos esse truque caso "
-"'man.konqueror.path' esteja definido em algo como `UM_CAMINHO_PARA_O/"
-"konqueror`. Significa que em vez disso, tentaremos iniciar o `"
-"UM_CAMINHO_PARA_O/kfmclient`."
+msgstr "Para uma maior consistência, também tentamos esse truque caso 'man.konqueror.path' esteja definido em algo como `UM_CAMINHO_PARA_O/konqueror`. Significa que em vez disso, tentaremos iniciar o `UM_CAMINHO_PARA_O/kfmclient`."
 
 #. type: Plain text
 #: en/git-help.txt:179 en/git-web--browse.txt:100
 #, priority:100
 msgid "If you really want to use 'konqueror', then you can use something like the following:"
-msgstr ""
-"Caso você realmente queira utilizar usar o 'konqueror', faça o seguinte:"
+msgstr "Caso você realmente queira utilizar usar o 'konqueror', faça o seguinte:"
 
 #. type: delimited block -
 #: en/git-help.txt:183
@@ -31950,9 +29244,7 @@ msgstr "Observação sobre o comando `git config --global`"
 #: en/git-help.txt:193
 #, priority:100
 msgid "Note that all these configuration variables should probably be set using the `--global` flag, for example like this:"
-msgstr ""
-"Observe que todas estas variáveis de configuração, provavelmente devem ser "
-"definidas utilizando a opção `--global`, assim por exemplo:"
+msgstr "Observe que todas estas variáveis de configuração, provavelmente devem ser definidas utilizando a opção `--global`, assim por exemplo:"
 
 #. type: delimited block -
 #: en/git-help.txt:197
@@ -31992,41 +29284,25 @@ msgstr "'git http-backend'\n"
 #: en/git-http-backend.txt:20
 #, priority:100
 msgid "A simple CGI program to serve the contents of a Git repository to Git clients accessing the repository over http:// and https:// protocols.  The program supports clients fetching using both the smart HTTP protocol and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol."
-msgstr ""
-"Um simples programa CGI para servir o conteúdo de um repositório Git para os "
-"clientes Git acessando o repositório nos protocolos http:// e https://.  O "
-"programa suporta a busca de clientes utilizando o protocolo HTTP inteligente "
-"e o protocolo HTTP antigo compatível com as versões anteriores, bem como os "
-"clientes impulsionando através do protocolo HTTP inteligente."
+msgstr "Um simples programa CGI para servir o conteúdo de um repositório Git para os clientes Git acessando o repositório nos protocolos http:// e https://.  O programa suporta a busca de clientes utilizando o protocolo HTTP inteligente e o protocolo HTTP antigo compatível com as versões anteriores, bem como os clientes impulsionando através do protocolo HTTP inteligente."
 
 #. type: Plain text
 #: en/git-http-backend.txt:25
 #, priority:100
 msgid "It verifies that the directory has the magic file \"git-daemon-export-ok\", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the `GIT_HTTP_EXPORT_ALL` environmental variable is set)."
-msgstr ""
-"Verifica se o diretório possui o arquivo mágico \"git-daemon-export-ok\" e "
-"se recusará a exportar qualquer diretório Git que não tenha sido "
-"explicitamente marcado para exportação (a menos que a variável ambiental "
-"`GIT_HTTP_EXPORT_ALL` esteja definida) ."
+msgstr "Verifica se o diretório possui o arquivo mágico \"git-daemon-export-ok\" e se recusará a exportar qualquer diretório Git que não tenha sido explicitamente marcado para exportação (a menos que a variável ambiental `GIT_HTTP_EXPORT_ALL` esteja definida) ."
 
 #. type: Plain text
 #: en/git-http-backend.txt:31
 #, priority:100
 msgid "By default, only the `upload-pack` service is enabled, which serves 'git fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', 'git pull', and 'git clone'.  If the client is authenticated, the `receive-pack` service is enabled, which serves 'git send-pack' clients, which is invoked from 'git push'."
-msgstr ""
-"É predefinido que apenas o serviço `upload-pack` esteja ativo, o que atende "
-"aos clientes 'git fetch-pack' e 'git ls-remote', que são chamados através do "
-"comando 'git fetch', 'git pull' e 'git clone' .  Caso o cliente seja "
-"autenticado, o serviço `receive-pack` é ativado, que oferece o 'git send-"
-"pack' aos clientes, que é chamado a partir do comando 'git push'."
+msgstr "É predefinido que apenas o serviço `upload-pack` esteja ativo, o que atende aos clientes 'git fetch-pack' e 'git ls-remote', que são chamados através do comando 'git fetch', 'git pull' e 'git clone' .  Caso o cliente seja autenticado, o serviço `receive-pack` é ativado, que oferece o 'git send-pack' aos clientes, que é chamado a partir do comando 'git push'."
 
 #. type: Plain text
 #: en/git-http-backend.txt:36
 #, priority:100
 msgid "These services can be enabled/disabled using the per-repository configuration file:"
-msgstr ""
-"Estes serviços podem ser ativados/desativados usando o arquivo de "
-"configuração por repositório:"
+msgstr "Estes serviços podem ser ativados/desativados usando o arquivo de configuração por repositório:"
 
 #. type: Labeled list
 #: en/git-http-backend.txt:37
@@ -32038,13 +29314,7 @@ msgstr "http.getanyfile"
 #: en/git-http-backend.txt:44
 #, priority:100
 msgid "This serves Git clients older than version 1.6.6 that are unable to use the upload pack service.  When enabled, clients are able to read any file within the repository, including objects that are no longer reachable from a branch but are still present.  It is enabled by default, but a repository can disable it by setting this configuration item to `false`."
-msgstr ""
-"Isso atende aos clientes Git anteriores à versão 1.6.6 que não conseguem "
-"utilizar o serviço do pacote de upload.  Quando ativado, os clientes podem "
-"ler qualquer arquivo no repositório, incluindo os objetos que não são mais "
-"acessíveis a partir de um ramo, mas ainda estão presentes.  É predefinido "
-"que esteja ativo, porém um repositório pode desativá-lo definindo este item "
-"de configuração como `false`."
+msgstr "Isso atende aos clientes Git anteriores à versão 1.6.6 que não conseguem utilizar o serviço do pacote de upload.  Quando ativado, os clientes podem ler qualquer arquivo no repositório, incluindo os objetos que não são mais acessíveis a partir de um ramo, mas ainda estão presentes.  É predefinido que esteja ativo, porém um repositório pode desativá-lo definindo este item de configuração como `false`."
 
 #. type: Labeled list
 #: en/git-http-backend.txt:45
@@ -32068,12 +29338,7 @@ msgstr "http.receivepack"
 #: en/git-http-backend.txt:56
 #, priority:100
 msgid "This serves 'git send-pack' clients, allowing push.  It is disabled by default for anonymous users, and enabled by default for users authenticated by the web server.  It can be disabled by setting this item to `false`, or enabled for all users, including anonymous users, by setting it to `true`."
-msgstr ""
-"Serve aos clientes o 'git send-pack', permitindo impulsionamento \"push\".  "
-"É predefinido que esteja inativo para os usuários anônimos e ativado para os "
-"usuários autenticados através do servidor da web.  Pode ser inativado caso "
-"este item seja definido como `false` ou ativado para todos os usuários, "
-"incluindo os usuários anônimos, caso seja definido como `true`."
+msgstr "Serve aos clientes o 'git send-pack', permitindo impulsionamento \"push\".  É predefinido que esteja inativo para os usuários anônimos e ativado para os usuários autenticados através do servidor da web.  Pode ser inativado caso este item seja definido como `false` ou ativado para todos os usuários, incluindo os usuários anônimos, caso seja definido como `true`."
 
 #. type: Title -
 #: en/git-http-backend.txt:58
@@ -32085,22 +29350,13 @@ msgstr "TRADUÇÃO DE URL"
 #: en/git-http-backend.txt:65
 #, priority:100
 msgid "To determine the location of the repository on disk, 'git http-backend' concatenates the environment variables PATH_INFO, which is set automatically by the web server, and GIT_PROJECT_ROOT, which must be set manually in the web server configuration.  If GIT_PROJECT_ROOT is not set, 'git http-backend' reads PATH_TRANSLATED, which is also set automatically by the web server."
-msgstr ""
-"Para determinar a localização do repositório no disco, o comando 'git http-"
-"backend' concatena as variáveis do ambiente `PATH_INFO`, que são definidas "
-"automaticamente através do servidor web, e o `GIT_PROJECT_ROOT`, que deve "
-"ser definido manualmente na configuração do servidor da web.  Caso o "
-"`GIT_PROJECT_ROOT` não esteja definido, o comando 'git http-backend' exibirá "
-"o `PATH_TRANSLATED`, que também é definido automaticamente através do "
-"servidor web."
+msgstr "Para determinar a localização do repositório no disco, o comando 'git http-backend' concatena as variáveis do ambiente `PATH_INFO`, que são definidas automaticamente através do servidor web, e o `GIT_PROJECT_ROOT`, que deve ser definido manualmente na configuração do servidor da web.  Caso o `GIT_PROJECT_ROOT` não esteja definido, o comando 'git http-backend' exibirá o `PATH_TRANSLATED`, que também é definido automaticamente através do servidor web."
 
 #. type: Plain text
 #: en/git-http-backend.txt:70
 #, priority:100
 msgid "All of the following examples map `http://$hostname/git/foo/bar.git` to `/var/www/git/foo/bar.git`."
-msgstr ""
-"Todos os exemplos a seguir mapeiam o `http://$hostname/git/foo/bar.git` para "
-"`/var/www/git/foo/bar.git`."
+msgstr "Todos os exemplos a seguir mapeiam o `http://$hostname/git/foo/bar.git` para `/var/www/git/foo/bar.git`."
 
 #. type: Labeled list
 #: en/git-http-backend.txt:71
@@ -32112,10 +29368,7 @@ msgstr "Apache 2.x"
 #: en/git-http-backend.txt:75
 #, priority:100
 msgid "Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
-msgstr ""
-"Certifique-se que o 'mod_cgi', 'mod_alias' e 'mod_env' estejam ativos, "
-"defina o `GIT_PROJECT_ROOT` (ou 'DocumentRoot') adequadamente e crie um "
-"\"ScriptAlias\" para o CGI:"
+msgstr "Certifique-se que o 'mod_cgi', 'mod_alias' e 'mod_env' estejam ativos, defina o `GIT_PROJECT_ROOT` (ou 'DocumentRoot') adequadamente e crie um \"ScriptAlias\" para o CGI:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:80
@@ -32133,11 +29386,7 @@ msgstr ""
 #: en/git-http-backend.txt:86
 #, priority:100
 msgid "To enable anonymous read access but authenticated write access, require authorization for both the initial ref advertisement (which we detect as a push via the service parameter in the query string), and the receive-pack invocation itself:"
-msgstr ""
-"Para habilitar o acesso de leitura anônima, porém com acesso de gravação "
-"autenticado, exija a autorização para o anúncio da \"ref\" inicial (que "
-"detectamos como um \"push\" por meio do parâmetro \"service\" na cadeia de "
-"consulta) e a própria chamada do pacote de recebimento:"
+msgstr "Para habilitar o acesso de leitura anônima, porém com acesso de gravação autenticado, exija a autorização para o anúncio da \"ref\" inicial (que detectamos como um \"push\" por meio do parâmetro \"service\" na cadeia de consulta) e a própria chamada do pacote de recebimento:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:91
@@ -32185,10 +29434,7 @@ msgstr ""
 #: en/git-http-backend.txt:107
 #, priority:100
 msgid "If you do not have `mod_rewrite` available to match against the query string, it is sufficient to just protect `git-receive-pack` itself, like:"
-msgstr ""
-"Caso não tenha o `mod_rewrite` disponível para coincidir com o texto sob "
-"consulta é suficiente apenas para proteger o próprio` git-receive-pack`, "
-"como:"
+msgstr "Caso não tenha o `mod_rewrite` disponível para coincidir com o texto sob consulta é suficiente apenas para proteger o próprio` git-receive-pack`, como:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:115
@@ -32212,23 +29458,13 @@ msgstr ""
 #: en/git-http-backend.txt:125
 #, priority:100
 msgid "In this mode, the server will not request authentication until the client actually starts the object negotiation phase of the push, rather than during the initial contact.  For this reason, you must also enable the `http.receivepack` config option in any repositories that should accept a push. The default behavior, if `http.receivepack` is not set, is to reject any pushes by unauthenticated users; the initial request will therefore report `403 Forbidden` to the client, without even giving an opportunity for authentication."
-msgstr ""
-"Nesse modo, o servidor não solicitará uma autenticação até que o cliente "
-"realmente inicie a fase de negociação do objeto impulsionado (push) e não "
-"durante o contato inicial.  Por este motivo, você também deve ativar a opção "
-"da configuração `http.receivepack` em qualquer repositório que aceite um "
-"impulsionamento \"push\". O comportamento predefinido, caso a variável `http."
-"receivepack` não esteja definida, é rejeitar qualquer impulsionamento \"push"
-"\" feito pelos usuários não autenticados; a solicitação inicial reportará, "
-"'403 Proibido' ao cliente, sem qualquer chance para uma autenticação."
+msgstr "Nesse modo, o servidor não solicitará uma autenticação até que o cliente realmente inicie a fase de negociação do objeto impulsionado (push) e não durante o contato inicial.  Por este motivo, você também deve ativar a opção da configuração `http.receivepack` em qualquer repositório que aceite um impulsionamento \"push\". O comportamento predefinido, caso a variável `http.receivepack` não esteja definida, é rejeitar qualquer impulsionamento \"push\" feito pelos usuários não autenticados; a solicitação inicial reportará, '403 Proibido' ao cliente, sem qualquer chance para uma autenticação."
 
 #. type: Plain text
 #: en/git-http-backend.txt:128
 #, priority:100
 msgid "To require authentication for both reads and writes, use a Location directive around the repository, or one of its parent directories:"
-msgstr ""
-"Para exigir a autenticação para ambas as leituras e gravações, utilize uma "
-"diretiva local ao redor do repositório ou um dos seus diretórios upstream:"
+msgstr "Para exigir a autenticação para ambas as leituras e gravações, utilize uma diretiva local ao redor do repositório ou um dos seus diretórios upstream:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:136
@@ -32252,10 +29488,7 @@ msgstr ""
 #: en/git-http-backend.txt:141
 #, priority:100
 msgid "To serve gitweb at the same url, use a ScriptAliasMatch to only those URLs that 'git http-backend' can handle, and forward the rest to gitweb:"
-msgstr ""
-"Para veicular o gitweb na mesma URL, utilize um 'ScriptAliasMatch' apenas "
-"para ss URLs que o 'git http-backend' pode manipular e encaminhe o restante "
-"para o gitweb:"
+msgstr "Para veicular o gitweb na mesma URL, utilize um 'ScriptAliasMatch' apenas para ss URLs que o 'git http-backend' pode manipular e encaminhe o restante para o gitweb:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:151
@@ -32289,9 +29522,7 @@ msgstr "ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
 #: en/git-http-backend.txt:157
 #, priority:100
 msgid "To serve multiple repositories from different linkgit:gitnamespaces[7] in a single repository:"
-msgstr ""
-"Para servir os vários repositórios vindos de diferentes "
-"linkgit:gitnamespaces[7] em um único repositório:"
+msgstr "Para servir os vários repositórios vindos de diferentes linkgit:gitnamespaces[7] em um único repositório:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:161
@@ -32301,8 +29532,7 @@ msgid ""
 "ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.git$1\n"
 msgstr ""
 "SetEnvIf Request_URI \"^/git/([^/]*)\" GIT_NAMESPACE=$1\n"
-"ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/"
-"storage.git$1\n"
+"ScriptAliasMatch ^/git/[^/]*(.*) /usr/libexec/git-core/git-http-backend/storage.git$1\n"
 
 #. type: Labeled list
 #: en/git-http-backend.txt:163
@@ -32314,11 +29544,7 @@ msgstr "Apache estático acelerado 2.x"
 #: en/git-http-backend.txt:168
 #, priority:100
 msgid "Similar to the above, but Apache can be used to return static files that are stored on disk.  On many systems this may be more efficient as Apache can ask the kernel to copy the file contents from the file system directly to the network:"
-msgstr ""
-"Semelhante ao anterior, porém o Apache pode ser usado para retornar arquivos "
-"estáticos armazenados no disco.  Isso pode ser mais eficiente em muitos "
-"sistemas, pois o Apache pode solicitar ao kernel que copie o conteúdo do "
-"arquivo do sistema de arquivos diretamente para a rede:"
+msgstr "Semelhante ao anterior, porém o Apache pode ser usado para retornar arquivos estáticos armazenados no disco.  Isso pode ser mais eficiente em muitos sistemas, pois o Apache pode solicitar ao kernel que copie o conteúdo do arquivo do sistema de arquivos diretamente para a rede:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:171 en/git-http-backend.txt:181
@@ -32334,10 +29560,8 @@ msgid ""
 "AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
 "ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
 msgstr ""
-"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/"
-"git/$1\n"
-"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/"
-"git/$1\n"
+"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
 "ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/\n"
 
 #. type: Plain text
@@ -32360,10 +29584,8 @@ msgid ""
 "\t/usr/libexec/git-core/git-http-backend/$1\n"
 "ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/\n"
 msgstr ""
-"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/"
-"git/$1\n"
-"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/"
-"git/$1\n"
+"AliasMatch ^/git/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$          /var/www/git/$1\n"
+"AliasMatch ^/git/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /var/www/git/$1\n"
 "ScriptAliasMatch \\\n"
 "\t\"(?x)^/git/(.*/(HEAD | \\\n"
 "\t\t\tinfo/refs | \\\n"
@@ -32382,10 +29604,7 @@ msgstr "Lighttpd"
 #: en/git-http-backend.txt:197
 #, priority:100
 msgid "Ensure that `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` are loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect all requests to the CGI:"
-msgstr ""
-"Certifique-se de que `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` "
-"estejam carregados, então defina a variável `GIT_PROJECT_ROOT` adequadamente "
-"e redirecione todas as solicitações para o CGI:"
+msgstr "Certifique-se de que `mod_cgi`, `mod_alias`, `mod_auth`, `mod_setenv` estejam carregados, então defina a variável `GIT_PROJECT_ROOT` adequadamente e redirecione todas as solicitações para o CGI:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:207
@@ -32413,9 +29632,7 @@ msgstr ""
 #: en/git-http-backend.txt:210
 #, priority:100
 msgid "To enable anonymous read access but authenticated write access:"
-msgstr ""
-"Para ativar o acesso de leitura anônima porém o acesso de gravação "
-"autenticado:"
+msgstr "Para ativar o acesso de leitura anônima porém o acesso de gravação autenticado:"
 
 #. type: delimited block -
 #: en/git-http-backend.txt:218
@@ -32485,17 +29702,13 @@ msgstr ""
 #: en/git-http-backend.txt:246
 #, priority:100
 msgid "'git http-backend' relies upon the `CGI` environment variables set by the invoking web server, including:"
-msgstr ""
-"O 'git http-backend' conta com as variáveis do ambiente `CGI` definidas pelo "
-"servidor da Web que está sendo invocado, incluindo:"
+msgstr "O 'git http-backend' conta com as variáveis do ambiente `CGI` definidas pelo servidor da Web que está sendo invocado, incluindo:"
 
 #. type: Plain text
 #: en/git-http-backend.txt:248
 #, priority:100
 msgid "PATH_INFO (if GIT_PROJECT_ROOT is set, otherwise PATH_TRANSLATED)"
-msgstr ""
-"`PATH_INFO` (caso `GIT_PROJECT_ROOT` seja definido, caso contrário utilize "
-"`PATH_TRANSLATED`)"
+msgstr "`PATH_INFO` (caso `GIT_PROJECT_ROOT` seja definido, caso contrário utilize `PATH_TRANSLATED`)"
 
 #. type: Plain text
 #: en/git-http-backend.txt:249
@@ -32531,43 +29744,25 @@ msgstr "REQUEST_METHOD"
 #: en/git-http-backend.txt:257
 #, priority:100
 msgid "The `GIT_HTTP_EXPORT_ALL` environmental variable may be passed to 'git-http-backend' to bypass the check for the \"git-daemon-export-ok\" file in each repository before allowing export of that repository."
-msgstr ""
-"A variável de ambiente `GIT_HTTP_EXPORT_ALL` pode ser passada para o comando "
-"'git-http-backend' para ignorar a verificação do arquivo \"git-daemon-export-"
-"ok\" em cada repositório antes de permitir a exportação desse repositório."
+msgstr "A variável de ambiente `GIT_HTTP_EXPORT_ALL` pode ser passada para o comando 'git-http-backend' para ignorar a verificação do arquivo \"git-daemon-export-ok\" em cada repositório antes de permitir a exportação desse repositório."
 
 #. type: Plain text
 #: en/git-http-backend.txt:266
 #, priority:100
 msgid "The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http.maxRequestBuffer` config variable) may be set to change the largest ref negotiation request that git will handle during a fetch; any fetch requiring a larger buffer will not succeed.  This value should not normally need to be changed, but may be helpful if you are fetching from a repository with an extremely large number of refs.  The value can be specified with a unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
-msgstr ""
-"A variável de ambiente `GIT_HTTP_MAX_REQUEST_BUFFER` (ou a variável de "
-"configuração `http.maxRequestBuffer`) pode ser configurada para alterar a "
-"maior solicitação de negociação \"ref\" que o git será capaz de manipular "
-"durante uma busca; qualquer busca que exija um buffer maior não terá êxito.  "
-"Normalmente, esse valor não precisa ser alterado, mas pode ser útil caso "
-"você esteja buscando um repositório com uma quantidade de refs extremamente "
-"grande.  O valor pode ser definido como uma unidade (`100M` para 100 "
-"megabytes por exemplo). O valor predefinido é de 10 megabytes."
+msgstr "A variável de ambiente `GIT_HTTP_MAX_REQUEST_BUFFER` (ou a variável de configuração `http.maxRequestBuffer`) pode ser configurada para alterar a maior solicitação de negociação \"ref\" que o git será capaz de manipular durante uma busca; qualquer busca que exija um buffer maior não terá êxito.  Normalmente, esse valor não precisa ser alterado, mas pode ser útil caso você esteja buscando um repositório com uma quantidade de refs extremamente grande.  O valor pode ser definido como uma unidade (`100M` para 100 megabytes por exemplo). O valor predefinido é de 10 megabytes."
 
 #. type: Plain text
 #: en/git-http-backend.txt:271
 #, priority:100
 msgid "The backend process sets GIT_COMMITTER_NAME to '$REMOTE_USER' and GIT_COMMITTER_EMAIL to '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', ensuring that any reflogs created by 'git-receive-pack' contain some identifying information of the remote user who performed the push."
-msgstr ""
-"A estrutura define o `GIT_COMMITTER_NAME` como '$REMOTE_USER' e "
-"`GIT_COMMITTER_EMAIL` como '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', "
-"garantindo que quaisquer reflogs que forem criados através do comando 'git-"
-"receive-pack' contenham algumas informações de identificação do ramo remoto "
-"do usuário que executou o push."
+msgstr "A estrutura define o `GIT_COMMITTER_NAME` como '$REMOTE_USER' e `GIT_COMMITTER_EMAIL` como '$\\{REMOTE_USER}@http.$\\{REMOTE_ADDR\\}', garantindo que quaisquer reflogs que forem criados através do comando 'git-receive-pack' contenham algumas informações de identificação do ramo remoto do usuário que executou o push."
 
 #. type: Plain text
 #: en/git-http-backend.txt:274
 #, priority:100
 msgid "All `CGI` environment variables are available to each of the hooks invoked by the 'git-receive-pack'."
-msgstr ""
-"Todas as variáveis do ambiente `CGI` estão disponíveis para cada um dos "
-"ganchos invocados pelo comando 'git-receive-pack'."
+msgstr "Todas as variáveis do ambiente `CGI` estão disponíveis para cada um dos ganchos invocados pelo comando 'git-receive-pack'."
 
 #. type: Title =
 #: en/git-http-fetch.txt:2
@@ -32579,16 +29774,14 @@ msgstr "git-http-fetch(1)"
 #: en/git-http-fetch.txt:7
 #, priority:100
 msgid "git-http-fetch - Download from a remote Git repository via HTTP"
-msgstr ""
-"git-http-fetch - Faça o download de um repositório Git remoto através de HTTP"
+msgstr "git-http-fetch - Faça o download de um repositório Git remoto através de HTTP"
 
 #. type: Plain text
 #: en/git-http-fetch.txt:13
-#, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
-msgstr ""
-"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin]"
-" <commit> <url>\n"
+#, fuzzy, no-wrap, priority:100
+#| msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
+msgstr "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
 
 #. type: Plain text
 #: en/git-http-fetch.txt:17
@@ -32600,10 +29793,7 @@ msgstr "Faz o download de um repositório remoto Git através do HTTP."
 #: en/git-http-fetch.txt:21
 #, priority:100
 msgid "This command always gets all objects. Historically, there were three options `-a`, `-c` and `-t` for choosing which objects to download. They are now silently ignored."
-msgstr ""
-"Este comando sempre obtém todos os objetos. Historicamente, havia três "
-"opções `-a`, `-c` e `-t` para escolher quais os objetos baixar. Agora eles "
-"são ignorados de forma silenciosa."
+msgstr "Este comando sempre obtém todos os objetos. Historicamente, havia três opções `-a`, `-c` e `-t` para escolher quais os objetos baixar. Agora eles são ignorados de forma silenciosa."
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:24
@@ -32645,17 +29835,13 @@ msgstr "-w <nome-do-arquivo>"
 #: en/git-http-fetch.txt:36
 #, priority:100
 msgid "Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the local end after the transfer is complete."
-msgstr ""
-"Grava o ID do commit no nome do arquivo sob '$GIT_DIR/refs/<nome-do-"
-"arquivo>' no local final depois que a transferência tenha sido concluída."
+msgstr "Grava o ID do commit no nome do arquivo sob '$GIT_DIR/refs/<nome-do-arquivo>' no local final depois que a transferência tenha sido concluída."
 
 #. type: Plain text
 #: en/git-http-fetch.txt:40
 #, priority:100
 msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' expects lines on stdin in the format"
-msgstr ""
-"Em vez de um ID do commit na linha de comando (o que não é esperado neste "
-"caso), 'git http-fetch' espera pelas linhas no stdin no formato"
+msgstr "Em vez de um ID do commit na linha de comando (o que não é esperado neste caso), 'git http-fetch' espera pelas linhas no stdin no formato"
 
 #. type: Plain text
 #: en/git-http-fetch.txt:42
@@ -32665,17 +29851,28 @@ msgstr "<commit-id>['\\t'<nome-do-arquivo-como-em--w>]\n"
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, fuzzy, no-wrap, priority:100
+#| msgid "--file=<path>"
+msgid "--packfile=<hash>"
+msgstr "--file=<caminho>"
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
-msgstr ""
-"Verifique se tudo o que seja acessível a partir do destino já foi obtido.  "
-"Utilizado depois que uma busca anterior tenha sido interrompida."
+msgstr "Verifique se tudo o que seja acessível a partir do destino já foi obtido.  Utilizado depois que uma busca anterior tenha sido interrompida."
 
 #. type: Title =
 #: en/git-http-push.txt:2
@@ -32687,24 +29884,19 @@ msgstr "git-http-push(1)"
 #: en/git-http-push.txt:7
 #, priority:100
 msgid "git-http-push - Push objects over HTTP/DAV to another repository"
-msgstr ""
-"git-http-push - Impulsiona os objetos por HTTP/DAV para um outro repositório"
+msgstr "git-http-push - Impulsiona os objetos por HTTP/DAV para um outro repositório"
 
 #. type: Plain text
 #: en/git-http-push.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
-msgstr ""
-"'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> "
-"[<ref>...]\n"
+msgstr "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
 
 #. type: Plain text
 #: en/git-http-push.txt:18
 #, priority:100
 msgid "Sends missing objects to remote repository, and updates the remote branch."
-msgstr ""
-"Envia os objetos ausentes para o repositório remoto e atualiza a ramificação "
-"remota."
+msgstr "Envia os objetos ausentes para o repositório remoto e atualiza a ramificação remota."
 
 #. type: Plain text
 #: en/git-http-push.txt:22
@@ -32714,8 +29906,7 @@ msgid ""
 "is older than 7.16, as the combination has been reported\n"
 "not to work and sometimes corrupts repository.\n"
 msgstr ""
-"*OBSERVAÇÃO*: Este comando está temporariamente desativado caso o seu "
-"libcurl\n"
+"*OBSERVAÇÃO*: Este comando está temporariamente desativado caso o seu libcurl\n"
 "seja anterior a versão 7,16, pois a combinação foi relatada\n"
 "para não funcionar e às vezes corrompe o repositório.\n"
 
@@ -32723,10 +29914,7 @@ msgstr ""
 #: en/git-http-push.txt:29
 #, priority:100
 msgid "Do not assume that the remote repository is complete in its current state, and verify all objects in the entire local ref's history exist in the remote repository."
-msgstr ""
-"Não assuma que o repositório remoto esteja completo na sua condição atual e "
-"verifique se todos os objetos em todo o histórico da referência local "
-"existem no repositório remoto."
+msgstr "Não assuma que o repositório remoto esteja completo na sua condição atual e verifique se todos os objetos em todo o histórico da referência local existem no repositório remoto."
 
 #. type: Plain text
 #: en/git-http-push.txt:36 en/git-send-pack.txt:60
@@ -32744,18 +29932,13 @@ msgstr "Faça tudo, exceto realmente enviar as atualizações."
 #: en/git-http-push.txt:43
 #, priority:100
 msgid "Report the list of objects being walked locally and the list of objects successfully sent to the remote repository."
-msgstr ""
-"Relate a lista dos objetos sendo percorridos localmente e a lista dos "
-"objetos enviados com sucesso para o repositório remoto."
+msgstr "Relate a lista dos objetos sendo percorridos localmente e a lista dos objetos enviados com sucesso para o repositório remoto."
 
 #. type: Plain text
 #: en/git-http-push.txt:49
 #, priority:100
 msgid "Remove <ref> from remote repository.  The specified branch cannot be the remote HEAD.  If -d is specified the following other conditions must also be met:"
-msgstr ""
-"Remova a `<ref>` do repositório remoto.  O ramo especificado não pode ser o "
-"`HEAD` remoto.  Caso o `-d` seja utilizado, as outras condições a seguir "
-"também deverão ser atendidas:"
+msgstr "Remova a `<ref>` do repositório remoto.  O ramo especificado não pode ser o `HEAD` remoto.  Caso o `-d` seja utilizado, as outras condições a seguir também deverão ser atendidas:"
 
 #. type: Plain text
 #: en/git-http-push.txt:51
@@ -32797,11 +29980,7 @@ msgstr "ESPECIFICANDO AS REFS"
 #: en/git-http-push.txt:65
 #, priority:100
 msgid "A '<ref>' specification can be either a single pattern, or a pair of such patterns separated by a colon \":\" (this means that a ref name cannot have a colon in it).  A single pattern '<name>' is just a shorthand for '<name>:<name>'."
-msgstr ""
-"Uma especificação '<ref>' pode ser um padrão único ou um par desses padrões "
-"separados por dois pontos \":\" (significa que um nome \"ref\" não pode "
-"conter dois pontos).  Um único padrão '<nome>' é apenas uma abreviação para "
-"'<nome>:<nome>'."
+msgstr "Uma especificação '<ref>' pode ser um padrão único ou um par desses padrões separados por dois pontos \":\" (significa que um nome \"ref\" não pode conter dois pontos).  Um único padrão '<nome>' é apenas uma abreviação para '<nome>:<nome>'."
 
 #. type: Plain text
 #: en/git-http-push.txt:71
@@ -32831,38 +30010,25 @@ msgstr "é preciso iniciar com \"refs/\"; o <dst> é utilizado literalmente como
 #: en/git-http-push.txt:83 en/git-send-pack.txt:142
 #, priority:100
 msgid "<src> == <dst> and the ref that matched the <src> must not exist in the set of remote refs; the ref matched <src> locally is used as the name of the destination."
-msgstr ""
-"<src> == <dst> e a referência que coincida com <src> não devem existir no "
-"conjunto de refs remotas; o \"ref\" que coincida com o <src> localmente é "
-"utilizado como o nome do destino."
+msgstr "<src> == <dst> e a referência que coincida com <src> não devem existir no conjunto de refs remotas; o \"ref\" que coincida com o <src> localmente é utilizado como o nome do destino."
 
 #. type: Plain text
 #: en/git-http-push.txt:89 en/git-send-pack.txt:148
 #, priority:100
 msgid "Without `--force`, the <src> ref is stored at the remote only if <dst> does not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>.  This check, known as \"fast-forward check\", is performed in order to avoid accidentally overwriting the remote ref and lose other peoples' commits from there."
-msgstr ""
-"Sem `--force`, a fonte do `<src>` \"ref\" é armazenado no ramo remoto apenas "
-"caso o destino `<dst>` não exista ou o destino `<dst>` seja um subconjunto "
-"apropriado (ou seja, um ancestral) da origem `<src>`.  Esta verificação, "
-"conhecida como \"verificação de avanço rápido\", é realizada para evitar "
-"sobrescrever acidentalmente a \"ref\" remota e perder os commits de outras "
-"pessoas a partir daí."
+msgstr "Sem `--force`, a fonte do `<src>` \"ref\" é armazenado no ramo remoto apenas caso o destino `<dst>` não exista ou o destino `<dst>` seja um subconjunto apropriado (ou seja, um ancestral) da origem `<src>`.  Esta verificação, conhecida como \"verificação de avanço rápido\", é realizada para evitar sobrescrever acidentalmente a \"ref\" remota e perder os commits de outras pessoas a partir daí."
 
 #. type: Plain text
 #: en/git-http-push.txt:91 en/git-send-pack.txt:150
 #, priority:100
 msgid "With `--force`, the fast-forward check is disabled for all refs."
-msgstr ""
-"Com `--force`, a verificação do avanço rápido é desativado para todas as "
-"refs."
+msgstr "Com `--force`, a verificação do avanço rápido é desativado para todas as refs."
 
 #. type: Plain text
 #: en/git-http-push.txt:94 en/git-send-pack.txt:153
 #, priority:100
 msgid "Optionally, a <ref> parameter can be prefixed with a plus '+' sign to disable the fast-forward check only on that ref."
-msgstr ""
-"Opcionalmente, um parâmetro <ref> pode ser prefixado com um sinal de mais '+"
-"' para desativar a verificação de avanço rápido apenas nessa \"ref\"."
+msgstr "Opcionalmente, um parâmetro <ref> pode ser prefixado com um sinal de mais '+' para desativar a verificação de avanço rápido apenas nessa \"ref\"."
 
 #. type: Title =
 #: en/git-imap-send.txt:2
@@ -32874,8 +30040,7 @@ msgstr "git-imap-send(1)"
 #: en/git-imap-send.txt:7
 #, priority:100
 msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-"git-imap-send - Envia uma coleção de patches do stdin para um diretório IMAP"
+msgstr "git-imap-send - Envia uma coleção de patches do stdin para um diretório IMAP"
 
 #. type: Plain text
 #: en/git-imap-send.txt:13
@@ -32887,13 +30052,7 @@ msgstr "'git imap-send' [-v] [-q] [--[no-]curl]\n"
 #: en/git-imap-send.txt:23
 #, priority:100
 msgid "This command uploads a mailbox generated with 'git format-patch' into an IMAP drafts folder.  This allows patches to be sent as other email is when using mail clients that cannot read mailbox files directly. The command also works with any general mailbox in which emails have the fields \"From\", \"Date\", and \"Subject\" in that order."
-msgstr ""
-"Este comando carrega uma caixa de correio gerada com 'git format-patch' em "
-"um diretório de rascunhos IMAP.  Permite que os patches sejam enviados como "
-"ocorre com os outros emails ao utilizar clientes de email que não podem ler "
-"diretamente os arquivos da caixa de correio. O comando também funciona com "
-"qualquer caixa de correio geral na qual os e-mails tenham os campos \"De\", "
-"\"Data\" e \"Assunto\" nesta ordem."
+msgstr "Este comando carrega uma caixa de correio gerada com 'git format-patch' em um diretório de rascunhos IMAP.  Permite que os patches sejam enviados como ocorre com os outros emails ao utilizar clientes de email que não podem ler diretamente os arquivos da caixa de correio. O comando também funciona com qualquer caixa de correio geral na qual os e-mails tenham os campos \"De\", \"Data\" e \"Assunto\" nesta ordem."
 
 #. type: Plain text
 #: en/git-imap-send.txt:25
@@ -32923,10 +30082,7 @@ msgstr "--curl"
 #: en/git-imap-send.txt:44
 #, priority:100
 msgid "Use libcurl to communicate with the IMAP server, unless tunneling into it.  Ignored if Git was built without the USE_CURL_FOR_IMAP_SEND option set."
-msgstr ""
-"Utilize o libcurl para se comunicar com o servidor IMAP, a menos que faça um "
-"tunelamento para ele.  É Ignorado caso o Git tenha sido compilado sem a "
-"opção `USE_CURL_FOR_IMAP_SEND` definida."
+msgstr "Utilize o libcurl para se comunicar com o servidor IMAP, a menos que faça um tunelamento para ele.  É Ignorado caso o Git tenha sido compilado sem a opção `USE_CURL_FOR_IMAP_SEND` definida."
 
 #. type: Labeled list
 #: en/git-imap-send.txt:45
@@ -32938,18 +30094,13 @@ msgstr "--no-curl"
 #: en/git-imap-send.txt:49
 #, priority:100
 msgid "Talk to the IMAP server using git's own IMAP routines instead of using libcurl.  Ignored if Git was built with the NO_OPENSSL option set."
-msgstr ""
-"Converse com o servidor IMAP utilizando as próprias rotinas IMAP do git em "
-"vez de utilizar as da libcurl.  É Ignorado caso o Git tenha sido compilado "
-"com a opção `NO_OPENSSL` definida."
+msgstr "Converse com o servidor IMAP utilizando as próprias rotinas IMAP do git em vez de utilizar as da libcurl.  É Ignorado caso o Git tenha sido compilado com a opção `NO_OPENSSL` definida."
 
 #. type: Plain text
 #: en/git-imap-send.txt:56
 #, priority:100
 msgid "To use the tool, imap.folder and either imap.tunnel or imap.host must be set to appropriate values."
-msgstr ""
-"Para utilizar a ferramenta, o 'imap.folder' e o 'imap.tunnel' ou o "
-"'imap.host' devem ser configurados com os valores apropriados."
+msgstr "Para utilizar a ferramenta, o 'imap.folder' e o 'imap.tunnel' ou o 'imap.host' devem ser configurados com os valores apropriados."
 
 #. type: Plain text
 #: en/git-imap-send.txt:66
@@ -32967,8 +30118,7 @@ msgid ""
 msgstr ""
 "[imap]\n"
 "    folder = \"INBOX.Drafts\"\n"
-"    tunnel = \"ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/"
-"null\"\n"
+"    tunnel = \"ssh -q -C user@example.com /usr/bin/imapd ./Maildir 2> /dev/null\"\n"
 
 #. type: Plain text
 #: en/git-imap-send.txt:74
@@ -33022,9 +30172,7 @@ msgstr ""
 #: en/git-imap-send.txt:100
 #, priority:100
 msgid "To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig to specify your account settings:"
-msgstr ""
-"Para enviar os patches utilizando a interface IMAP do GMail, primeiro edite "
-"o seu ~/.gitconfig para definir as configurações da sua conta:"
+msgstr "Para enviar os patches utilizando a interface IMAP do GMail, primeiro edite o seu ~/.gitconfig para definir as configurações da sua conta:"
 
 #. type: delimited block -
 #: en/git-imap-send.txt:108
@@ -33048,35 +30196,25 @@ msgstr ""
 #: en/git-imap-send.txt:112
 #, priority:100
 msgid "You might need to instead use: folder = \"[Google Mail]/Drafts\" if you get an error that the \"Folder doesn't exist\"."
-msgstr ""
-"Você pode precisar utilizar: folder = \"[Google Mail]/Drafts\" caso receba "
-"um erro indicando que a \"O diretório não existe\"."
+msgstr "Você pode precisar utilizar: folder = \"[Google Mail]/Drafts\" caso receba um erro indicando que a \"O diretório não existe\"."
 
 #. type: Plain text
 #: en/git-imap-send.txt:114
 #, priority:100
 msgid "Once the commits are ready to be sent, run the following command:"
-msgstr ""
-"Quando os commits estiverem prontos para serem enviados, execute o seguinte "
-"comando:"
+msgstr "Quando os commits estiverem prontos para serem enviados, execute o seguinte comando:"
 
 #. type: Plain text
 #: en/git-imap-send.txt:116
 #, no-wrap, priority:100
 msgid "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
-msgstr ""
-"  $ git format-patch --cover-letter -M --stdout origin/master | git imap-"
-"send\n"
+msgstr "  $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
 
 #. type: Plain text
 #: en/git-imap-send.txt:120
 #, priority:100
 msgid "Just make sure to disable line wrapping in the email client (GMail's web interface will wrap lines no matter what, so you need to use a real IMAP client)."
-msgstr ""
-"Apenas certifique-se de desabilitar a quebra de linha no cliente de email (a "
-"interface da Web do GMail sempre irá quebrar as linhas independentemente de "
-"qualquer coisa, portanto, você precisará utilizar um cliente IMAP de "
-"verdade)."
+msgstr "Apenas certifique-se de desabilitar a quebra de linha no cliente de email (a interface da Web do GMail sempre irá quebrar as linhas independentemente de qualquer coisa, portanto, você precisará utilizar um cliente IMAP de verdade)."
 
 #. type: Title -
 #: en/git-imap-send.txt:122
@@ -33088,14 +30226,7 @@ msgstr "CUIDADO"
 #: en/git-imap-send.txt:129
 #, priority:100
 msgid "It is still your responsibility to make sure that the email message sent by your email program meets the standards of your project.  Many projects do not like patches to be attached.  Some mail agents will transform patches (e.g. wrap lines, send them as format=flowed) in ways that make them fail.  You will get angry flames ridiculing you if you don't check this."
-msgstr ""
-"Ainda é sua responsabilidade garantir que a mensagem de e-mail enviado pelo "
-"seu programa de e-mail atenda aos padrões do seu projeto.  Muitos projetos "
-"não gostam que os patches sejam anexados em mensagens de e-mail.  Alguns "
-"agentes de correio transformarão os patches (quebras de linhas automática, "
-"enviá-los como 'format=flowed' por exemplo) de maneira que irão fazê-los "
-"falhar.  Você receberá chamas raivosas que o ridicularizarão na frente de "
-"todo mundo se não prestar atenção."
+msgstr "Ainda é sua responsabilidade garantir que a mensagem de e-mail enviado pelo seu programa de e-mail atenda aos padrões do seu projeto.  Muitos projetos não gostam que os patches sejam anexados em mensagens de e-mail.  Alguns agentes de correio transformarão os patches (quebras de linhas automática, enviá-los como 'format=flowed' por exemplo) de maneira que irão fazê-los falhar.  Você receberá chamas raivosas que o ridicularizarão na frente de todo mundo se não prestar atenção."
 
 #. type: Plain text
 #: en/git-imap-send.txt:133
@@ -33105,11 +30236,9 @@ msgid ""
 "users may wish to visit this web page for more information:\n"
 "  http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
 msgstr ""
-"O Thunderbird é um velho informado por ser problemático.  Os usuários do "
-"Thunderbird\n"
+"O Thunderbird é um velho informado por ser problemático.  Os usuários do Thunderbird\n"
 "podem querer visitar esta página da web para obter mais informações:\n"
-"  http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#"
-"Completely_plain_email\n"
+"  http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird#Completely_plain_email\n"
 
 #. type: Plain text
 #: en/git-imap-send.txt:137
@@ -33127,9 +30256,7 @@ msgstr "git-index-pack(1)"
 #: en/git-index-pack.txt:7
 #, priority:100
 msgid "git-index-pack - Build pack index file for an existing packed archive"
-msgstr ""
-"git-index-pack - Construa um pacote do arquivo do índice para um arquivo "
-"compactado já existente"
+msgstr "git-index-pack - Construa um pacote do arquivo do índice para um arquivo compactado já existente"
 
 #. type: Plain text
 #: en/git-index-pack.txt:15
@@ -33147,19 +30274,13 @@ msgstr ""
 #: en/git-index-pack.txt:23
 #, priority:100
 msgid "Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it.  The packed archive together with the pack index can then be placed in the objects/pack/ directory of a Git repository."
-msgstr ""
-"Faz a leitura de um arquivo compactado (.pack) do arquivo informado e cria "
-"um pacote do arquivo do índice (.idx) para ele.  O arquivo compactado junto "
-"com o pacote do índice pode ser colocado no diretório 'objects/pack/' de um "
-"repositório Git."
+msgstr "Faz a leitura de um arquivo compactado (.pack) do arquivo informado e cria um pacote do arquivo do índice (.idx) para ele.  O arquivo compactado junto com o pacote do índice pode ser colocado no diretório 'objects/pack/' de um repositório Git."
 
 #. type: Plain text
 #: en/git-index-pack.txt:29
 #, priority:100
 msgid "Be verbose about what is going on, including progress status."
-msgstr ""
-"Seja detalhado sobre o que está acontecendo, incluindo a condição geral do "
-"progresso."
+msgstr "Seja detalhado sobre o que está acontecendo, incluindo a condição geral do progresso."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:30
@@ -33171,23 +30292,13 @@ msgstr "-o <arquivo-índice>"
 #: en/git-index-pack.txt:37
 #, priority:100
 msgid "Write the generated pack index into the specified file.  Without this option the name of pack index file is constructed from the name of packed archive file by replacing .pack with .idx (and the program fails if the name of packed archive does not end with .pack)."
-msgstr ""
-"Escreva o índice do pacote gerado no arquivo especificado.  Sem essa opção, "
-"o nome do arquivo do pacote do arquivo do índice é construído a partir do "
-"nome do arquivo compactado substituindo '.pack' por '.idx' (e o programa "
-"falha caso o nome do arquivo compactado não termine com '.pack')."
+msgstr "Escreva o índice do pacote gerado no arquivo especificado.  Sem essa opção, o nome do arquivo do pacote do arquivo do índice é construído a partir do nome do arquivo compactado substituindo '.pack' por '.idx' (e o programa falha caso o nome do arquivo compactado não termine com '.pack')."
 
 #. type: Plain text
 #: en/git-index-pack.txt:47
 #, priority:100
 msgid "When this flag is provided, the pack is read from stdin instead and a copy is then written to <pack-file>. If <pack-file> is not specified, the pack is written to objects/pack/ directory of the current Git repository with a default name determined from the pack content.  If <pack-file> is not specified consider using --keep to prevent a race condition between this process and 'git repack'."
-msgstr ""
-"Quando esta opção é informada, o pacote é lido a partir do stdin e uma cópia "
-"é gravada no <pack-file>. Caso o <pack-file> não seja informado, o pacote "
-"será gravado no diretório 'objects/pack/' do repositório Git atual com um "
-"nome predefinido determinado através do conteúdo do pacote.  Caso o <pack-"
-"file> não seja informado, considere utilizar a opção `--keep` para evitar "
-"uma condição de corrida entre este processo e o 'git repack'."
+msgstr "Quando esta opção é informada, o pacote é lido a partir do stdin e uma cópia é gravada no <pack-file>. Caso o <pack-file> não seja informado, o pacote será gravado no diretório 'objects/pack/' do repositório Git atual com um nome predefinido determinado através do conteúdo do pacote.  Caso o <pack-file> não seja informado, considere utilizar a opção `--keep` para evitar uma condição de corrida entre este processo e o 'git repack'."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:48
@@ -33205,12 +30316,7 @@ msgstr "Corrija um pacote \"thin\" produzido por `git pack objects thin` (para m
 #: en/git-index-pack.txt:61
 #, priority:100
 msgid "Before moving the index into its final destination create an empty .keep file for the associated pack file.  This option is usually necessary with --stdin to prevent a simultaneous 'git repack' process from deleting the newly constructed pack and index before refs can be updated to use objects contained in the pack."
-msgstr ""
-"Antes de mover o índice para seu destino final, crie um arquivo '.keep' "
-"vazio para o arquivo do pacote associado.  Essa opção geralmente é "
-"necessária com '--stdin' para impedir que um processo simultâneo do 'git "
-"repack' exclua o pacote e o índice recém-construídos antes que as refs "
-"possam ser atualizadas para utilizar os objetos existentes no pacote."
+msgstr "Antes de mover o índice para seu destino final, crie um arquivo '.keep' vazio para o arquivo do pacote associado.  Essa opção geralmente é necessária com '--stdin' para impedir que um processo simultâneo do 'git repack' exclua o pacote e o índice recém-construídos antes que as refs possam ser atualizadas para utilizar os objetos existentes no pacote."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:62
@@ -33222,12 +30328,7 @@ msgstr "--keep=<msg>"
 #: en/git-index-pack.txt:68
 #, priority:100
 msgid "Like --keep create a .keep file before moving the index into its final destination, but rather than creating an empty file place '<msg>' followed by an LF into the .keep file.  The '<msg>' message can later be searched for within all .keep files to locate any which have outlived their usefulness."
-msgstr ""
-"Assim como a opção `--keep`, crie um arquivo '.keep' antes de mover o índice "
-"para seu destino final, em vez de criar um local do arquivo vazio '<msg>', "
-"seguido de um LF no arquivo .keep.  A mensagem '<msg>' pode ser pesquisada "
-"posteriormente em todos os arquivos '.keep' para localizar qualquer um que "
-"tenha perdido a sua utilidade."
+msgstr "Assim como a opção `--keep`, crie um arquivo '.keep' antes de mover o índice para seu destino final, em vez de criar um local do arquivo vazio '<msg>', seguido de um LF no arquivo .keep.  A mensagem '<msg>' pode ser pesquisada posteriormente em todos os arquivos '.keep' para localizar qualquer um que tenha perdido a sua utilidade."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:69 en/git-pack-objects.txt:251
@@ -33239,10 +30340,7 @@ msgstr "--index-version=<version>[,<offset>]"
 #: en/git-index-pack.txt:73 en/git-pack-objects.txt:255
 #, priority:100
 msgid "This is intended to be used by the test suite only. It allows to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset."
-msgstr ""
-"Isso foi pensado para ser utilizado apenas pelo conjunto de testes. Ele "
-"permite impor a versão do índice do pacote gerado e impor as entradas no "
-"índice com 64 bits nos objetos localizados acima da compensação informada."
+msgstr "Isso foi pensado para ser utilizado apenas pelo conjunto de testes. Ele permite impor a versão do índice do pacote gerado e impor as entradas no índice com 64 bits nos objetos localizados acima da compensação informada."
 
 #. type: Plain text
 #: en/git-index-pack.txt:76
@@ -33254,9 +30352,7 @@ msgstr "Encerre, caso o pacote contenha objetos ou links quebrados."
 #: en/git-index-pack.txt:79
 #, priority:100
 msgid "Die if the pack contains broken links. For internal use only."
-msgstr ""
-"Encerre caso o pacote contenha links quebrados. Apenas para utilização "
-"interna."
+msgstr "Encerre caso o pacote contenha links quebrados. Apenas para utilização interna."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:80
@@ -33268,9 +30364,7 @@ msgstr "--fsck-objects"
 #: en/git-index-pack.txt:82
 #, priority:100
 msgid "Die if the pack contains broken objects. For internal use only."
-msgstr ""
-"Encerre caso o pacote contenha objetos quebrados. Apenas para utilização "
-"interna."
+msgstr "Encerre caso o pacote contenha objetos quebrados. Apenas para utilização interna."
 
 #. type: Labeled list
 #: en/git-index-pack.txt:83 en/git-pack-objects.txt:241 en/git-repack.txt:102
@@ -33296,20 +30390,41 @@ msgstr "--max-input-size=<tamanho>"
 msgid "Die, if the pack is larger than <size>."
 msgstr "Encerre caso o pacote seja maior que <tamanho>."
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--object-format=<format>"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--object-format=<formato>"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "Defina o formato do objeto informado (algoritmo hash) para o repositório.  Os valores válidos são 'sha1' e (se ativado) 'sha256'.  O valor predefinido é 'sha1'."
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+#, fuzzy, priority:100
+#| msgid "This behavior can be suppressed with the `--no-ff` option."
+msgid "This option cannot be used with --stdin."
+msgstr "Este comportamento pode ser suprimido ao usar a opção `--no-ff`."
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 #, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr "Após a criação do índice a lista dos nomes dos objetos é classificada e o hash SHA-1 desta lista seja exibida no stdout. Caso `--stdin` também seja utilizado, então este é prefixado por \"pack\\t\" ou \"keep\\t\" caso um novo arquivo `.keep` seja criado com êxito. Isso é útil para remover um"
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr "mantenha o arquivo utilizado como uma trava para impedir uma corrida com `git repack`"
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr "citados acima."
@@ -33330,9 +30445,7 @@ msgstr "git-init-db - Cria um repositório Git vazio"
 #: en/git-init-db.txt:13
 #, no-wrap, priority:100
 msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
-msgstr ""
-"'git init-db' [-q | --quiet] [--bare] [--template=<diretório-modelo>] "
-"[--separate-git-dir <dir git>] [--shared[=<permissões>]]\n"
+msgstr "'git init-db' [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--separate-git-dir <dir git>] [--shared[=<permissões>]]\n"
 
 #. type: Plain text
 #: en/git-init-db.txt:20
@@ -33353,11 +30466,16 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init - Cria um repositório Git vazio ou reinicializa um já existente"
 
 #. type: Plain text
-#: en/git-init.txt:15
-#, no-wrap, priority:300
+#: en/git-init.txt:16
+#, fuzzy, no-wrap, priority:300
+#| msgid ""
+#| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
+#| "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+#| "\t  [--shared[=<permissions>]] [directory]\n"
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<diretório-modelo>]\n"
@@ -33365,232 +30483,237 @@ msgstr ""
 "\t  [--shared[=<permissões>]] [diretório]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "Este comando cria um repositório Git vazio, basicamente um diretório `.git` com subdiretórios para os arquivos `objects`, `refs/heads`, `refs/tags` e arquivos modelo.  Também é criado um arquivo inicial `HEAD` que tem como referencia o `HEAD` do ramo principal."
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
-msgstr ""
-"Caso a variável de ambiente `$GIT_DIR` esteja configurada, esta especificará "
-"um caminho a ser utilizado para a base dos repositórios em vez de `./.git`."
+msgstr "Caso a variável de ambiente `$GIT_DIR` esteja configurada, esta especificará um caminho a ser utilizado para a base dos repositórios em vez de `./.git`."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "Caso o diretório de armazenamento de objetos seja especificado através da variável de ambiente `$GIT_OBJECT_DIRECTORY`, então os diretórios \"sha1\" serão criados abaixo, caso contrário, será utilizado o diretório predefinido `$GIT_DIR/objects`."
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "É seguro executar o comando `git init` em um repositório existente. O comando não substituirá as coisas que já estiverem lá. O principal motivo para executar novamente o comando `git init` é pegar os modelos adicionados recentemente (ou mover o repositório para um outro local caso `--separate-git-dir` seja utilizado)."
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "Exiba apenas mensagens de erro e aviso; suprima todas as outras mensagens."
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
-msgstr ""
-"Crie um repositório simples. Caso a variável de ambiente `GIT_DIR` não "
-"esteja definido, defina diretório de trabalho atual."
+msgstr "Crie um repositório simples. Caso a variável de ambiente `GIT_DIR` não esteja definido, defina diretório de trabalho atual."
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--object-format=<formato>"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
-msgstr ""
-"Defina o formato do objeto informado (algoritmo hash) para o repositório.  "
-"Os valores válidos são 'sha1' e (se ativado) 'sha256'.  O valor predefinido "
-"é 'sha1'."
+msgstr "Defina o formato do objeto informado (algoritmo hash) para o repositório.  Os valores válidos são 'sha1' e (se ativado) 'sha256'.  O valor predefinido é 'sha1'."
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "Especifique o diretório de onde os modelos serão utilizados.  (Consulte a seção \"DIRETÓRIO MODELO\" abaixo.)"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "Em vez de inicializar o repositório como um diretório para `$GIT_DIR` or `./.git/`, crie um arquivo de texto contendo o caminho para o repositório real.  Este arquivo atua como um link simbólico independente para o repositório do sistema de arquivos Git."
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "Caso seja reinicializado, o repositório será movido para um caminho determinado."
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "<branchname>"
+msgid "-b <branch-name"
+msgstr "<nome-do-ramo>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+#| msgid "--state-branch <branch>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--state-branch <ramo>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
-msgstr ""
-"Determina que o repositório Git deve ser compartilhado entre vários "
-"usuários.  Isso permite que os usuários pertencentes ao mesmo grupo enviem "
-"para esse repositório.  Quando definido, a variável de configuração `core."
-"sharedRepository` é utilizada para que os arquivos e os diretórios definidos "
-"pela variável `$GIT_DIR` sejam criados com as permissões solicitadas.  "
-"Quando não definido, o Git usará as permissões informadas pelo umask(2)."
+msgstr "Determina que o repositório Git deve ser compartilhado entre vários usuários.  Isso permite que os usuários pertencentes ao mesmo grupo enviem para esse repositório.  Quando definido, a variável de configuração `core.sharedRepository` é utilizada para que os arquivos e os diretórios definidos pela variável `$GIT_DIR` sejam criados com as permissões solicitadas.  Quando não definido, o Git usará as permissões informadas pelo umask(2)."
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
-msgstr ""
-"A opção pode ter os seguintes valores, predefinido como 'group' caso nenhum "
-"valor seja informado:"
+msgstr "A opção pode ter os seguintes valores, predefinido como 'group' caso nenhum valor seja informado:"
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask' (ou 'false')"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "Utilize as permissões informadas por umask(2). É a predefinição quando `--shared` não é utilizado."
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group' (ou 'true')"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "Torne o grupo do repositório com permissão de escrita (g+sx por exemplo, pois o grupo git pode não ser o grupo principal de todos os usuários). Isso é utilizado para afrouxar as permissões de um valor, a não ser que indique o contrário, umask(2) seguro. Observe que o umask ainda se aplica aos outros bits de permissão (por exemplo, caso o umask seja '0022' o uso de 'group' não removerá os privilégios de leitura dos outros usuários (sem um grupo). Consulte '0xxx' para saber como usar exatamente as permissões do repositório."
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all' ('world' ou 'everybody')"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "O mesmo que 'group', mas torna o repositório legível por todos os usuários."
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr "'0xxx'"
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr "'0xxx' é um número octal e cada arquivo terá o modo '0xxx'. '0xxx' substituirá o valor `umask(2)` dos usuários (e não apenas diminuirá as permissões como 'group' e 'all'). '0640' criará um repositório de apenas leitura por grupo, sem permissão escrita ou acessível a outros. '0660' criará um repositório com permissão de leitura e escrita ao usuário e ao grupo atual, porém, inacessível aos outros."
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr "É predefinido que a flag da configuração `receive.denyNonFastForwards` seja ativado nos repositórios compartilhados para que você não possa impor um impulsionamento `fast-forwarding` para ele."
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr "Caso utilize um `diretório`, o comando será executado dentro dele. E caso o diretório não exista, um será criado."
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "DIRETÓRIO MODELO"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "Os arquivos e diretórios no diretório modelo cujo nome não começa com um ponto serão copiados para o `$GIT_DIR` após a sua criação."
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "O diretório modelo será um dos seguintes (em ordem):"
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "o argumento utilizado com a opção `--template`;"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr "o conteúdo da variável de ambiente `$GIT_TEMPLATE_DIR`;"
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "a variável de configuração `init.templateDir`; ou"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "A predefinição do diretório modelo: `/usr/share/git-core/templates`."
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "A predefinição do diretório modelo inclui alguma estrutura de diretórios, \"padrões de exclusão\" sugeridos (consulte linkgit:gitignore[5]) e os arquivos gancho de amostragem."
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr "Por predefinição os ganchos de amostragem estão todos desativados. Para ativar um dos ganchos de amostragem, renomeie-o removendo o sufixo `.sample`."
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr "Para um apanhado geral sobre execução hook consulte linkgit:githooks[5]."
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr "Inicie um novo repositório Git na base de um código já existente"
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -33604,19 +30727,19 @@ msgstr ""
 "$ git commit    <3>\n"
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr "Cria um diretório /path/to/my/codebase/.git."
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr "Adicione todos os arquivos existentes ao índice."
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr "Registre o estado intocado como o primeiro commit no histórico."
@@ -33787,11 +30910,7 @@ msgstr ""
 #: en/git-instaweb.txt:87
 #, priority:100
 msgid "If the configuration variable `instaweb.browser` is not set, `web.browser` will be used instead if it is defined. See linkgit:git-web{litdd}browse[1] for more information about this."
-msgstr ""
-"Caso a variável de configuração `instaweb.browser` não esteja definida, a "
-"variável ` web.browser` será utilizada em seu lugar caso esteja definida. "
-"Para obter mais informações sobre isso consulte linkgit:git-"
-"web{litdd}browse[1]."
+msgstr "Caso a variável de configuração `instaweb.browser` não esteja definida, a variável ` web.browser` será utilizada em seu lugar caso esteja definida. Para obter mais informações sobre isso consulte linkgit:git-web{litdd}browse[1]."
 
 #. type: Title =
 #: en/git-interpret-trailers.txt:2
@@ -33819,29 +30938,19 @@ msgstr ""
 #: en/git-interpret-trailers.txt:19
 #, priority:100
 msgid "Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail headers, at the end of the otherwise free-form part of a commit message."
-msgstr ""
-"Ajuda a analisar ou adicionar linhas com 'caracteres de resposta' que se "
-"pareçam com os cabeçalhos de e-mail segundo a norma RFC 822 no final ou na "
-"parte livre de uma mensagem de commit."
+msgstr "Ajuda a analisar ou adicionar linhas com 'caracteres de resposta' que se pareçam com os cabeçalhos de e-mail segundo a norma RFC 822 no final ou na parte livre de uma mensagem de commit."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:23
 #, priority:100
 msgid "This command reads some patches or commit messages from either the <file> arguments or the standard input if no <file> is specified. If `--parse` is specified, the output consists of the parsed trailers."
-msgstr ""
-"Este comando lê alguns patches ou faz o commit das mensagens dos argumentos "
-"<arquivo> ou da entrada padrão se nenhum <arquivo> seja definido. Caso "
-"`--parse` seja definido a saída consistirá nos caracteres de resposta "
-"analisados."
+msgstr "Este comando lê alguns patches ou faz o commit das mensagens dos argumentos <arquivo> ou da entrada padrão se nenhum <arquivo> seja definido. Caso `--parse` seja definido a saída consistirá nos caracteres de resposta analisados."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:27
 #, priority:100
 msgid "Otherwise, this command applies the arguments passed using the `--trailer` option, if any, to the commit message part of each input file. The result is emitted on the standard output."
-msgstr ""
-"Caso contrário, este comando aplica os argumentos passados utilizando a "
-"opção `--trailer`, caso exista, à parte da mensagem de commit de cada "
-"arquivo de entrada. O resultado é emitido na saída padrão."
+msgstr "Caso contrário, este comando aplica os argumentos passados utilizando a opção `--trailer`, caso exista, à parte da mensagem de commit de cada arquivo de entrada. O resultado é emitido na saída padrão."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:32
@@ -33853,13 +30962,7 @@ msgstr "Algumas variáveis de configuração controlam a maneira como os argumen
 #: en/git-interpret-trailers.txt:39
 #, priority:100
 msgid "By default, a '<token>=<value>' or '<token>:<value>' argument given using `--trailer` will be appended after the existing trailers only if the last trailer has a different (<token>, <value>) pair (or if there is no existing trailer). The <token> and <value> parts will be trimmed to remove starting and trailing whitespace, and the resulting trimmed <token> and <value> will appear in the message like this:"
-msgstr ""
-"É predefinido que, usando um argumento '<token>=<valor>' ou '<token>:"
-"<valor>' utilizando a opção `--trailer` será anexado após os caracteres de "
-"resposta existentes caso o último tenha um par (<token>, <valor>), (ou caso "
-"não exista nenhum caractere de resposta). As partes <token> e <valor> serão "
-"aparados para remover os espaços iniciais e finais, o que sobrar aparecerá "
-"na mensagem da seguinte maneira:"
+msgstr "É predefinido que, usando um argumento '<token>=<valor>' ou '<token>:<valor>' utilizando a opção `--trailer` será anexado após os caracteres de resposta existentes caso o último tenha um par (<token>, <valor>), (ou caso não exista nenhum caractere de resposta). As partes <token> e <valor> serão aparados para remover os espaços iniciais e finais, o que sobrar aparecerá na mensagem da seguinte maneira:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:42
@@ -33871,36 +30974,19 @@ msgstr "token: valor\n"
 #: en/git-interpret-trailers.txt:46
 #, priority:100
 msgid "This means that the trimmed <token> and <value> will be separated by `': '` (one colon followed by one space)."
-msgstr ""
-"Significa que o <token> e o <valor> ajustado será separado por um `': '` ("
-"dois pontos seguido por um espaço)."
+msgstr "Significa que o <token> e o <valor> ajustado será separado por um `': '` (dois pontos seguido por um espaço)."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:52
 #, priority:100
 msgid "By default the new trailer will appear at the end of all the existing trailers. If there is no existing trailer, the new trailer will appear after the commit message part of the output, and, if there is no line with only spaces at the end of the commit message part, one blank line will be added before the new trailer."
-msgstr ""
-"É predefinido que o novo caractere de resposta aparecerá no final de todos "
-"os caracteres de resposta já existentes. Caso não exista, o novo caractere "
-"de resposta aparecerá na saída após a parte da mensagem do commit, caso não "
-"haja uma linha com apenas espaços no final da parte da mensagem do commit, "
-"uma linha em branco será adicionada antes do novo caractere de resposta."
+msgstr "É predefinido que o novo caractere de resposta aparecerá no final de todos os caracteres de resposta já existentes. Caso não exista, o novo caractere de resposta aparecerá na saída após a parte da mensagem do commit, caso não haja uma linha com apenas espaços no final da parte da mensagem do commit, uma linha em branco será adicionada antes do novo caractere de resposta."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:62
 #, priority:100
 msgid "Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) is all trailers, or (ii) contains at least one Git-generated or user-configured trailer and consists of at least 25% trailers.  The group must be preceded by one or more empty (or whitespace-only) lines.  The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---' (followed by a space or the end of the line). Such three minus signs start the patch part of the message. See also `--no-divider` below."
-msgstr ""
-"Os caracteres de resposta já existentes são extraídos da mensagem da entrada "
-"ao procurar um grupo de uma ou mais linhas onde (i) tenha todos os "
-"caracteres de resposta ou (ii) contenha pelo menos um caractere de resposta "
-"gerado através do Git ou configurado pelo usuário que consista em pelo menos "
-"25% dos caracteres de resposta.  O grupo deve ser precedido por uma ou mais "
-"linhas vazias (ou somente com espaço).  O grupo deve estar no final da "
-"mensagem ou ser as últimas linhas que não sejam espaços antes de uma linha "
-"que começa com '---' (seguida por um espaço ou o quebra da linha). Estes "
-"três sinais de menos (-) iniciam a parte do patch da mensagem. Consulte "
-"também a opção `--no-divider` abaixo."
+msgstr "Os caracteres de resposta já existentes são extraídos da mensagem da entrada ao procurar um grupo de uma ou mais linhas onde (i) tenha todos os caracteres de resposta ou (ii) contenha pelo menos um caractere de resposta gerado através do Git ou configurado pelo usuário que consista em pelo menos 25% dos caracteres de resposta.  O grupo deve ser precedido por uma ou mais linhas vazias (ou somente com espaço).  O grupo deve estar no final da mensagem ou ser as últimas linhas que não sejam espaços antes de uma linha que começa com '---' (seguida por um espaço ou o quebra da linha). Estes três sinais de menos (-) iniciam a parte do patch da mensagem. Consulte também a opção `--no-divider` abaixo."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:67
@@ -33936,11 +31022,7 @@ msgstr "--trim-empty"
 #: en/git-interpret-trailers.txt:81
 #, priority:100
 msgid "If the <value> part of any trailer contains only whitespace, the whole trailer will be removed from the resulting message.  This applies to existing trailers as well as new trailers."
-msgstr ""
-"Caso o <valor> da parte de qualquer `caractere de resposta` contenha apenas "
-"espaços, o `caractere de resposta` inteiro será removido da mensagem "
-"resultante.  Isso se aplica os `caracteres de resposta` já existentes, bem "
-"como aos novos `caractere de resposta`."
+msgstr "Caso o <valor> da parte de qualquer `caractere de resposta` contenha apenas espaços, o `caractere de resposta` inteiro será removido da mensagem resultante.  Isso se aplica os `caracteres de resposta` já existentes, bem como aos novos `caractere de resposta`."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:82
@@ -33952,9 +31034,7 @@ msgstr "--trailer <token>[(=|:)<valor>]"
 #: en/git-interpret-trailers.txt:86
 #, priority:100
 msgid "Specify a (<token>, <value>) pair that should be applied as a trailer to the input messages. See the description of this command."
-msgstr ""
-"Defina um par (<token>, <valor>) que deve ser aplicado como um caractere de "
-"resposta nas mensagens de entrada. Consulte a descrição deste comando."
+msgstr "Defina um par (<token>, <valor>) que deve ser aplicado como um caractere de resposta nas mensagens de entrada. Consulte a descrição deste comando."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:87
@@ -33972,12 +31052,7 @@ msgstr "--no-where"
 #: en/git-interpret-trailers.txt:94
 #, priority:100
 msgid "Specify where all new trailers will be added.  A setting provided with '--where' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--where' or '--no-where'. Possible values are `after`, `before`, `end` or `start`."
-msgstr ""
-"Especifique onde todos os novos caracteres de resposta serão adicionados.  "
-"Uma configuração utilizada com '--where' substitui todas as variáveis de "
-"configuração e se aplica a todas as opções `--trailer` até a próxima "
-"ocorrência de '--where' ou '--no-where'. Os valores válidos são `after`, "
-"`before`, `end` or `start`."
+msgstr "Especifique onde todos os novos caracteres de resposta serão adicionados.  Uma configuração utilizada com '--where' substitui todas as variáveis de configuração e se aplica a todas as opções `--trailer` até a próxima ocorrência de '--where' ou '--no-where'. Os valores válidos são `after`, `before`, `end` or `start`."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:95
@@ -33995,13 +31070,7 @@ msgstr "--no-if-exists"
 #: en/git-interpret-trailers.txt:103
 #, priority:100
 msgid "Specify what action will be performed when there is already at least one trailer with the same <token> in the message.  A setting provided with '--if-exists' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-exists' or '--no-if-exists'. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` and `doNothing`."
-msgstr ""
-"Defina qual ação será executada quando já houver pelo menos um caractere de "
-"resposta com o mesmo <token> na mensagem.  Uma configuração utilizada com "
-"'--if-exists' substitui todas as variáveis de configuração e se aplica a "
-"todas as opções `--trailer` até a próxima ocorrência do '--if-exists' ou "
-"'--no-if-exists'. As possíveis ações são `addIfDifferent`, "
-"`addIfDifferentNeighbor`, `add`, `replace` e `doNothing`."
+msgstr "Defina qual ação será executada quando já houver pelo menos um caractere de resposta com o mesmo <token> na mensagem.  Uma configuração utilizada com '--if-exists' substitui todas as variáveis de configuração e se aplica a todas as opções `--trailer` até a próxima ocorrência do '--if-exists' ou '--no-if-exists'. As possíveis ações são `addIfDifferent`, `addIfDifferentNeighbor`, `add`, `replace` e `doNothing`."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:104
@@ -34019,12 +31088,7 @@ msgstr "--no-if-missing"
 #: en/git-interpret-trailers.txt:112
 #, priority:100
 msgid "Specify what action will be performed when there is no other trailer with the same <token> in the message.  A setting provided with '--if-missing' overrides all configuration variables and applies to all '--trailer' options until the next occurrence of '--if-missing' or '--no-if-missing'. Possible actions are `doNothing` or `add`."
-msgstr ""
-"Especifique qual ação será executada quando não houver outro caractere de "
-"resposta com o mesmo <token> na mensagem.  Uma configuração utilizada com o "
-"comando `--if-missing` substitui todas as variáveis de configuração e se "
-"aplica a todas as opções `--trailer` até a próxima ocorrência de `--if-"
-"missing` ou `--no-if-missing`. As possíveis ações são `doNothing` ou `add`."
+msgstr "Especifique qual ação será executada quando não houver outro caractere de resposta com o mesmo <token> na mensagem.  Uma configuração utilizada com o comando `--if-missing` substitui todas as variáveis de configuração e se aplica a todas as opções `--trailer` até a próxima ocorrência de `--if-missing` ou `--no-if-missing`. As possíveis ações são `doNothing` ou `add`."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:113
@@ -34036,9 +31100,7 @@ msgstr "--only-trailers"
 #: en/git-interpret-trailers.txt:115
 #, priority:100
 msgid "Output only the trailers, not any other parts of the input."
-msgstr ""
-"Exibe apenas os caracteres de resposta e não quaisquer outras partes da "
-"entrada."
+msgstr "Exibe apenas os caracteres de resposta e não quaisquer outras partes da entrada."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:116
@@ -34050,10 +31112,7 @@ msgstr "--only-input"
 #: en/git-interpret-trailers.txt:120
 #, priority:100
 msgid "Output only trailers that exist in the input; do not add any from the command-line or by following configured `trailer.*` rules."
-msgstr ""
-"Exibe apenas os caracteres de resposta que existam na entrada; não adicione "
-"qualquer outra linha de comando ou siga as regras `trailer.*` já "
-"configuradas."
+msgstr "Exibe apenas os caracteres de resposta que existam na entrada; não adicione qualquer outra linha de comando ou siga as regras `trailer.*` já configuradas."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:121
@@ -34065,9 +31124,7 @@ msgstr "--unfold"
 #: en/git-interpret-trailers.txt:124
 #, priority:100
 msgid "Remove any whitespace-continuation in trailers, so that each trailer appears on a line by itself with its full content."
-msgstr ""
-"Remova qualquer continuação de espaço nos caracteres de resposta para que "
-"cada caractere apareça em uma linha por si só, com o seu conteúdo completo."
+msgstr "Remova qualquer continuação de espaço nos caracteres de resposta para que cada caractere apareça em uma linha por si só, com o seu conteúdo completo."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:125
@@ -34109,22 +31166,13 @@ msgstr "Esta opção informa quais os caracteres são reconhecidos como separado
 #: en/git-interpret-trailers.txt:146
 #, priority:100
 msgid "The first character given by this option will be the default character used when another separator is not specified in the config for this trailer."
-msgstr ""
-"O primeiro caractere informado por esta opção será o caractere predefinido "
-"que será utilizado quando um outro separador não seja utilizado na "
-"configuração deste `caractere de resposta`."
+msgstr "O primeiro caractere informado por esta opção será o caractere predefinido que será utilizado quando um outro separador não seja utilizado na configuração deste `caractere de resposta`."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:153
 #, priority:100
 msgid "For example, if the value for this option is \"%=$\", then only lines using the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and then spaces will be considered trailers. And '%' will be the default separator used, so by default trailers will appear like: '<token>% <value>' (one percent sign and one space will appear between the token and the value)."
-msgstr ""
-"Como por exemplo, caso o valor desta opção seja \"%=$\", apenas as linhas "
-"que usam o formato '<token><sep><valor>' com <sep> contendo '%', '=' ou '$' "
-"e os espaços, serão considerados `caracteres de resposta`. É predefinido que "
-"o sinal '%' será utilizado como um separador; portanto, os caracteres de "
-"resposta aparecerão como: '<token>% <valor>' (um sinal de porcentagem e um "
-"espaço aparecerão entre token e o valor)."
+msgstr "Como por exemplo, caso o valor desta opção seja \"%=$\", apenas as linhas que usam o formato '<token><sep><valor>' com <sep> contendo '%', '=' ou '$' e os espaços, serão considerados `caracteres de resposta`. É predefinido que o sinal '%' será utilizado como um separador; portanto, os caracteres de resposta aparecerão como: '<token>% <valor>' (um sinal de porcentagem e um espaço aparecerão entre token e o valor)."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:154
@@ -34148,33 +31196,25 @@ msgstr "Pode ser `end` (pré definido),` start`, `after` ou` before`."
 #: en/git-interpret-trailers.txt:161
 #, priority:100
 msgid "If it is `end`, then each new trailer will appear at the end of the existing trailers."
-msgstr ""
-"Caso seja `end`, então cada novo caractere de resposta aparecerá no final "
-"dos caracteres de resposta já existentes."
+msgstr "Caso seja `end`, então cada novo caractere de resposta aparecerá no final dos caracteres de resposta já existentes."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:164
 #, priority:100
 msgid "If it is `start`, then each new trailer will appear at the start, instead of the end, of the existing trailers."
-msgstr ""
-"Caso seja `start`, cada novo caractere de resposta aparecerá no início, e "
-"não no final, dos caracteres de resposta já existentes."
+msgstr "Caso seja `start`, cada novo caractere de resposta aparecerá no início, e não no final, dos caracteres de resposta já existentes."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:167
 #, priority:100
 msgid "If it is `after`, then each new trailer will appear just after the last trailer with the same <token>."
-msgstr ""
-"Caso seja `after` , cada novo caractere de resposta aparecerá logo após o "
-"último caractere de resposta com o mesmo <token>."
+msgstr "Caso seja `after` , cada novo caractere de resposta aparecerá logo após o último caractere de resposta com o mesmo <token>."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:170
 #, priority:100
 msgid "If it is `before`, then each new trailer will appear just before the first trailer with the same <token>."
-msgstr ""
-"Caso seja `before`, então cada novo caractere de resposta aparecerá logo no "
-"começo do primeiro caractere de resposta com o mesmo <token>."
+msgstr "Caso seja `before`, então cada novo caractere de resposta aparecerá logo no começo do primeiro caractere de resposta com o mesmo <token>."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:171
@@ -34186,9 +31226,7 @@ msgstr "trailer.ifexists"
 #: en/git-interpret-trailers.txt:175
 #, priority:100
 msgid "This option makes it possible to choose what action will be performed when there is already at least one trailer with the same <token> in the message."
-msgstr ""
-"Essa opção permite escolher qual ação será executada quando já houver pelo "
-"menos um caractere de resposta com o mesmo <token> na mensagem."
+msgstr "Essa opção permite escolher qual ação será executada quando já houver pelo menos um caractere de resposta com o mesmo <token> na mensagem."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:178
@@ -34200,43 +31238,31 @@ msgstr "Os valores válidos para esta opção são: `addIfDifferentNeighbor` (pr
 #: en/git-interpret-trailers.txt:182
 #, priority:100
 msgid "With `addIfDifferentNeighbor`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is above or below the line where the new trailer will be added."
-msgstr ""
-"Com `addIfDifferentNeighbor`, um novo caractere de resposta será adicionado "
-"apenas caso nenhum com o mesmo par (<token>,<valor>) esteja acima ou abaixo "
-"da linha onde o novo caractere de resposta será adicionado."
+msgstr "Com `addIfDifferentNeighbor`, um novo caractere de resposta será adicionado apenas caso nenhum com o mesmo par (<token>,<valor>) esteja acima ou abaixo da linha onde o novo caractere de resposta será adicionado."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:185
 #, priority:100
 msgid "With `addIfDifferent`, a new trailer will be added only if no trailer with the same (<token>, <value>) pair is already in the message."
-msgstr ""
-"Com `addIfDifferent`, um novo caractere de resposta será adicionado apenas "
-"caso nenhum com o mesmo par (<token>,<valor>) já esteja na mensagem."
+msgstr "Com `addIfDifferent`, um novo caractere de resposta será adicionado apenas caso nenhum com o mesmo par (<token>,<valor>) já esteja na mensagem."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:188
 #, priority:100
 msgid "With `add`, a new trailer will be added, even if some trailers with the same (<token>, <value>) pair are already in the message."
-msgstr ""
-"Com `add`, um novo caractere de resposta será adicionado mesmo que alguns "
-"com o mesmo par (<token>,<valor>) já estejam na mensagem."
+msgstr "Com `add`, um novo caractere de resposta será adicionado mesmo que alguns com o mesmo par (<token>,<valor>) já estejam na mensagem."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:193
 #, priority:100
 msgid "With `replace`, an existing trailer with the same <token> will be deleted and the new trailer will be added. The deleted trailer will be the closest one (with the same <token>) to the place where the new one will be added."
-msgstr ""
-"Com `replace`, um caractere de resposta existente com a mesmo <token> será "
-"excluído e um novo será adicionado. O caractere de resposta excluído será o "
-"mais próximo (com o mesmo <token>) do local onde o novo será adicionado."
+msgstr "Com `replace`, um caractere de resposta existente com a mesmo <token> será excluído e um novo será adicionado. O caractere de resposta excluído será o mais próximo (com o mesmo <token>) do local onde o novo será adicionado."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:196
 #, priority:100
 msgid "With `doNothing`, nothing will be done; that is no new trailer will be added if there is already one with the same <token> in the message."
-msgstr ""
-"Com `doNothing`, nada será feito; isso é, nenhum novo caractere de resposta "
-"será adicionado caso já haja um com o mesmo <token> na mensagem."
+msgstr "Com `doNothing`, nada será feito; isso é, nenhum novo caractere de resposta será adicionado caso já haja um com o mesmo <token> na mensagem."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:197
@@ -34248,17 +31274,13 @@ msgstr "trailer.ifmissing"
 #: en/git-interpret-trailers.txt:201
 #, priority:100
 msgid "This option makes it possible to choose what action will be performed when there is not yet any trailer with the same <token> in the message."
-msgstr ""
-"Esta opção possibilita escolher qual ação será executada quando ainda não "
-"houver nenhum \"caractere de resposta\" com o mesmo `<token>` na mensagem."
+msgstr "Esta opção possibilita escolher qual ação será executada quando ainda não houver nenhum \"caractere de resposta\" com o mesmo `<token>` na mensagem."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:204
 #, priority:100
 msgid "The valid values for this option are: `add` (this is the default) and `doNothing`."
-msgstr ""
-"Os valores válidos para esta opção são: `add` (o valor predefinido) e "
-"`doNothing`."
+msgstr "Os valores válidos para esta opção são: `add` (o valor predefinido) e `doNothing`."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:206
@@ -34282,20 +31304,13 @@ msgstr "trailer.<token>.key"
 #: en/git-interpret-trailers.txt:215
 #, priority:100
 msgid "This `key` will be used instead of <token> in the trailer. At the end of this key, a separator can appear and then some space characters. By default the only valid separator is ':', but this can be changed using the `trailer.separators` config variable."
-msgstr ""
-"Esta `key` será utilizada em vez do <token> no caractere de resposta. No "
-"final desta chave, um separador pode aparecer e em seguida, alguns "
-"caracteres de espaço. É predefinido que o único separador válido seja ':', "
-"mas isso pode ser alterado utilizando a variável de configuração `trailer."
-"separators`."
+msgstr "Esta `key` será utilizada em vez do <token> no caractere de resposta. No final desta chave, um separador pode aparecer e em seguida, alguns caracteres de espaço. É predefinido que o único separador válido seja ':', mas isso pode ser alterado utilizando a variável de configuração `trailer.separators`."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:218
 #, priority:100
 msgid "If there is a separator, then the key will be used instead of both the <token> and the default separator when adding the trailer."
-msgstr ""
-"Caso haja um separador, a chave será utilizada no lugar do <token> e do "
-"separador predefinido ao adicionar o caractere de resposta."
+msgstr "Caso haja um separador, a chave será utilizada no lugar do <token> e do separador predefinido ao adicionar o caractere de resposta."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:219
@@ -34307,10 +31322,7 @@ msgstr "trailer.<token>.where"
 #: en/git-interpret-trailers.txt:223
 #, priority:100
 msgid "This option takes the same values as the 'trailer.where' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
-"Esta opção utiliza os mesmos valores da variável de configuração "
-"'trailer.where' e substitui o que for especificado por essa opção para os "
-"caracteres de resposta com o `<token>` determinado."
+msgstr "Esta opção utiliza os mesmos valores da variável de configuração 'trailer.where' e substitui o que for especificado por essa opção para os caracteres de resposta com o `<token>` determinado."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:224
@@ -34322,10 +31334,7 @@ msgstr "trailer.<token>.ifexists"
 #: en/git-interpret-trailers.txt:228
 #, priority:100
 msgid "This option takes the same values as the 'trailer.ifexists' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
-"Essa opção utiliza os mesmos valores que a variável de configuração "
-"'trailer.ifexists' e substitui o que for definido por esta opção para os "
-"caracteres de resposta com o <token> informado."
+msgstr "Essa opção utiliza os mesmos valores que a variável de configuração 'trailer.ifexists' e substitui o que for definido por esta opção para os caracteres de resposta com o <token> informado."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:229
@@ -34337,10 +31346,7 @@ msgstr "trailer.<token>.ifmissing"
 #: en/git-interpret-trailers.txt:233
 #, priority:100
 msgid "This option takes the same values as the 'trailer.ifmissing' configuration variable and it overrides what is specified by that option for trailers with the specified <token>."
-msgstr ""
-"Esta opção utiliza os mesmos valores que a variável de configuração "
-"'trailer.ifmissing' e substitui o que for definido por esta opção para os "
-"caracteres de resposta com o <token> informado."
+msgstr "Esta opção utiliza os mesmos valores que a variável de configuração 'trailer.ifmissing' e substitui o que for definido por esta opção para os caracteres de resposta com o <token> informado."
 
 #. type: Labeled list
 #: en/git-interpret-trailers.txt:234
@@ -34352,49 +31358,31 @@ msgstr "trailer.<token>.command"
 #: en/git-interpret-trailers.txt:238
 #, priority:100
 msgid "This option can be used to specify a shell command that will be called to automatically add or modify a trailer with the specified <token>."
-msgstr ""
-"Esta opção pode ser utilizada para definir um comando shell que será chamado "
-"para adicionar ou modificar automaticamente um caractere de resposta com o "
-"<token> definido."
+msgstr "Esta opção pode ser utilizada para definir um comando shell que será chamado para adicionar ou modificar automaticamente um caractere de resposta com o <token> definido."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:244
 #, priority:100
 msgid "When this option is specified, the behavior is as if a special '<token>=<value>' argument were added at the beginning of the command line, where <value> is taken to be the standard output of the specified command with any leading and trailing whitespace trimmed off."
-msgstr ""
-"Quando esta opção é utilizada, o comportamento é como se um argumento "
-"especial '<token>=<valor>' fosse adicionado no início da linha de comando, "
-"onde <valor> é considerado a saída padrão do comando utilizado, removendo "
-"quaisquer espaços no começo e no fim."
+msgstr "Quando esta opção é utilizada, o comportamento é como se um argumento especial '<token>=<valor>' fosse adicionado no início da linha de comando, onde <valor> é considerado a saída padrão do comando utilizado, removendo quaisquer espaços no começo e no fim."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:248
 #, priority:100
 msgid "If the command contains the `$ARG` string, this string will be replaced with the <value> part of an existing trailer with the same <token>, if any, before the command is launched."
-msgstr ""
-"Caso o comando tiver um texto `$ARG`, ela será substituída pela parte "
-"`<valor>` do caractere de resposta já existente com o mesmo `<token>`, se "
-"houver, antes da execução do comando."
+msgstr "Caso o comando tiver um texto `$ARG`, ela será substituída pela parte `<valor>` do caractere de resposta já existente com o mesmo `<token>`, se houver, antes da execução do comando."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:254
 #, priority:100
 msgid "If some '<token>=<value>' arguments are also passed on the command line, when a 'trailer.<token>.command' is configured, the command will also be executed for each of these arguments. And the <value> part of these arguments, if any, will be used to replace the `$ARG` string in the command."
-msgstr ""
-"Caso alguns dos argumentos '<token>=<valor>' também forem passados na linha "
-"de comando, quando um 'trailer.<token>.command' estiver configurado, o "
-"comando também será executado para cada um destes argumentos. A parte "
-"`<valor>` destes argumentos, caso haja, será utilizada para substituir a "
-"string `$ARG` no comando."
+msgstr "Caso alguns dos argumentos '<token>=<valor>' também forem passados na linha de comando, quando um 'trailer.<token>.command' estiver configurado, o comando também será executado para cada um destes argumentos. A parte `<valor>` destes argumentos, caso haja, será utilizada para substituir a string `$ARG` no comando."
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:260
 #, priority:100
 msgid "Configure a 'sign' trailer with a 'Signed-off-by' key, and then add two of these trailers to a message:"
-msgstr ""
-"Configure um caractere de resposta 'sign' com uma chave 'Assinada por' "
-"(Signed-off-by) e adicione dois destes caracteres de resposta em uma "
-"mensagem:"
+msgstr "Configure um caractere de resposta 'sign' com uma chave 'Assinada por' (Signed-off-by) e adicione dois destes caracteres de resposta em uma mensagem:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:265
@@ -34417,8 +31405,7 @@ msgid ""
 "subject\n"
 msgstr ""
 "message\n"
-"$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice <alice@"
-"example.com>' --trailer 'sign: Bob <bob@example.com>'\n"
+"$ cat msg.txt | git interpret-trailers --trailer 'sign: Alice <alice@example.com>' --trailer 'sign: Bob <bob@example.com>'\n"
 "subject\n"
 
 #. type: delimited block -
@@ -34441,8 +31428,7 @@ msgstr ""
 #: en/git-interpret-trailers.txt:277
 #, priority:100
 msgid "Use the `--in-place` option to edit a message file in place:"
-msgstr ""
-"Utilize a opção `- in-place` para editar um arquivo da mensagem no local:"
+msgstr "Utilize a opção `- in-place` para editar um arquivo da mensagem no local:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:281
@@ -34464,8 +31450,7 @@ msgid ""
 "subject\n"
 msgstr ""
 "Assinado-por: Bob <bob@example.com>\n"
-"$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' "
-"--in-place msg.txt\n"
+"$ git interpret-trailers --trailer 'Acked-by: Alice <alice@example.com>' --in-place msg.txt\n"
 "$ cat msg.txt\n"
 "subject\n"
 
@@ -34483,9 +31468,7 @@ msgstr ""
 #: en/git-interpret-trailers.txt:297
 #, priority:100
 msgid "Extract the last commit as a patch, and add a 'Cc' and a 'Reviewed-by' trailer to it:"
-msgstr ""
-"Extraia o último commit como um patch e adicione um caractere de resposta "
-"'Cc' com um 'Revisado por' a ele:"
+msgstr "Extraia o último commit como um patch e adicione um caractere de resposta 'Cc' com um 'Revisado por' a ele:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:302
@@ -34497,17 +31480,13 @@ msgid ""
 msgstr ""
 "$ git format-patch -1\n"
 "0001-foo.patch\n"
-"$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer "
-"'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch\n"
+"$ git interpret-trailers --trailer 'Cc: Alice <alice@example.com>' --trailer 'Reviewed-by: Bob <bob@example.com>' 0001-foo.patch >0001-bar.patch\n"
 
 #. type: Plain text
 #: en/git-interpret-trailers.txt:307
 #, priority:100
 msgid "Configure a 'sign' trailer with a command to automatically add a 'Signed-off-by: ' with the author information only if there is no 'Signed-off-by: ' already, and show how it works:"
-msgstr ""
-"Configure um caractere de resposta 'sign' com um comando para adicionar "
-"automaticamente um 'Assinado-por:' com as informações do autor apenas se "
-"ainda não houver um 'Assinado-por:' e exiba como ele funciona:"
+msgstr "Configure um caractere de resposta 'sign' com um comando para adicionar automaticamente um 'Assinado-por:' com as informações do autor apenas se ainda não houver um 'Assinado-por:' e exiba como ele funciona:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:315
@@ -34523,8 +31502,7 @@ msgstr ""
 "$ git config trailer.sign.key \"Assinado-por: \"\n"
 "$ git config trailer.sign.ifmissing add\n"
 "$ git config trailer.sign.ifexists doNothing\n"
-"$ git config trailer.sign.command 'echo \"$(git config user.name) <$(git "
-"config user.email)>\"'\n"
+"$ git config trailer.sign.command 'echo \"$(git config user.name) <$(git config user.email)>\"'\n"
 "$ git interpret-trailers <<EOF\n"
 "> EOF\n"
 
@@ -34552,9 +31530,7 @@ msgstr "Assinado-por: Alice <alice@example.com>\n"
 #: en/git-interpret-trailers.txt:326
 #, priority:100
 msgid "Configure a 'fix' trailer with a key that contains a '#' and no space after this character, and show how it works:"
-msgstr ""
-"Configure um caracteres de resposta 'fix' com uma chave que contenha um '#', "
-"sem espaço após este caractere e mostre como ele funciona:"
+msgstr "Configure um caracteres de resposta 'fix' com uma chave que contenha um '#', sem espaço após este caractere e mostre como ele funciona:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:332
@@ -34580,9 +31556,7 @@ msgstr "Fix #42\n"
 #: en/git-interpret-trailers.txt:338
 #, priority:100
 msgid "Configure a 'see' trailer with a command to show the subject of a commit that is related, and show how it works:"
-msgstr ""
-"Configure um caractere de resposta 'see' com um comando para exibir o "
-"assunto de um commit relacionado e exibir como ele funciona:"
+msgstr "Configure um caractere de resposta 'see' com um comando para exibir o assunto de um commit relacionado e exibir como ele funciona:"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:352
@@ -34604,8 +31578,7 @@ msgstr ""
 "$ git config trailer.see.key \"See-also: \"\n"
 "$ git config trailer.see.ifExists \"replace\"\n"
 "$ git config trailer.see.ifMissing \"doNothing\"\n"
-"$ git config trailer.see.command \"git log -1 --oneline --format=\\\"%h (%s)"
-"\\\" --abbrev-commit --abbrev=14 \\$ARG\"\n"
+"$ git config trailer.see.command \"git log -1 --oneline --format=\\\"%h (%s)\\\" --abbrev-commit --abbrev=14 \\$ARG\"\n"
 "$ git interpret-trailers <<EOF\n"
 "> subject\n"
 "> \n"
@@ -34625,12 +31598,7 @@ msgstr "See-also: fe3187489d69c4 (assunto do commit relacionado)\n"
 #: en/git-interpret-trailers.txt:363
 #, priority:100
 msgid "Configure a commit template with some trailers with empty values (using sed to show and keep the trailing spaces at the end of the trailers), then configure a commit-msg hook that uses 'git interpret-trailers' to remove trailers with empty values and to add a 'git-version' trailer:"
-msgstr ""
-"Configure um modelo do commit com alguns caracteres de resposta com valores "
-"vazios (utilizando o comando sed para exibir e manter os espaços finais no "
-"final dos caracteres de resposta) e configure um gancho 'commit-msg' que "
-"utilize o comando 'git interpret-trailers' para remover os caracteres de "
-"resposta com os valores vazios e para adicionar um 'git-version':"
+msgstr "Configure um modelo do commit com alguns caracteres de resposta com valores vazios (utilizando o comando sed para exibir e manter os espaços finais no final dos caracteres de resposta) e configure um gancho 'commit-msg' que utilize o comando 'git interpret-trailers' para remover os caracteres de resposta com os valores vazios e para adicionar um 'git-version':"
 
 #. type: delimited block -
 #: en/git-interpret-trailers.txt:382
@@ -34667,8 +31635,7 @@ msgstr ""
 "$ git config commit.template commit_template.txt\n"
 "$ cat >.git/hooks/commit-msg <<EOF\n"
 "> #!/bin/sh\n"
-"> git interpret-trailers --trim-empty --trailer \"git-version: \\$(git "
-"describe)\" \"\\$1\" > \"\\$1.new\"\n"
+"> git interpret-trailers --trim-empty --trailer \"git-version: \\$(git describe)\" \"\\$1\" > \"\\$1.new\"\n"
 "> mv \"\\$1.new\" \"\\$1\"\n"
 "> EOF\n"
 "$ chmod +x .git/hooks/commit-msg\n"
@@ -34737,15 +31704,7 @@ msgstr "--decorate[=short|full|auto|no]"
 #: en/git-log.txt:40
 #, priority:260
 msgid "Print out the ref names of any commits that are shown. If 'short' is specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is specified, the full ref name (including prefix) will be printed. If 'auto' is specified, then if the output is going to a terminal, the ref names are shown as if 'short' were given, otherwise no ref names are shown. The default option is 'short'."
-msgstr ""
-"Imprima os nomes das refs de quaisquer commits que estão sendo exibidos. "
-"Caso `short` seja definido, os prefixos do nome das refs `refs/heads/`, `"
-"refs/tags/` e `refs/remotes/` não serão impressos. Caso `full` seja "
-"definido, o nome completo da \"ref\" (incluindo o prefixo) será impresso. "
-"Caso 'auto' seja definido, caso a saída seja para um terminal, os nomes das "
-"referências serão exibidas como se 'short' tenha sido utilizado, caso "
-"contrário, nenhum nome da referência será exibido. A opção predefinida é "
-"'short'."
+msgstr "Imprima os nomes das refs de quaisquer commits que estão sendo exibidos. Caso `short` seja definido, os prefixos do nome das refs `refs/heads/`, `refs/tags/` e `refs/remotes/` não serão impressos. Caso `full` seja definido, o nome completo da \"ref\" (incluindo o prefixo) será impresso. Caso 'auto' seja definido, caso a saída seja para um terminal, os nomes das referências serão exibidas como se 'short' tenha sido utilizado, caso contrário, nenhum nome da referência será exibido. A opção predefinida é 'short'."
 
 #. type: Labeled list
 #: en/git-log.txt:41
@@ -34763,14 +31722,7 @@ msgstr "--decorate-refs-exclude=<padrão>"
 #: en/git-log.txt:50
 #, priority:260
 msgid "If no `--decorate-refs` is given, pretend as if all refs were included.  For each candidate, do not use it for decoration if it matches any patterns given to `--decorate-refs-exclude` or if it doesn't match any of the patterns given to `--decorate-refs`. The `log.excludeDecoration` config option allows excluding refs from the decorations, but an explicit `--decorate-refs` pattern will override a match in `log.excludeDecoration`."
-msgstr ""
-"caso nenhuma opção `--decorate-refs` seja utilizada, finja que todos as refs "
-"foram incluídas.  Para cada candidato, não o use para decoração caso ele "
-"coincida com algum padrão fornecido para a opção `--decorate-refs-exclude` "
-"ou caso não coincida com nenhum padrão fornecido para `--decorate-refs`. A "
-"opção de configuração `log.excludeDecoration` permite excluir as refs das "
-"decorações, porém um padrão explícito `--decorate-refs` será substituida "
-"caso coincida com `log.excludeDecoration`."
+msgstr "caso nenhuma opção `--decorate-refs` seja utilizada, finja que todos as refs foram incluídas.  Para cada candidato, não o use para decoração caso ele coincida com algum padrão fornecido para a opção `--decorate-refs-exclude` ou caso não coincida com nenhum padrão fornecido para `--decorate-refs`. A opção de configuração `log.excludeDecoration` permite excluir as refs das decorações, porém um padrão explícito `--decorate-refs` será substituida caso coincida com `log.excludeDecoration`."
 
 #. type: Labeled list
 #: en/git-log.txt:51
@@ -34812,12 +31764,7 @@ msgstr "--full-diff"
 #: en/git-log.txt:67
 #, ignore-ellipsis, priority:260
 msgid "Without this flag, `git log -p <path>...` shows commits that touch the specified paths, and diffs about the same specified paths.  With this, the full diff is shown for commits that touch the specified paths; this means that \"<path>...\" limits only commits, and doesn't limit diff for those commits."
-msgstr ""
-"Sem esta opção, o comando `git log -p <caminho> ...` exibe os commits que "
-"tocam os caminhos informados e os \"diffs\" sobre os mesmos caminhos.  Com "
-"isso, o \"diff\" completo é exibido para os commits que tocam nos caminhos "
-"informados; significa que o \"<caminho> ...\" limita apenas os commits, não "
-"limita o \"diff\" para estes commits."
+msgstr "Sem esta opção, o comando `git log -p <caminho> ...` exibe os commits que tocam os caminhos informados e os \"diffs\" sobre os mesmos caminhos.  Com isso, o \"diff\" completo é exibido para os commits que tocam nos caminhos informados; significa que o \"<caminho> ...\" limita apenas os commits, não limita o \"diff\" para estes commits."
 
 #. type: Plain text
 #: en/git-log.txt:70
@@ -34835,11 +31782,7 @@ msgstr "--log-size"
 #: en/git-log.txt:76
 #, priority:260
 msgid "Include a line ``log size <number>'' in the output for each commit, where <number> is the length of that commit's message in bytes.  Intended to speed up tools that read log messages from `git log` output by allowing them to allocate space in advance."
-msgstr ""
-"Inclua uma linha ``log size <número>'' na saída para cada commit, onde o "
-"<número> é o comprimento da mensagem deste commit em bytes.  Destina-se a "
-"acelerar as ferramentas que leem as mensagens a partir do comando `git log` "
-"para alocar espaço antecipadamente."
+msgstr "Inclua uma linha ``log size <número>'' na saída para cada commit, onde o <número> é o comprimento da mensagem deste commit em bytes.  Destina-se a acelerar as ferramentas que leem as mensagens a partir do comando `git log` para alocar espaço antecipadamente."
 
 #. type: Labeled list
 #: en/git-log.txt:77
@@ -34869,14 +31812,7 @@ msgstr "<intervalo da revisão>"
 #: en/git-log.txt:100
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the 'Specifying Ranges' section of linkgit:gitrevisions[7]."
-msgstr ""
-"Exibe apenas os commits no intervalo definido das revisões.  Quando um "
-"<intervalo de revisão> não é definido, a predefinição retorna para `HEAD` ("
-"ou seja, todo o histórico que leva ao commit atual).  O `origin..HEAD` "
-"define todos os commits acessíveis a partir do commit atual (ou seja, `HEAD`)"
-", porém não a partir do `origin`. Para obter uma lista mais completa de "
-"maneiras de soletrar os nomes dos objetos, consulte a seção \"DEFININDO OS "
-"INTERVALOS\" no linkgit:gitrevisions[7]."
+msgstr "Exibe apenas os commits no intervalo definido das revisões.  Quando um <intervalo de revisão> não é definido, a predefinição retorna para `HEAD` (ou seja, todo o histórico que leva ao commit atual).  O `origin..HEAD` define todos os commits acessíveis a partir do commit atual (ou seja, `HEAD`), porém não a partir do `origin`. Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a seção \"DEFININDO OS INTERVALOS\" no linkgit:gitrevisions[7]."
 
 #. type: Labeled list
 #: en/git-log.txt:101 en/git-shortlog.txt:72
@@ -34888,11 +31824,7 @@ msgstr "[--] <caminho>..."
 #: en/git-log.txt:106
 #, priority:260
 msgid "Show only commits that are enough to explain how the files that match the specified paths came to be.  See 'History Simplification' below for details and other simplification modes."
-msgstr ""
-"Exiba apenas os commits que sejam suficientes para explicar como os arquivos "
-"que coincidam com os caminhos informados foram criados.  Consulte "
-"'Simplificação do Histórico' abaixo para obter mais detalhes e para conhecer "
-"os outros modos de simplificação."
+msgstr "Exiba apenas os commits que sejam suficientes para explicar como os arquivos que coincidam com os caminhos informados foram criados.  Consulte 'Simplificação do Histórico' abaixo para obter mais detalhes e para conhecer os outros modos de simplificação."
 
 #. type: Plain text
 #: en/git-log.txt:109 en/git-shortlog.txt:78
@@ -34952,9 +31884,7 @@ msgstr "`git log --name-status release..test`"
 #: en/git-log.txt:144
 #, priority:260
 msgid "Show the commits that are in the \"test\" branch but not yet in the \"release\" branch, along with the list of paths each commit modifies."
-msgstr ""
-"Exibe os commits que estão no ramo \"test\", mas não ainda no ramo \"release"
-"\", junto com a lista dos caminhos que cada commit modifica."
+msgstr "Exibe os commits que estão no ramo \"test\", mas não ainda no ramo \"release\", junto com a lista dos caminhos que cada commit modifica."
 
 #. type: Labeled list
 #: en/git-log.txt:145
@@ -35002,13 +31932,7 @@ msgstr "`git log -p -m --first-parent`"
 #: en/git-log.txt:169
 #, priority:260
 msgid "Shows the history including change diffs, but only from the ``main branch'' perspective, skipping commits that come from merged branches, and showing full diffs of changes introduced by the merges.  This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch."
-msgstr ""
-"EWxibe o histórico, incluindo as alterações dos diffs, porém apenas da "
-"perspectiva do ``ramo principal'', ignorando os commits provenientes da "
-"mesclagem das ramificações e exibindo os diffs completos das alterações "
-"introduzidas pelas mesclagens.  Apenas faz sentido ao seguir uma política "
-"estrita de mesclar todos os tópicos das ramificações ao permanecer em um "
-"único ramo integrado."
+msgstr "EWxibe o histórico, incluindo as alterações dos diffs, porém apenas da perspectiva do ``ramo principal'', ignorando os commits provenientes da mesclagem das ramificações e exibindo os diffs completos das alterações introduzidas pelas mesclagens.  Apenas faz sentido ao seguir uma política estrita de mesclar todos os tópicos das ramificações ao permanecer em um único ramo integrado."
 
 #. type: Labeled list
 #: en/git-log.txt:170
@@ -35050,9 +31974,7 @@ msgstr "format.pretty"
 #: en/git-log.txt:193
 #, priority:260
 msgid "Default for the `--format` option.  (See 'Pretty Formats' above.)  Defaults to `medium`."
-msgstr ""
-"É a opção predefinida para `--format`.  (Consulte 'Formatos bonitos' acima.)"
-"  A predefinição retorna para `medium`."
+msgstr "É a opção predefinida para `--format`.  (Consulte 'Formatos bonitos' acima.)  A predefinição retorna para `medium`."
 
 #. type: Labeled list
 #: en/git-log.txt:194
@@ -35064,11 +31986,7 @@ msgstr "i18n.logOutputEncoding"
 #: en/git-log.txt:198
 #, priority:260
 msgid "Encoding to use when displaying logs.  (See 'Discussion' above.)  Defaults to the value of `i18n.commitEncoding` if set, and UTF-8 otherwise."
-msgstr ""
-"Codificação que será utilizada para exibir os registros logs.  (Consulte a "
-"'Discussão' acima.)  A predefinição retorna para o valor existente na opção "
-"de configuração `i18n.commitEncoding` caso seja definido, caso contrário, "
-"'UTF-8'."
+msgstr "Codificação que será utilizada para exibir os registros logs.  (Consulte a 'Discussão' acima.)  A predefinição retorna para o valor existente na opção de configuração `i18n.commitEncoding` caso seja definido, caso contrário, 'UTF-8'."
 
 #. type: Labeled list
 #: en/git-log.txt:199
@@ -35080,19 +31998,13 @@ msgstr "log.date"
 #: en/git-log.txt:203
 #, priority:260
 msgid "Default format for human-readable dates.  (Compare the `--date` option.)  Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 2010 -0500`."
-msgstr ""
-"O formato predefinido para que as datas sejam legíveis para as pessoas.  ("
-"Compare a opção `--date`.)  A predefinição retorna para \"default\", o que "
-"significa escrever as datas como `Sat May 8 19:35:34 2010 -0500`."
+msgstr "O formato predefinido para que as datas sejam legíveis para as pessoas.  (Compare a opção `--date`.)  A predefinição retorna para \"default\", o que significa escrever as datas como `Sat May 8 19:35:34 2010 -0500`."
 
 #. type: Plain text
 #: en/git-log.txt:207
 #, priority:260
 msgid "If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" will be the used for the date format. Otherwise \"default\" will be used."
-msgstr ""
-"Caso o formato esteja definido como \"auto:foo\" e o pager estiver em uso, o "
-"format \"foo\" será utilizado para o formato da data. Caso contrário, a "
-"\"predefinição\" será usada."
+msgstr "Caso o formato esteja definido como \"auto:foo\" e o pager estiver em uso, o format \"foo\" será utilizado para o formato da data. Caso contrário, a \"predefinição\" será usada."
 
 #. type: Labeled list
 #: en/git-log.txt:208
@@ -35104,11 +32016,7 @@ msgstr "log.follow"
 #: en/git-log.txt:213
 #, priority:260
 msgid "If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given.  This has the same limitations as `--follow`, i.e. it cannot be used to follow multiple files and does not work well on non-linear history."
-msgstr ""
-"Caso seja `true`, o comando `git log` como se a opção `--follow` tenha sido "
-"usada quando um único <caminho> seja utilizado.  Isso tem as mesmas "
-"limitações que a opção `--follow`, ou seja, não pode ser usado para seguir "
-"vários arquivos e não funciona bem em histórico não linear."
+msgstr "Caso seja `true`, o comando `git log` como se a opção `--follow` tenha sido usada quando um único <caminho> seja utilizado.  Isso tem as mesmas limitações que a opção `--follow`, ou seja, não pode ser usado para seguir vários arquivos e não funciona bem em histórico não linear."
 
 #. type: Labeled list
 #: en/git-log.txt:214
@@ -35120,11 +32028,7 @@ msgstr "log.showRoot"
 #: en/git-log.txt:219
 #, priority:260
 msgid "If `false`, `git log` and related commands will not treat the initial commit as a big creation event.  Any root commits in `git log -p` output would be shown without a diff attached.  The default is `true`."
-msgstr ""
-"Caso seja `false`, o comando `git log` e relacionados, não tratarão o commit "
-"inicial como um grande episódio de criação.  Qualquer commit raiz gerado "
-"pelo comando `git log -p` seria exibido sem um diff anexado.  A predefinição "
-"é `true`."
+msgstr "Caso seja `false`, o comando `git log` e relacionados, não tratarão o commit inicial como um grande episódio de criação.  Qualquer commit raiz gerado pelo comando `git log -p` seria exibido sem um diff anexado.  A predefinição é `true`."
 
 #. type: Labeled list
 #: en/git-log.txt:220
@@ -35160,20 +32064,13 @@ msgstr "notes.displayRef"
 #: en/git-log.txt:232
 #, priority:260
 msgid "Which refs, in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the `log` family of commands.  See linkgit:git-notes[1]."
-msgstr ""
-"Quais as refs, além do padrão definido através da opção de configuração `core"
-".notesRef` ou do `GIT_NOTES_REF`, para ler as anotações ao exiir as "
-"mensagens do commit com a família de comandos `log`.  Consulte linkgit:git-"
-"notes[1]."
+msgstr "Quais as refs, além do padrão definido através da opção de configuração `core.notesRef` ou do `GIT_NOTES_REF`, para ler as anotações ao exiir as mensagens do commit com a família de comandos `log`.  Consulte linkgit:git-notes[1]."
 
 #. type: Plain text
 #: en/git-log.txt:236
 #, priority:260
 msgid "May be an unabbreviated ref name or a glob and may be specified multiple times.  A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
-msgstr ""
-"Pode ser um nome sem abreviação ou um \"glob\" e pode ser especificado "
-"várias vezes.  Um aviso será emitido para refs que não existem, mas um \"glob"
-"\" que não corresponda a nenhum \"ref\" é silenciosamente ignorado."
+msgstr "Pode ser um nome sem abreviação ou um \"glob\" e pode ser especificado várias vezes.  Um aviso será emitido para refs que não existem, mas um \"glob\" que não corresponda a nenhum \"ref\" é silenciosamente ignorado."
 
 #. type: Plain text
 #: en/git-log.txt:240
@@ -35191,9 +32088,7 @@ msgstr "git-ls-files(1)"
 #: en/git-ls-files.txt:7
 #, priority:100
 msgid "git-ls-files - Show information about files in the index and the working tree"
-msgstr ""
-"git-ls-files - Exiba as informações sobre os arquivos no índice e na árvore "
-"de trabalho"
+msgstr "git-ls-files - Exiba as informações sobre os arquivos no índice e na árvore de trabalho"
 
 #. type: Plain text
 #: en/git-ls-files.txt:23
@@ -35227,17 +32122,13 @@ msgstr ""
 #: en/git-ls-files.txt:29
 #, priority:100
 msgid "This merges the file listing in the directory cache index with the actual working directory list, and shows different combinations of the two."
-msgstr ""
-"Mescla a listagem dos arquivos no índice do cache do diretório com a lista "
-"dos diretórios de trabalho real e exibe as diferentes combinações dos dois."
+msgstr "Mescla a listagem dos arquivos no índice do cache do diretório com a lista dos diretórios de trabalho real e exibe as diferentes combinações dos dois."
 
 #. type: Plain text
 #: en/git-ls-files.txt:32
 #, priority:100
 msgid "One or more of the options below may be used to determine the files shown:"
-msgstr ""
-"Uma ou mais das opções abaixo podem ser utilizadas para determinar quais os "
-"arquivos serão exibidos:"
+msgstr "Uma ou mais das opções abaixo podem ser utilizadas para determinar quais os arquivos serão exibidos:"
 
 #. type: Plain text
 #: en/git-ls-files.txt:38
@@ -35291,13 +32182,7 @@ msgstr "--ignored"
 #: en/git-ls-files.txt:58
 #, priority:100
 msgid "Show only ignored files in the output. When showing files in the index, print only those matched by an exclude pattern. When showing \"other\" files, show only those matched by an exclude pattern. Standard ignore rules are not automatically activated, therefore at least one of the `--exclude*` options is required."
-msgstr ""
-"Exibe apenas os arquivos ignorados na saída. Ao exibir os arquivos no "
-"índice, exiba apenas aqueles que coincidam através de um padrão de exclusão. "
-"Ao exibir os \"outros\" arquivos, exiba apenas aqueles que coincidam através "
-"de um padrão de exclusão. As regras predefinidas para ignorar não estão "
-"automaticamente ativas; portanto, pelo menos uma das opções `--exclude*` são "
-"necessários."
+msgstr "Exibe apenas os arquivos ignorados na saída. Ao exibir os arquivos no índice, exiba apenas aqueles que coincidam através de um padrão de exclusão. Ao exibir os \"outros\" arquivos, exiba apenas aqueles que coincidam através de um padrão de exclusão. As regras predefinidas para ignorar não estão automaticamente ativas; portanto, pelo menos uma das opções `--exclude*` são necessários."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:60
@@ -35309,9 +32194,7 @@ msgstr "--stage"
 #: en/git-ls-files.txt:62
 #, priority:100
 msgid "Show staged contents' mode bits, object name and stage number in the output."
-msgstr ""
-"Exibe os bits do modo do conteúdo escalonado, o nome do objeto e o número do "
-"estágio na saída."
+msgstr "Exibe os bits do modo do conteúdo escalonado, o nome do objeto e o número do estágio na saída."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:63
@@ -35323,9 +32206,7 @@ msgstr "--directory"
 #: en/git-ls-files.txt:66
 #, priority:100
 msgid "If a whole directory is classified as \"other\", show just its name (with a trailing slash) and not its whole contents."
-msgstr ""
-"Caso um diretório inteiro seja classificado como \"other\" (outro), exibe "
-"apenas o seu nome (com uma barra à direita) e não todo o seu conteúdo."
+msgstr "Caso um diretório inteiro seja classificado como \"other\" (outro), exibe apenas o seu nome (com uma barra à direita) e não todo o seu conteúdo."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:67
@@ -35337,8 +32218,7 @@ msgstr "--no-empty-directory"
 #: en/git-ls-files.txt:69
 #, priority:100
 msgid "Do not list empty directories. Has no effect without --directory."
-msgstr ""
-"Não liste os diretórios vazios. Não tem efeito sem a opção `--directory`."
+msgstr "Não liste os diretórios vazios. Não tem efeito sem a opção `--directory`."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:71 en/git-update-index.txt:68
@@ -35350,9 +32230,7 @@ msgstr "--unmerged"
 #: en/git-ls-files.txt:73
 #, priority:100
 msgid "Show unmerged files in the output (forces --stage)"
-msgstr ""
-"Exibe os arquivos não mesclados na saída (impõem a utilização da opção "
-"`--stage`)"
+msgstr "Exibe os arquivos não mesclados na saída (impõem a utilização da opção `--stage`)"
 
 #. type: Labeled list
 #: en/git-ls-files.txt:75
@@ -35364,18 +32242,13 @@ msgstr "--killed"
 #: en/git-ls-files.txt:79
 #, priority:100
 msgid "Show files on the filesystem that need to be removed due to file/directory conflicts for checkout-index to succeed."
-msgstr ""
-"Exibe os arquivos no sistema de arquivos que precisam ser removidos devido a "
-"conflitos do arquivo/diretório para que o índice averiguado seja bem-"
-"sucedido."
+msgstr "Exibe os arquivos no sistema de arquivos que precisam ser removidos devido a conflitos do arquivo/diretório para que o índice averiguado seja bem-sucedido."
 
 #. type: Plain text
 #: en/git-ls-files.txt:83
 #, priority:100
 msgid "\\0 line termination on output and do not quote filenames.  See OUTPUT below for more information."
-msgstr ""
-"A terminação \\0 da linha na saída e não cita os nomes dos arquivos.  "
-"Consulte SAÍDA abaixo para obter mais informações."
+msgstr "A terminação \\0 da linha na saída e não cita os nomes dos arquivos.  Consulte SAÍDA abaixo para obter mais informações."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:84
@@ -35387,10 +32260,7 @@ msgstr "-x <padrão>"
 #: en/git-ls-files.txt:89
 #, priority:100
 msgid "Skip untracked files matching pattern.  Note that pattern is a shell wildcard pattern. See EXCLUDE PATTERNS below for more information."
-msgstr ""
-"Ignora o padrão de correspondência dos arquivos não monitorados.  Observe "
-"que o padrão é um padrão curinga do shell. Consulte EXCLUIR PADRÕES abaixo "
-"para obter mais informações."
+msgstr "Ignora o padrão de correspondência dos arquivos não monitorados.  Observe que o padrão é um padrão curinga do shell. Consulte EXCLUIR PADRÕES abaixo para obter mais informações."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:90
@@ -35420,17 +32290,13 @@ msgstr "--exclude-per-directory=<arquivo>"
 #: en/git-ls-files.txt:97
 #, priority:100
 msgid "Read additional exclude patterns that apply only to the directory and its subdirectories in <file>."
-msgstr ""
-"Leia os padrões de exclusão adicionais que se aplicam apenas ao diretório e "
-"aos seus subdiretórios no <arquivo>."
+msgstr "Leia os padrões de exclusão adicionais que se aplicam apenas ao diretório e aos seus subdiretórios no <arquivo>."
 
 #. type: Plain text
 #: en/git-ls-files.txt:101
 #, priority:100
 msgid "Add the standard Git exclusions: .git/info/exclude, .gitignore in each directory, and the user's global exclusion file."
-msgstr ""
-"Adicione as exclusões padrão do Git: '.git/info/exclude', '.gitignore' em "
-"cada diretório e o arquivo de exclusão global do usuário."
+msgstr "Adicione as exclusões padrão do Git: '.git/info/exclude', '.gitignore' em cada diretório e o arquivo de exclusão global do usuário."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:102
@@ -35442,9 +32308,7 @@ msgstr "--error-unmatch"
 #: en/git-ls-files.txt:105
 #, priority:100
 msgid "If any <file> does not appear in the index, treat this as an error (return 1)."
-msgstr ""
-"Caso algum `<arquivo>` não apareça no índice, trate isso como um erro ("
-"retorno 1)."
+msgstr "Caso algum `<arquivo>` não apareça no índice, trate isso como um erro (retorno 1)."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:106
@@ -35456,31 +32320,19 @@ msgstr "--with-tree=<tree-ish>"
 #: en/git-ls-files.txt:112
 #, priority:100
 msgid "When using --error-unmatch to expand the user supplied <file> (i.e. path pattern) arguments to paths, pretend that paths which were removed in the index since the named <tree-ish> are still present.  Using this option with `-s` or `-u` options does not make any sense."
-msgstr ""
-"Ao utilizar o comando `--error-unmatch` para expandir os argumentos "
-"<arquivo> (padrão do caminho por exemplo) argumentos para os caminhos, finja "
-"que os caminhos que foram removidos no índice desde que o `<tree-ish>` ainda "
-"esteja presente.  Utilizar esta opção com as opções `-s` ou `-u` não faz "
-"nenhum sentido."
+msgstr "Ao utilizar o comando `--error-unmatch` para expandir os argumentos <arquivo> (padrão do caminho por exemplo) argumentos para os caminhos, finja que os caminhos que foram removidos no índice desde que o `<tree-ish>` ainda esteja presente.  Utilizar esta opção com as opções `-s` ou `-u` não faz nenhum sentido."
 
 #. type: Plain text
 #: en/git-ls-files.txt:120
 #, priority:100
 msgid "This feature is semi-deprecated. For scripting purpose, linkgit:git-status[1] `--porcelain` and linkgit:git-diff-files[1] `--name-status` are almost always superior alternatives, and users should look at linkgit:git-status[1] `--short` or linkgit:git-diff[1] `--name-status` for more user-friendly alternatives."
-msgstr ""
-"Esse recurso está quase obsoleto. Para fins de script, linkgit:git-status[1] "
-"`--porcelain` e linkgit:git-diff-files[1] `--name-status` são quase sempre "
-"as maiores alternativas, os usuários devem olhar para o linkgit:git-status[1]"
-" `--short` ou linkgit:git-diff[1] `--namename-status` para as alternativas "
-"mais amigáveis."
+msgstr "Esse recurso está quase obsoleto. Para fins de script, linkgit:git-status[1] `--porcelain` e linkgit:git-diff-files[1] `--name-status` são quase sempre as maiores alternativas, os usuários devem olhar para o linkgit:git-status[1] `--short` ou linkgit:git-diff[1] `--namename-status` para as alternativas mais amigáveis."
 
 #. type: Plain text
 #: en/git-ls-files.txt:124
 #, priority:100
 msgid "This option identifies the file status with the following tags (followed by a space) at the start of each line:"
-msgstr ""
-"Esta opção identifica a condição geral do arquivo com as seguintes opções ("
-"seguidas por um espaço) no início de cada linha:"
+msgstr "Esta opção identifica a condição geral do arquivo com as seguintes opções (seguidas por um espaço) no início de cada linha:"
 
 #. type: Labeled list
 #: en/git-ls-files.txt:125
@@ -35582,27 +32434,19 @@ msgstr "Semelhante ao `-t`, porém utilize as letras minúsculas para os arquivo
 #: en/git-ls-files.txt:153
 #, priority:100
 msgid "Recursively calls ls-files on each active submodule in the repository.  Currently there is only support for the --cached mode."
-msgstr ""
-"Chama recursivamente os 'ls-files' em cada submódulo no repositório.  "
-"Atualmente, há apenas suporte para a opção `--cached-mode`."
+msgstr "Chama recursivamente os 'ls-files' em cada submódulo no repositório.  Atualmente, há apenas suporte para a opção `--cached-mode`."
 
 #. type: Plain text
 #: en/git-ls-files.txt:158 en/git-ls-tree.txt:67
 #, priority:100
 msgid "Instead of showing the full 40-byte hexadecimal object lines, show only a partial prefix.  Non default number of digits can be specified with --abbrev=<n>."
-msgstr ""
-"Em vez de exibir as linhas do objeto hexadecimal com 40 bytes, exibe apenas "
-"um prefixo parcial.  Um número não predefinido dos dígitos podem ser "
-"definidos com `--abbrev=<n>`."
+msgstr "Em vez de exibir as linhas do objeto hexadecimal com 40 bytes, exibe apenas um prefixo parcial.  Um número não predefinido dos dígitos podem ser definidos com `--abbrev=<n>`."
 
 #. type: Plain text
 #: en/git-ls-files.txt:164
 #, priority:100
 msgid "After each line that describes a file, add more data about its cache entry.  This is intended to show as much information as possible for manual inspection; the exact format may change at any time."
-msgstr ""
-"Após cada linha que descreve um arquivo, adicione mais dados sobre a sua "
-"entrada no cache.  O objetivo é exibir o máximo de informações possíveis "
-"para a inspeção manual; o formato exato pode mudar a qualquer momento."
+msgstr "Após cada linha que descreve um arquivo, adicione mais dados sobre a sua entrada no cache.  O objetivo é exibir o máximo de informações possíveis para a inspeção manual; o formato exato pode mudar a qualquer momento."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:165
@@ -35614,39 +32458,25 @@ msgstr "--eol"
 #: en/git-ls-files.txt:170
 #, priority:100
 msgid "Show <eolinfo> and <eolattr> of files.  <eolinfo> is the file content identification used by Git when the \"text\" attribute is \"auto\" (or not set and core.autocrlf is not false).  <eolinfo> is either \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
-msgstr ""
-"Exibe o `<eolinfo>` e o `<eolattr>` dos arquivos.  O `<eolinfo>` é a "
-"identificação do conteúdo do arquivo utilizado pelo Git quando o atributo "
-"\"text\" for  \"auto\" (ou não está definido e o `core.autocrlf` não for "
-"falso).  O `<eolinfo>` é \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" ou "
-"\"\"."
+msgstr "Exibe o `<eolinfo>` e o `<eolattr>` dos arquivos.  O `<eolinfo>` é a identificação do conteúdo do arquivo utilizado pelo Git quando o atributo \"text\" for  \"auto\" (ou não está definido e o `core.autocrlf` não for falso).  O `<eolinfo>` é \"-text\", \"none\", \"lf\", \"crlf\", \"mixed\" ou \"\"."
 
 #. type: Plain text
 #: en/git-ls-files.txt:173
 #, priority:100
 msgid "\"\" means the file is not a regular file, it is not in the index or not accessible in the working tree."
-msgstr ""
-"\"\" significa que o arquivo não é um arquivo comum, não está no índice ou "
-"não está acessível na árvore de trabalho."
+msgstr "\"\" significa que o arquivo não é um arquivo comum, não está no índice ou não está acessível na árvore de trabalho."
 
 #. type: Plain text
 #: en/git-ls-files.txt:177
 #, priority:100
 msgid "<eolattr> is the attribute that is used when checking out or committing, it is either \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\".  Since Git 2.10 \"text=auto eol=lf\" and \"text=auto eol=crlf\" are supported."
-msgstr ""
-"O `<eolattr>` é o atributo utilizado ao efetuar a averiguação ou fazer o "
-"commit, é também \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", "
-"\"text eol=crlf\".  Desde o Git 2.10, \"text=auto eol=lf\" e \"text=auto eol="
-"crlf\" são compatíveis."
+msgstr "O `<eolattr>` é o atributo utilizado ao efetuar a averiguação ou fazer o commit, é também \"\", \"-text\", \"text\", \"text=auto\", \"text eol=lf\", \"text eol=crlf\".  Desde o Git 2.10, \"text=auto eol=lf\" e \"text=auto eol=crlf\" são compatíveis."
 
 #. type: Plain text
 #: en/git-ls-files.txt:181
 #, priority:100
 msgid "Both the <eolinfo> in the index (\"i/<eolinfo>\")  and in the working tree (\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/<eolattr>\")."
-msgstr ""
-"Ambos os `<eolinfo>` no índice (\"i/<eolinfo>\") e na árvore de trabalho (\"w"
-"/<eolinfo>\") são exibidos para os arquivos regulares, seguidos pelo (\"attr"
-"/<eolattr>\")."
+msgstr "Ambos os `<eolinfo>` no índice (\"i/<eolinfo>\") e na árvore de trabalho (\"w/<eolinfo>\") são exibidos para os arquivos regulares, seguidos pelo (\"attr/<eolattr>\")."
 
 #. type: Labeled list
 #: en/git-ls-files.txt:185 en/git.txt:367 en/git-update-index.txt:230
@@ -35658,17 +32488,13 @@ msgstr "<arquivo>"
 #: en/git-ls-files.txt:188
 #, priority:100
 msgid "Files to show. If no files are given all files which match the other specified criteria are shown."
-msgstr ""
-"Arquivos para exibir. Caso nenhum arquivo seja informado, todos os arquivos "
-"que coincidam com outros critérios informados serão mostrados."
+msgstr "Arquivos para exibir. Caso nenhum arquivo seja informado, todos os arquivos que coincidam com outros critérios informados serão mostrados."
 
 #. type: Plain text
 #: en/git-ls-files.txt:193
 #, priority:100
 msgid "'git ls-files' just outputs the filenames unless `--stage` is specified in which case it outputs:"
-msgstr ""
-"'git ls-files' apenas gera os nomes dos arquivos, a menos que a opção "
-"`--stage` seja utilizado; nesse caso, ele gera:"
+msgstr "'git ls-files' apenas gera os nomes dos arquivos, a menos que a opção `--stage` seja utilizado; nesse caso, ele gera:"
 
 #. type: Plain text
 #: en/git-ls-files.txt:195
@@ -35684,17 +32510,13 @@ msgid ""
 "\ti/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><file>\n"
 msgstr ""
 "'git ls-files --eol' will show\n"
-"\ti/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><arquivo>"
-"\n"
+"\ti/<eolinfo><SPACES>w/<eolinfo><SPACES>attr/<eolattr><SPACE*><TAB><arquivo>\n"
 
 #. type: Plain text
 #: en/git-ls-files.txt:201
 #, priority:100
 msgid "'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine detailed information on unmerged paths."
-msgstr ""
-"Os comando 'git ls-files --unmerged' e o 'git ls-files --stage' podem ser "
-"utilizados para examinar as informações detalhadas sobre os caminhos não "
-"mesclados."
+msgstr "Os comando 'git ls-files --unmerged' e o 'git ls-files --stage' podem ser utilizados para examinar as informações detalhadas sobre os caminhos não mesclados."
 
 #. type: Plain text
 #: en/git-ls-files.txt:207
@@ -35712,11 +32534,7 @@ msgstr "EXCLUIR PADRÕES"
 #: en/git-ls-files.txt:221
 #, priority:100
 msgid "'git ls-files' can use a list of \"exclude patterns\" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified.  linkgit:gitignore[5] specifies the format of exclude patterns."
-msgstr ""
-"O 'git ls-files' pode utilizar uma lista de \"padrões de exclusão\" ao "
-"percorrer a árvore dos diretórios e localizar os arquivos para exibir quando "
-"as opções `--others` ou `--ignored` são utilizados.  linkgit:gitignore[5] "
-"determina o formato dos padrões de exclusão."
+msgstr "O 'git ls-files' pode utilizar uma lista de \"padrões de exclusão\" ao percorrer a árvore dos diretórios e localizar os arquivos para exibir quando as opções `--others` ou `--ignored` são utilizados.  linkgit:gitignore[5] determina o formato dos padrões de exclusão."
 
 #. type: Plain text
 #: en/git-ls-files.txt:223
@@ -35728,39 +32546,25 @@ msgstr "Estes padrões de exclusão vêm destes locais, na ordem:"
 #: en/git-ls-files.txt:227
 #, priority:100
 msgid "The command-line flag --exclude=<pattern> specifies a single pattern.  Patterns are ordered in the same order they appear in the command line."
-msgstr ""
-"A opção da linha de comando `--exclude=<padrão>` define um único padrão.  Os "
-"padrões são ordenados na mesma ordem em que aparecem na linha de comando."
+msgstr "A opção da linha de comando `--exclude=<padrão>` define um único padrão.  Os padrões são ordenados na mesma ordem em que aparecem na linha de comando."
 
 #. type: Plain text
 #: en/git-ls-files.txt:231
 #, priority:100
 msgid "The command-line flag --exclude-from=<file> specifies a file containing a list of patterns.  Patterns are ordered in the same order they appear in the file."
-msgstr ""
-"A opção da linha de comando `--exclude-from=<arquivo>` define um arquivo que "
-"contém uma lista de padrões.  Os padrões são ordenados na mesma ordem em que "
-"aparecem no arquivo."
+msgstr "A opção da linha de comando `--exclude-from=<arquivo>` define um arquivo que contém uma lista de padrões.  Os padrões são ordenados na mesma ordem em que aparecem no arquivo."
 
 #. type: Plain text
 #: en/git-ls-files.txt:237
 #, priority:100
 msgid "The command-line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git ls-files' examines, normally `.gitignore`.  Files in deeper directories take precedence.  Patterns are ordered in the same order they appear in the files."
-msgstr ""
-"A opção da linha de comando `--exclude-per-directory=<nome>` define um nome "
-"do arquivo em cada diretório que o comando 'git ls-files' examina, "
-"normalmente `.gitignore`.  Os arquivos nos diretórios mais profundos têm "
-"precedência.  Os padrões são ordenados na mesma ordem em que aparecem nos "
-"arquivos."
+msgstr "A opção da linha de comando `--exclude-per-directory=<nome>` define um nome do arquivo em cada diretório que o comando 'git ls-files' examina, normalmente `.gitignore`.  Os arquivos nos diretórios mais profundos têm precedência.  Os padrões são ordenados na mesma ordem em que aparecem nos arquivos."
 
 #. type: Plain text
 #: en/git-ls-files.txt:243
 #, priority:100
 msgid "A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree.  A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in."
-msgstr ""
-"Um padrão definido na linha de comandos com `--exclude` ou lido do arquivo "
-"definido com `--exclude-from` é relativo ao topo da árvore de diretórios.  "
-"Um padrão lido de um arquivo definido com `--exclude-per-directory` é "
-"relativo ao diretório em que o padrão do arquivo aparece."
+msgstr "Um padrão definido na linha de comandos com `--exclude` ou lido do arquivo definido com `--exclude-from` é relativo ao topo da árvore de diretórios.  Um padrão lido de um arquivo definido com `--exclude-per-directory` é relativo ao diretório em que o padrão do arquivo aparece."
 
 #. type: Plain text
 #: en/git-ls-files.txt:247
@@ -35796,9 +32600,7 @@ msgstr ""
 #: en/git-ls-remote.txt:20
 #, priority:100
 msgid "Displays references available in a remote repository along with the associated commit IDs."
-msgstr ""
-"Exibe as referências disponíveis em um repositório remoto, juntamente com as "
-"IDs os commits associados."
+msgstr "Exibe as referências disponíveis em um repositório remoto, juntamente com as IDs os commits associados."
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
@@ -35810,12 +32612,7 @@ msgstr "--heads"
 #: en/git-ls-remote.txt:34
 #, priority:100
 msgid "Limit to only refs/heads and refs/tags, respectively.  These options are _not_ mutually exclusive; when given both, references stored in refs/heads and refs/tags are displayed.  Note that `git ls-remote -h` used without anything else on the command line gives help, consistent with other git subcommands."
-msgstr ""
-"Limite a apenas 'refs/heads' e 'refs/tags', respectivamente.  Essas opções "
-"_não_ são reciprocamente exclusivas; ambas quando informadas, as referências "
-"armazenadas em 'refs/heads' e 'refs/tags' são exibidas.  Note que o `git ls-"
-"remote -h` exibe a ajuda quando utilizado sem nada na linha de comando, "
-"consistente com outros subcomandos do git."
+msgstr "Limite a apenas 'refs/heads' e 'refs/tags', respectivamente.  Essas opções _não_ são reciprocamente exclusivas; ambas quando informadas, as referências armazenadas em 'refs/heads' e 'refs/tags' são exibidas.  Note que o `git ls-remote -h` exibe a ajuda quando utilizado sem nada na linha de comando, consistente com outros subcomandos do git."
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:35
@@ -35845,20 +32642,13 @@ msgstr "--upload-pack=<exec>"
 #: en/git-ls-remote.txt:47
 #, priority:100
 msgid "Specify the full path of 'git-upload-pack' on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the user."
-msgstr ""
-"Define o caminho completo do 'git-upload-pack' no host remoto. Permite "
-"listar as referências dos repositórios acessados através do SSH e onde o "
-"daemon SSH não utiliza o PATH configurado pelo usuário."
+msgstr "Define o caminho completo do 'git-upload-pack' no host remoto. Permite listar as referências dos repositórios acessados através do SSH e onde o daemon SSH não utiliza o PATH configurado pelo usuário."
 
 #. type: Plain text
 #: en/git-ls-remote.txt:53
 #, priority:100
 msgid "Exit with status \"2\" when no matching refs are found in the remote repository. Usually the command exits with status \"0\" to indicate it successfully talked with the remote repository, whether it found any matching refs."
-msgstr ""
-"Encerra com a condição '2' quando nenhuma refs coincidente for encontrada no "
-"repositório remoto. Normalmente, o comando encerra com a condição '0' para "
-"indicar que houve uma comunicação bem sucedida com o repositório remoto, "
-"caso tenha encontrado qualquer refs coincidentes."
+msgstr "Encerra com a condição '2' quando nenhuma refs coincidente for encontrada no repositório remoto. Normalmente, o comando encerra com a condição '0' para indicar que houve uma comunicação bem sucedida com o repositório remoto, caso tenha encontrado qualquer refs coincidentes."
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:54
@@ -35870,10 +32660,7 @@ msgstr "--get-url"
 #: en/git-ls-remote.txt:58
 #, priority:100
 msgid "Expand the URL of the given remote repository taking into account any \"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit without talking to the remote."
-msgstr ""
-"Expanda a URL do repositório remoto informado, levando em consideração "
-"qualquer definição da configuração \"url.<base>.insteadOf\" (consulte linkgit"
-":git-config[1]) e encerre sem se comunicar com o repositório remoto."
+msgstr "Expanda a URL do repositório remoto informado, levando em consideração qualquer definição da configuração \"url.<base>.insteadOf\" (consulte linkgit:git-config[1]) e encerre sem se comunicar com o repositório remoto."
 
 #. type: Labeled list
 #: en/git-ls-remote.txt:59
@@ -35885,25 +32672,13 @@ msgstr "--symref"
 #: en/git-ls-remote.txt:64
 #, priority:100
 msgid "In addition to the object pointed by it, show the underlying ref pointed by it when showing a symbolic ref.  Currently, upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote."
-msgstr ""
-"Além do objeto apontado por ele, exiba a referência subjacente apontada por "
-"ele ao exibir uma referência simbólica.  Atualmente, o \"upload-pack\" exibe "
-"apenas a referência simbólica do `HEAD`, portanto será o único exibido pelo "
-"'ls-remote'."
+msgstr "Além do objeto apontado por ele, exiba a referência subjacente apontada por ele ao exibir uma referência simbólica.  Atualmente, o \"upload-pack\" exibe apenas a referência simbólica do `HEAD`, portanto será o único exibido pelo 'ls-remote'."
 
 #. type: Plain text
 #: en/git-ls-remote.txt:74
 #, priority:100
 msgid "Sort based on the key given. Prefix `-` to sort in descending order of the value. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable.  See linkgit:git-for-each-ref[1] for more sort options, but be aware keys like `committerdate` that require access to the objects themselves will not work for refs whose objects have not yet been fetched from the remote, and will give a `missing object` error."
-msgstr ""
-"Classifique com base na chave informada. O prefixo `-` é utilizado para "
-"classificar em ordem decrescente. Supports \"version:refname\" or \"v:"
-"refname\" (tag names are treated as versions). A ordem de classificação "
-"`versão:refname` também pode ser afetada pela variável de configuração "
-"`versionsort.sufix`.  Para mais opções de classificação consulte linkgit:git-"
-"for-each-ref[1], porém esteja ciente que chaves como `committerdate` que "
-"requeiram acesso aos objetos em si não funcionarão com refs cujos objetos "
-"ainda não foram capturados remotamente e exibirão um erro `missing object`."
+msgstr "Classifique com base na chave informada. O prefixo `-` é utilizado para classificar em ordem decrescente. Supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). A ordem de classificação `versão:refname` também pode ser afetada pela variável de configuração `versionsort.sufix`.  Para mais opções de classificação consulte linkgit:git-for-each-ref[1], porém esteja ciente que chaves como `committerdate` que requeiram acesso aos objetos em si não funcionarão com refs cujos objetos ainda não foram capturados remotamente e exibirão um erro `missing object`."
 
 #. type: Plain text
 #: en/git-ls-remote.txt:82
@@ -35915,23 +32690,33 @@ msgstr "Transmita a sequência especificada para o servidor ao se comunicar util
 #: en/git-ls-remote.txt:87
 #, priority:100
 msgid "The \"remote\" repository to query.  This parameter can be either a URL or the name of a remote (see the GIT URLS and REMOTES sections of linkgit:git-fetch[1])."
-msgstr ""
-"O repositório \"remoto\" que será consultado.  Este parâmetro pode ser uma "
-"URL ou o nome de um ramo remoto (consulte as seções URLs e REMOTOS do GIT no "
-"linkgit:git-fetch[1])."
+msgstr "O repositório \"remoto\" que será consultado.  Este parâmetro pode ser uma URL ou o nome de um ramo remoto (consulte as seções URLs e REMOTOS do GIT no linkgit:git-fetch[1])."
 
 #. type: Plain text
 #: en/git-ls-remote.txt:93
 #, ignore-ellipsis, priority:100
 msgid "When unspecified, all references, after filtering done with --heads and --tags, are shown.  When <refs>... are specified, only references matching the given patterns are displayed."
-msgstr ""
-"Quando não for utilizado, todas as referências, após a filtragem feita com "
-"`--heads` e `--tags`, são exibidas.  Quando as `<refs>...` é definido, "
-"apenas as referências que coincidam com os padrões informados são exibidas."
+msgstr "Quando não for utilizado, todas as referências, após a filtragem feita com `--heads` e `--tags`, são exibidas.  Quando as `<refs>...` é definido, apenas as referências que coincidam com os padrões informados são exibidas."
 
 #. type: delimited block -
 #: en/git-ls-remote.txt:113
-#, no-wrap, priority:100
+#, fuzzy, no-wrap, priority:100
+#| msgid ""
+#| "$ git ls-remote --tags ./.\n"
+#| "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+#| "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+#| "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
+#| "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+#| "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
+#| "$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+#| "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
+#| "c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+#| "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
+#| "$ git ls-remote --tags korg v\\*\n"
+#| "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
+#| "f25a265a342aed6041ab0cc484224d9ca54b6f41\trefs/tags/v0.99.1\n"
+#| "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
+#| "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 msgid ""
 "$ git ls-remote --tags ./.\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -35939,9 +32724,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -35992,42 +32777,26 @@ msgid ""
 "\t    <tree-ish> [<path>...]\n"
 msgstr ""
 "'git ls-tree' [-d] [-r] [-t] [-l] [-z]\n"
-"\t    [--name-only] [--name-status] [--full-name] [--full-tree] "
-"[--abbrev[=<n>]]\n"
+"\t    [--name-only] [--name-status] [--full-name] [--full-tree] [--abbrev[=<n>]]\n"
 "\t    <tree-ish> [<caminho>...]\n"
 
 #. type: Plain text
 #: en/git-ls-tree.txt:20
 #, priority:100
 msgid "Lists the contents of a given tree object, like what \"/bin/ls -a\" does in the current working directory.  Note that:"
-msgstr ""
-"Lista o conteúdo de um determinado objeto na árvore, como o que \"/bin/ls -"
-"a\" faz no diretório de trabalho atual.  Observe que:"
+msgstr "Lista o conteúdo de um determinado objeto na árvore, como o que \"/bin/ls -a\" faz no diretório de trabalho atual.  Observe que:"
 
 #. type: Plain text
 #: en/git-ls-tree.txt:25
 #, priority:100
 msgid "the behaviour is slightly different from that of \"/bin/ls\" in that the '<path>' denotes just a list of patterns to match, e.g. so specifying directory name (without `-r`) will behave differently, and order of the arguments does not matter."
-msgstr ""
-"o comportamento é um pouco diferente do \"/bin/ls\", pois o '<caminho>' "
-"indica apenas uma lista de padrões para serem coincididos, portanto, "
-"especificar o nome do diretório (sem `-r`) se comportará de maneira "
-"diferente e a ordem dos argumentos não importa."
+msgstr "o comportamento é um pouco diferente do \"/bin/ls\", pois o '<caminho>' indica apenas uma lista de padrões para serem coincididos, portanto, especificar o nome do diretório (sem `-r`) se comportará de maneira diferente e a ordem dos argumentos não importa."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:35
 #, priority:100
 msgid "the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is taken as relative to the current working directory.  E.g. when you are in a directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD dir' to list the contents of the tree (that is `sub/dir` in `HEAD`).  You don't want to give a tree that is not at the root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that would result in asking for `sub/sub/dir` in the `HEAD` commit.  However, the current working directory can be ignored by passing --full-tree option."
-msgstr ""
-"o comportamento é semelhante ao do \"/bin/ls\" onde o '<caminho>' é "
-"considerado como relativo ao diretório de trabalho atual.  Por exemplo, "
-"quando você está em um diretório 'sub' que possui um diretório 'dir', é "
-"possível executar o comando 'git ls-tree -r HEAD dir' para listar o conteúdo "
-"da árvore (que é `sub/dir` no `HEAD`).  Você quer informar uma árvore que "
-"não esteja no nível raiz (como por exemplo, `git ls-tree -r HEAD:sub dir`) "
-"neste caso, pois isso resultaria na solicitação do `sub/sub/dir` no commit "
-"`HEAD`.  No entanto, o diretório de trabalho atual pode ser ignorado "
-"passando a opção `--full-tree`."
+msgstr "o comportamento é semelhante ao do \"/bin/ls\" onde o '<caminho>' é considerado como relativo ao diretório de trabalho atual.  Por exemplo, quando você está em um diretório 'sub' que possui um diretório 'dir', é possível executar o comando 'git ls-tree -r HEAD dir' para listar o conteúdo da árvore (que é `sub/dir` no `HEAD`).  Você quer informar uma árvore que não esteja no nível raiz (como por exemplo, `git ls-tree -r HEAD:sub dir`) neste caso, pois isso resultaria na solicitação do `sub/sub/dir` no commit `HEAD`.  No entanto, o diretório de trabalho atual pode ser ignorado passando a opção `--full-tree`."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:40
@@ -36051,9 +32820,7 @@ msgstr "Recursar nas subárvores."
 #: en/git-ls-tree.txt:50
 #, priority:100
 msgid "Show tree entries even when going to recurse them. Has no effect if `-r` was not passed. `-d` implies `-t`."
-msgstr ""
-"Exiba as entradas da árvore mesmo quando for recursá-las. Não tem efeito "
-"caso `-r` não tenha sido passado. `-d` implica no uso da opção `-t`."
+msgstr "Exiba as entradas da árvore mesmo quando for recursá-las. Não tem efeito caso `-r` não tenha sido passado. `-d` implica no uso da opção `-t`."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:54
@@ -36065,32 +32832,25 @@ msgstr "Exibe o tamanho do objeto nas entradas da bolha (arquivo)."
 #: en/git-ls-tree.txt:58
 #, priority:100
 msgid "\\0 line termination on output and do not quote filenames.  See OUTPUT FORMAT below for more information."
-msgstr ""
-"A terminação \\0 da linha na saída e não cita os nomes dos arquivos.  "
-"Consulte FORMATO DE SAÍDA abaixo para obter mais informações."
+msgstr "A terminação \\0 da linha na saída e não cita os nomes dos arquivos.  Consulte FORMATO DE SAÍDA abaixo para obter mais informações."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:62
 #, priority:100
 msgid "List only filenames (instead of the \"long\" output), one per line."
-msgstr ""
-"Liste apenas os nomes dos arquivos (em vez da saída \"longa\"), um por linha."
+msgstr "Liste apenas os nomes dos arquivos (em vez da saída \"longa\"), um por linha."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:71
 #, priority:100
 msgid "Instead of showing the path names relative to the current working directory, show the full path names."
-msgstr ""
-"Em vez de mostrar os nomes dos caminhos relativos ao diretório de trabalho "
-"atual, mostre os nomes completos dos caminhos."
+msgstr "Em vez de mostrar os nomes dos caminhos relativos ao diretório de trabalho atual, mostre os nomes completos dos caminhos."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:75
 #, priority:100
 msgid "Do not limit the listing to the current working directory.  Implies --full-name."
-msgstr ""
-"Não limite a listagem ao diretório de trabalho atual.  Implica no uso da "
-"opção `--full-name`."
+msgstr "Não limite a listagem ao diretório de trabalho atual.  Implica no uso da opção `--full-name`."
 
 #. type: Labeled list
 #: en/git-ls-tree.txt:76
@@ -36102,11 +32862,7 @@ msgstr "[<caminho>...]"
 #: en/git-ls-tree.txt:80
 #, priority:100
 msgid "When paths are given, show them (note that this isn't really raw pathnames, but rather a list of patterns to match).  Otherwise implicitly uses the root level of the tree as the sole path argument."
-msgstr ""
-"Quando os caminhos forem informados, exiba-os (observe que estes nomes do "
-"caminho não são realmente brutos, porém uma lista de padrões que serão "
-"combinados).  Caso contrário, implicitamente utiliza o nível na raiz da "
-"árvore como o único argumento do caminho."
+msgstr "Quando os caminhos forem informados, exiba-os (observe que estes nomes do caminho não são realmente brutos, porém uma lista de padrões que serão combinados).  Caso contrário, implicitamente utiliza o nível na raiz da árvore como o único argumento do caminho."
 
 #. type: Title -
 #: en/git-ls-tree.txt:83
@@ -36124,9 +32880,7 @@ msgstr "        <mode> SP <tipo> SP <objeto> TAB <arquivo>\n"
 #: en/git-ls-tree.txt:88
 #, priority:100
 msgid "This output format is compatible with what `--index-info --stdin` of 'git update-index' expects."
-msgstr ""
-"Este formato gerado é compatível com o que a opção `--index-info --stdin` do "
-"comando 'git update-index' espera."
+msgstr "Este formato gerado é compatível com o que a opção `--index-info --stdin` do comando 'git update-index' espera."
 
 #. type: Plain text
 #: en/git-ls-tree.txt:90
@@ -36144,11 +32898,7 @@ msgstr "        <mode> SP <tipo> SP <objeto> SP <object size> TAB <arquivo>\n"
 #: en/git-ls-tree.txt:96
 #, priority:100
 msgid "Object size identified by <object> is given in bytes, and right-justified with minimum width of 7 characters.  Object size is given only for blobs (file) entries; for other entries `-` character is used in place of size."
-msgstr ""
-"O tamanho do objeto identificado por `<objeto>` é informado em bytes e "
-"justificado à direita com largura mínima de 7 caracteres.  O tamanho do "
-"objeto é informado apenas para as entradas das bolhas (arquivo); para as "
-"outras entradas, o caracter `-` é utilizado no lugar do tamanho."
+msgstr "O tamanho do objeto identificado por `<objeto>` é informado em bytes e justificado à direita com largura mínima de 7 caracteres.  O tamanho do objeto é informado apenas para as entradas das bolhas (arquivo); para as outras entradas, o caracter `-` é utilizado no lugar do tamanho."
 
 #. type: Title =
 #: en/git-mailinfo.txt:2
@@ -36160,16 +32910,13 @@ msgstr "git-mailinfo(1)"
 #: en/git-mailinfo.txt:7
 #, priority:100
 msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message"
-msgstr ""
-"git-mailinfo - Extrai o patch e a autoria de uma única mensagem de e-mail"
+msgstr "git-mailinfo - Extrai o patch e a autoria de uma única mensagem de e-mail"
 
 #. type: Plain text
 #: en/git-mailinfo.txt:13
 #, no-wrap, priority:100
 msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n"
-msgstr ""
-"'git mailinfo' [-k|-b] [-u | --encoding=<codificação> | -n] [--[no-]scissors]"
-" <msg> <patch>\n"
+msgstr "'git mailinfo' [-k|-b] [-u | --encoding=<codificação> | -n] [--[no-]scissors] <msg> <patch>\n"
 
 #. type: Plain text
 #: en/git-mailinfo.txt:23
@@ -36181,11 +32928,7 @@ msgstr "Lê uma única mensagem de email da entrada padrão, registra a mensagem
 #: en/git-mailinfo.txt:32
 #, priority:100
 msgid "Usually the program removes email cruft from the Subject: header line to extract the title line for the commit log message.  This option prevents this munging, and is most useful when used to read back 'git format-patch -k' output."
-msgstr ""
-"Normalmente, o programa remove a sujeira do cabeçalho do Assunto: do e-mail "
-"extraindo o título da linha da mensagem do registro log do commit.  Esta "
-"opção evita essa interrupção e tem mais utilidade quando utilizada para ler "
-"a saída do comando 'git format-patch -k'."
+msgstr "Normalmente, o programa remove a sujeira do cabeçalho do Assunto: do e-mail extraindo o título da linha da mensagem do registro log do commit.  Esta opção evita essa interrupção e tem mais utilidade quando utilizada para ler a saída do comando 'git format-patch -k'."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:34
@@ -36209,9 +32952,7 @@ msgstr "Iniciando com `Re:`, `re:`, e `:`."
 #: en/git-mailinfo.txt:41
 #, priority:100
 msgid "Leading bracketed strings (between `[` and `]`, usually"
-msgstr ""
-"As sequências dos caracteres entre colchetes à esquerda (entre `[` e `]`, "
-"geralmente"
+msgstr "As sequências dos caracteres entre colchetes à esquerda (entre `[` e `]`, geralmente"
 
 #. type: Plain text
 #: en/git-mailinfo.txt:42
@@ -36223,46 +32964,31 @@ msgstr "`[PATCH]`)."
 #: en/git-mailinfo.txt:46
 #, priority:100
 msgid "Finally, runs of whitespace are normalized to a single ASCII space character."
-msgstr ""
-"Finalmente, as execuções do espaço são normalizadas para um único caractere "
-"de espaço ASCII."
+msgstr "Finalmente, as execuções do espaço são normalizadas para um único caractere de espaço ASCII."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:51
 #, priority:100
 msgid "When -k is not in effect, all leading strings bracketed with '[' and ']' pairs are stripped.  This option limits the stripping to only the pairs whose bracketed string contains the word \"PATCH\"."
-msgstr ""
-"Quando -k não está em vigor, todas as cadeias iniciais entre parênteses com "
-"os pares '[' e ']' são removidos.  Esta opção limita a remoção apenas aos "
-"pares cuja cadeia entre os colchetes contenha a palavra \"PATCH\"."
+msgstr "Quando -k não está em vigor, todas as cadeias iniciais entre parênteses com os pares '[' e ']' são removidos.  Esta opção limita a remoção apenas aos pares cuja cadeia entre os colchetes contenha a palavra \"PATCH\"."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:58
 #, priority:100
 msgid "The commit log message, author name and author email are taken from the e-mail, and after minimally decoding MIME transfer encoding, re-coded in the charset specified by i18n.commitencoding (defaulting to UTF-8) by transliterating them.  This used to be optional but now it is the default."
-msgstr ""
-"A mensagem do registro log do commit, o nome do autor e seu e-mail são "
-"obtidos a partir do e-mail e após a decodificação mínima da codificação de "
-"transferência MIME, recodificados no conjunto de caracteres definido pela "
-"opção de configuração `i18n.commitencoding` (predefinido para UTF-8), "
-"transliterando-os.  Isto costumava ser opcional, agora é a predefinição."
+msgstr "A mensagem do registro log do commit, o nome do autor e seu e-mail são obtidos a partir do e-mail e após a decodificação mínima da codificação de transferência MIME, recodificados no conjunto de caracteres definido pela opção de configuração `i18n.commitencoding` (predefinido para UTF-8), transliterando-os.  Isto costumava ser opcional, agora é a predefinição."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:61
 #, priority:100
 msgid "Note that the patch is always used as-is without charset conversion, even with this flag."
-msgstr ""
-"Observe que o patch é sempre utilizado como está, sem conversão do 'charset' "
-"(definição dos caracteres), mesmo com esta opção."
+msgstr "Observe que o patch é sempre utilizado como está, sem conversão do 'charset' (definição dos caracteres), mesmo com esta opção."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:65
 #, priority:100
 msgid "Similar to -u.  But when re-coding, the charset specified here is used instead of the one specified by i18n.commitencoding or UTF-8."
-msgstr ""
-"Semelhante ao -u.  Porém, ao re-codificar, o conjunto dos caracteres "
-"informados aqui é utilizado em vez do informado pelo i18n.commitencoding ou "
-"o UTF-8."
+msgstr "Semelhante ao -u.  Porém, ao re-codificar, o conjunto dos caracteres informados aqui é utilizado em vez do informado pelo i18n.commitencoding ou o UTF-8."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:68
@@ -36274,47 +33000,31 @@ msgstr "Desative toda a re-codificação do \"charset\" dos metadados."
 #: en/git-mailinfo.txt:73
 #, priority:100
 msgid "Copy the Message-ID header at the end of the commit message.  This is useful in order to associate commits with mailing list discussions."
-msgstr ""
-"Copie o cabeçalho da ID da mensagem no final da mensagem do commit.  É útil "
-"para associar os commits a discussões nas listas de discussão."
+msgstr "Copie o cabeçalho da ID da mensagem no final da mensagem do commit.  É útil para associar os commits a discussões nas listas de discussão."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:82
 #, priority:100
 msgid "Remove everything in body before a scissors line.  A line that mainly consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") marks is called a scissors line, and is used to request the reader to cut the message at that line.  If such a line appears in the body of the message before the patch, everything before it (including the scissors line itself) is ignored when this option is used."
-msgstr ""
-"Remova tudo no corpo antes das marcações.  Uma linha que consiste "
-"principalmente das marcas (\">8\" ou \"8<\") e a perfuração (traço \"-\") é "
-"chamada de linha de grafo traçado, é utilizada para solicitar que o leitor "
-"corte a mensagem nesta linha.  Caso esta linha apareça no corpo da mensagem "
-"antes do patch, tudo o que estiver à frente (incluindo a própria linha) será "
-"ignorado quando essa opção for utilizada."
+msgstr "Remova tudo no corpo antes das marcações.  Uma linha que consiste principalmente das marcas (\">8\" ou \"8<\") e a perfuração (traço \"-\") é chamada de linha de grafo traçado, é utilizada para solicitar que o leitor corte a mensagem nesta linha.  Caso esta linha apareça no corpo da mensagem antes do patch, tudo o que estiver à frente (incluindo a própria linha) será ignorado quando essa opção for utilizada."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:87
 #, priority:100
 msgid "This is useful if you want to begin your message in a discussion thread with comments and suggestions on the message you are responding to, and to conclude it with a patch submission, separating the discussion and the beginning of the proposed commit log message with a scissors line."
-msgstr ""
-"É útil caso queira iniciar a sua mensagem em um tópico de discussão com "
-"comentários e sugestões sobre a mensagem que está respondendo e concluí-la "
-"com um envio do patch, separando a discussão e o início da mensagem do "
-"registro log do commit proposta com uma linha de grafo traçado."
+msgstr "É útil caso queira iniciar a sua mensagem em um tópico de discussão com comentários e sugestões sobre a mensagem que está respondendo e concluí-la com um envio do patch, separando a discussão e o início da mensagem do registro log do commit proposta com uma linha de grafo traçado."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:89
 #, priority:100
 msgid "This can be enabled by default with the configuration option mailinfo.scissors."
-msgstr ""
-"É possível que seja predefinidamente ativada com a opção de configuração "
-"mailinfo.scissors."
+msgstr "É possível que seja predefinidamente ativada com a opção de configuração mailinfo.scissors."
 
 #. type: Plain text
 #: en/git-mailinfo.txt:92
 #, priority:100
 msgid "Ignore scissors lines. Useful for overriding mailinfo.scissors settings."
-msgstr ""
-"Ignore as linhas de grafo traçado. Útil para substituir as configurações de "
-"mailinfo.scissors."
+msgstr "Ignore as linhas de grafo traçado. Útil para substituir as configurações de mailinfo.scissors."
 
 #. type: Labeled list
 #: en/git-mailinfo.txt:93
@@ -36326,9 +33036,7 @@ msgstr "<msg>"
 #: en/git-mailinfo.txt:96
 #, priority:100
 msgid "The commit log message extracted from e-mail, usually except the title line which comes from e-mail Subject."
-msgstr ""
-"Geralmente a mensagem do registro log do commit extraída do e-mail, exceto "
-"quando a linha do título que vem do Assunto do email."
+msgstr "Geralmente a mensagem do registro log do commit extraída do e-mail, exceto quando a linha do título que vem do Assunto do email."
 
 #. type: Labeled list
 #: en/git-mailinfo.txt:97
@@ -36368,18 +33076,13 @@ msgstr ""
 #: en/git-mailsplit.txt:18
 #, priority:100
 msgid "Splits a mbox file or a Maildir into a list of files: \"0001\" \"0002\" ..  in the specified directory so you can process them further from there."
-msgstr ""
-"Divide um arquivo 'mbox' ou um 'Maildir' em uma lista de arquivos: \"0001\" "
-"\"0002\" ..  no diretório informado para que você possa processá-los ainda "
-"mais a partir daí."
+msgstr "Divide um arquivo 'mbox' ou um 'Maildir' em uma lista de arquivos: \"0001\" \"0002\" ..  no diretório informado para que você possa processá-los ainda mais a partir daí."
 
 #. type: Plain text
 #: en/git-mailsplit.txt:21
 #, priority:100
 msgid "Maildir splitting relies upon filenames being sorted to output patches in the correct order."
-msgstr ""
-"A divisão do Maildir depende da classificação dos nomes dos arquivos para "
-"produzir os patches na ordem correta."
+msgstr "A divisão do Maildir depende da classificação dos nomes dos arquivos para produzir os patches na ordem correta."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:24
@@ -36391,9 +33094,7 @@ msgstr "<mbox>"
 #: en/git-mailsplit.txt:27
 #, priority:100
 msgid "Mbox file to split.  If not given, the mbox is read from the standard input."
-msgstr ""
-"O arquivo Mbox para ser dividido.  Se não for informada, a mbox é lida na "
-"entrada padrão."
+msgstr "O arquivo Mbox para ser dividido.  Se não for informada, a mbox é lida na entrada padrão."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:28
@@ -36405,9 +33106,7 @@ msgstr "<Maildir>"
 #: en/git-mailsplit.txt:31
 #, priority:100
 msgid "Root of the Maildir to split. This directory should contain the cur, tmp and new subdirectories."
-msgstr ""
-"Raiz do Maildir que será dividida. Este diretório deve conter os "
-"subdiretórios `cur`, `tmp` e `new`."
+msgstr "Raiz do Maildir que será dividida. Este diretório deve conter os subdiretórios `cur`, `tmp` e `new`."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:32
@@ -36425,9 +33124,7 @@ msgstr "O diretório onde colocar as mensagens individuais."
 #: en/git-mailsplit.txt:38
 #, priority:100
 msgid "If any file doesn't begin with a From line, assume it is a single mail message instead of signaling error."
-msgstr ""
-"Caso algum arquivo não comece com uma linha \"De\", suponha que seja uma "
-"única mensagem de e-mail em vez de sinalizar um erro."
+msgstr "Caso algum arquivo não comece com uma linha \"De\", suponha que seja uma única mensagem de e-mail em vez de sinalizar um erro."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:39
@@ -36439,9 +33136,7 @@ msgstr "-d<prec>"
 #: en/git-mailsplit.txt:43
 #, priority:100
 msgid "Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames."
-msgstr ""
-"Em vez dos 4 dígitos predefinidos com zeros à esquerda, uma precisão "
-"diferente pode ser definida para os nomes dos arquivos gerados."
+msgstr "Em vez dos 4 dígitos predefinidos com zeros à esquerda, uma precisão diferente pode ser definida para os nomes dos arquivos gerados."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:44
@@ -36453,9 +33148,7 @@ msgstr "-f<nn>"
 #: en/git-mailsplit.txt:47
 #, priority:100
 msgid "Skip the first <nn> numbers, for example if -f3 is specified, start the numbering with 0004."
-msgstr ""
-"Pule os primeiros números <nn>, caso -f3 seja utilizado, inicie a numeração "
-"com 0004 por exemplo."
+msgstr "Pule os primeiros números <nn>, caso -f3 seja utilizado, inicie a numeração com 0004 por exemplo."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:48
@@ -36467,9 +33160,7 @@ msgstr "--keep-cr"
 #: en/git-mailsplit.txt:50
 #, priority:100
 msgid "Do not remove `\\r` from lines ending with `\\r\\n`."
-msgstr ""
-"Não remova os `\\r` das linhas que terminam com `\\r\\n"
-"`."
+msgstr "Não remova os `\\r` das linhas que terminam com `\\r\\n`."
 
 #. type: Labeled list
 #: en/git-mailsplit.txt:51
@@ -36481,9 +33172,7 @@ msgstr "--mboxrd"
 #: en/git-mailsplit.txt:54
 #, priority:100
 msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
-msgstr ""
-"A entrada utiliza o formato \"mboxrd\" e a quebra da linha \"^>+From \" é "
-"revertida."
+msgstr "A entrada utiliza o formato \"mboxrd\" e a quebra da linha \"^>+From \" é revertida."
 
 #. type: Title =
 #: en/git-merge-base.txt:2
@@ -36495,9 +33184,7 @@ msgstr "git-merge-base(1)"
 #: en/git-merge-base.txt:7
 #, priority:100
 msgid "git-merge-base - Find as good common ancestors as possible for a merge"
-msgstr ""
-"git-merge-base - Encontre o melhor ancestral comum possível para uma "
-"mesclagem"
+msgstr "git-merge-base - Encontre o melhor ancestral comum possível para uma mesclagem"
 
 #. type: Plain text
 #: en/git-merge-base.txt:17
@@ -36519,14 +33206,7 @@ msgstr ""
 #: en/git-merge-base.txt:27
 #, priority:100
 msgid "'git merge-base' finds best common ancestor(s) between two commits to use in a three-way merge.  One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former.  A common ancestor that does not have any better common ancestor is a 'best common ancestor', i.e. a 'merge base'.  Note that there can be more than one merge base for a pair of commits."
-msgstr ""
-"O comando 'git merge-base' encontra os melhores ancestrais comuns entre dois "
-"commits para utiliza-lo em uma mesclagem de três vias.  Um ancestral comum é "
-"'melhor' que um outro ancestral comum caso o último seja um ancestral do "
-"primeiro.  Um ancestral comum que não possua um melhor ancestral comum, será "
-"o 'melhor ancestral comum', ou seja, será uma 'base para a mesclagem'.  "
-"Observe que pode haver mais de uma base para mesclagem para um par de "
-"commits."
+msgstr "O comando 'git merge-base' encontra os melhores ancestrais comuns entre dois commits para utiliza-lo em uma mesclagem de três vias.  Um ancestral comum é 'melhor' que um outro ancestral comum caso o último seja um ancestral do primeiro.  Um ancestral comum que não possua um melhor ancestral comum, será o 'melhor ancestral comum', ou seja, será uma 'base para a mesclagem'.  Observe que pode haver mais de uma base para mesclagem para um par de commits."
 
 #. type: Title -
 #: en/git-merge-base.txt:29
@@ -36538,30 +33218,19 @@ msgstr "MODOS DE OPERAÇÃO"
 #: en/git-merge-base.txt:33
 #, priority:100
 msgid "As the most common special case, specifying only two commits on the command line means computing the merge base between the given two commits."
-msgstr ""
-"Como o caso especial mais comum, utilizar apenas dois commits na linha de "
-"comando significa calcular a base de mesclagem entre os dois commits "
-"informados."
+msgstr "Como o caso especial mais comum, utilizar apenas dois commits na linha de comando significa calcular a base de mesclagem entre os dois commits informados."
 
 #. type: Plain text
 #: en/git-merge-base.txt:38
 #, priority:100
 msgid "More generally, among the two commits to compute the merge base from, one is specified by the first commit argument on the command line; the other commit is a (possibly hypothetical) commit that is a merge across all the remaining commits on the command line."
-msgstr ""
-"De maneira mais geral, entre os dois commits para fazer cálculo na base de "
-"mesclagem, um é definido pelo primeiro argumento do commit na linha de "
-"comando; o outro commit é um commit (possivelmente hipotético) que é uma "
-"mesclagem entre todos os demais commits na linha de comando."
+msgstr "De maneira mais geral, entre os dois commits para fazer cálculo na base de mesclagem, um é definido pelo primeiro argumento do commit na linha de comando; o outro commit é um commit (possivelmente hipotético) que é uma mesclagem entre todos os demais commits na linha de comando."
 
 #. type: Plain text
 #: en/git-merge-base.txt:42
 #, priority:100
 msgid "As a consequence, the 'merge base' is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different from linkgit:git-show-branch[1] when used with the `--merge-base` option."
-msgstr ""
-"Como consequência, o 'merge base' (a base da mesclagem) não está "
-"necessariamente contida em cada uma das opções do commit caso mais de dois "
-"commits forem informadas. Isso é diferente do linkgit:git-show-branch[1] "
-"quando utilizado com a opção `--merge-base`."
+msgstr "Como consequência, o 'merge base' (a base da mesclagem) não está necessariamente contida em cada uma das opções do commit caso mais de dois commits forem informadas. Isso é diferente do linkgit:git-show-branch[1] quando utilizado com a opção `--merge-base`."
 
 #. type: Labeled list
 #: en/git-merge-base.txt:43
@@ -36573,10 +33242,7 @@ msgstr "--octopus"
 #: en/git-merge-base.txt:47
 #, priority:100
 msgid "Compute the best common ancestors of all supplied commits, in preparation for an n-way merge.  This mimics the behavior of 'git show-branch --merge-base'."
-msgstr ""
-"Calcule os melhores ancestrais comuns de todos commits informados, em "
-"preparação para uma mesclagem \"n-way\".  Imita o comportamento do comando "
-"'git show-branch --merge-base'."
+msgstr "Calcule os melhores ancestrais comuns de todos commits informados, em preparação para uma mesclagem \"n-way\".  Imita o comportamento do comando 'git show-branch --merge-base'."
 
 #. type: Labeled list
 #: en/git-merge-base.txt:48 en/git-show-branch.txt:90
@@ -36588,11 +33254,7 @@ msgstr "--independent"
 #: en/git-merge-base.txt:54
 #, priority:100
 msgid "Instead of printing merge bases, print a minimal subset of the supplied commits with the same ancestors.  In other words, among the commits given, list those which cannot be reached from any other.  This mimics the behavior of 'git show-branch --independent'."
-msgstr ""
-"Em vez de exibir as bases de mesclagem, exiba um subconjunto mínimo dos "
-"commits informados com os mesmos ancestrais.  Em outras palavras, entre os "
-"commits informados, liste aqueles que não podem ser alcançados por nenhum "
-"outro.  Imita o comportamento do comando 'git show-branch --independent'."
+msgstr "Em vez de exibir as bases de mesclagem, exiba um subconjunto mínimo dos commits informados com os mesmos ancestrais.  Em outras palavras, entre os commits informados, liste aqueles que não podem ser alcançados por nenhum outro.  Imita o comportamento do comando 'git show-branch --independent'."
 
 #. type: Labeled list
 #: en/git-merge-base.txt:55
@@ -36604,11 +33266,7 @@ msgstr "--is-ancestor"
 #: en/git-merge-base.txt:59
 #, priority:100
 msgid "Check if the first <commit> is an ancestor of the second <commit>, and exit with status 0 if true, or with status 1 if not.  Errors are signaled by a non-zero status that is not 1."
-msgstr ""
-"Verifique se o primeiro <commit> é um ancestral do segundo <commit> e "
-"encerre com a condição 0, se for verdadeiro, ou com a condição 1 se não "
-"for.  Os erros são sinalizados através de uma condição diferente de zero que "
-"não seja 1."
+msgstr "Verifique se o primeiro <commit> é um ancestral do segundo <commit> e encerre com a condição 0, se for verdadeiro, ou com a condição 1 se não for.  Os erros são sinalizados através de uma condição diferente de zero que não seja 1."
 
 #. type: Labeled list
 #: en/git-merge-base.txt:60 en/git-rebase.txt:440
@@ -36620,13 +33278,7 @@ msgstr "--fork-point"
 #: en/git-merge-base.txt:68
 #, priority:100
 msgid "Find the point at which a branch (or any history that leads to <commit>) forked from another branch (or any reference)  <ref>. This does not just look for the common ancestor of the two commits, but also takes into account the reflog of <ref> to see if the history leading to <commit> forked from an earlier incarnation of the branch <ref> (see discussion on this mode below)."
-msgstr ""
-"Encontre o ponto onde uma ramificação (ou qualquer histórico que leve ao "
-"<commit>) bifurque-se da outra ramificação (ou qualquer outra referência) "
-"<ref>. Isso não procura apenas pelo ancestral comum dos dois commits, mas "
-"também leva em consideração o reflog de <ref> para ver se o histórico que "
-"levou ao <commit> bifurcou-se de uma encarnação anterior do ramo <ref> ("
-"consulte a discussão sobre este modo abaixo)."
+msgstr "Encontre o ponto onde uma ramificação (ou qualquer histórico que leve ao <commit>) bifurque-se da outra ramificação (ou qualquer outra referência) <ref>. Isso não procura apenas pelo ancestral comum dos dois commits, mas também leva em consideração o reflog de <ref> para ver se o histórico que levou ao <commit> bifurcou-se de uma encarnação anterior do ramo <ref> (consulte a discussão sobre este modo abaixo)."
 
 #. type: Plain text
 #: en/git-merge-base.txt:74
@@ -36638,10 +33290,7 @@ msgstr "Gere todas as bases da mesclagem para os commits em vez de apenas um."
 #: en/git-merge-base.txt:80
 #, priority:100
 msgid "Given two commits 'A' and 'B', `git merge-base A B` will output a commit which is reachable from both 'A' and 'B' through the parent relationship."
-msgstr ""
-"Dado dois commits 'A' e 'B', o `git merge-base A B` produzirá um commit que "
-"pode ser acessado a partir de 'A' e 'B' através do relacionamento com a "
-"origem."
+msgstr "Dado dois commits 'A' e 'B', o `git merge-base A B` produzirá um commit que pode ser acessado a partir de 'A' e 'B' através do relacionamento com a origem."
 
 #. type: Plain text
 #: en/git-merge-base.txt:82
@@ -36693,9 +33342,7 @@ msgstr ""
 #: en/git-merge-base.txt:105
 #, priority:100
 msgid "the result of `git merge-base A B C` is '1'.  This is because the equivalent topology with a merge commit 'M' between 'B' and 'C' is:"
-msgstr ""
-"o resultado do `git merge-base A B C` é '1'.  Isso ocorre porque a topologia "
-"equivalente com uma consolidação de mesclagem 'M' entre 'B' e 'C' é:"
+msgstr "o resultado do `git merge-base A B C` é '1'.  Isso ocorre porque a topologia equivalente com uma consolidação de mesclagem 'M' entre 'B' e 'C' é:"
 
 #. type: delimited block .
 #: en/git-merge-base.txt:113
@@ -36717,18 +33364,13 @@ msgstr ""
 #: en/git-merge-base.txt:118
 #, priority:100
 msgid "and the result of `git merge-base A M` is '1'.  Commit '2' is also a common ancestor between 'A' and 'M', but '1' is a better common ancestor, because '2' is an ancestor of '1'.  Hence, '2' is not a merge base."
-msgstr ""
-"e o resultado do `git merge-base A M` é '1'.  O commit '2' também é um "
-"ancestral comum entre 'A' e 'M', porém '1' é um melhor ancestral comum, "
-"porque '2' é um ancestral de '1'.  Portanto, '2' não é uma base de mesclagem."
+msgstr "e o resultado do `git merge-base A M` é '1'.  O commit '2' também é um ancestral comum entre 'A' e 'M', porém '1' é um melhor ancestral comum, porque '2' é um ancestral de '1'.  Portanto, '2' não é uma base de mesclagem."
 
 #. type: Plain text
 #: en/git-merge-base.txt:121
 #, priority:100
 msgid "The result of `git merge-base --octopus A B C` is '2', because '2' is the best common ancestor of all commits."
-msgstr ""
-"O resultado do `git merge-base --octopus A B C` é '2', porque '2' é o melhor "
-"ancestral comum de todos os commits."
+msgstr "O resultado do `git merge-base --octopus A B C` é '2', porque '2' é o melhor ancestral comum de todos os commits."
 
 #. type: Plain text
 #: en/git-merge-base.txt:124
@@ -36756,21 +33398,13 @@ msgstr ""
 #: en/git-merge-base.txt:136
 #, priority:100
 msgid "both '1' and '2' are merge-bases of A and B.  Neither one is better than the other (both are 'best' merge bases).  When the `--all` option is not given, it is unspecified which best one is output."
-msgstr ""
-"ambos os '1' e '2' são bases de mesclagem de A e B. Nenhum é melhor que o "
-"outro (ambos são 'melhores' bases de mesclagem).  Quando a opção `--all` não "
-"é utilizado, não da para saber qual é a melhor saída."
+msgstr "ambos os '1' e '2' são bases de mesclagem de A e B. Nenhum é melhor que o outro (ambos são 'melhores' bases de mesclagem).  Quando a opção `--all` não é utilizado, não da para saber qual é a melhor saída."
 
 #. type: Plain text
 #: en/git-merge-base.txt:141
 #, priority:100
 msgid "A common idiom to check \"fast-forward-ness\" between two commits A and B is (or at least used to be) to compute the merge base between A and B, and check if it is the same as A, in which case, A is an ancestor of B.  You will see this idiom used often in older scripts."
-msgstr ""
-"Um idioma comum para verificar o \"avanço rápido\" entre os dois commits 'A' "
-"e 'B' seja (ou pelo menos costumava ser) calcular a base da mesclagem entre "
-"'A' e 'B' e verificar se é o mesmo que 'A'; nesse caso, 'A' é um ancestral "
-"de 'B'. Você verá este idioma utilizado frequentemente com scripts mais "
-"antigos."
+msgstr "Um idioma comum para verificar o \"avanço rápido\" entre os dois commits 'A' e 'B' seja (ou pelo menos costumava ser) calcular a base da mesclagem entre 'A' e 'B' e verificar se é o mesmo que 'A'; nesse caso, 'A' é um ancestral de 'B'. Você verá este idioma utilizado frequentemente com scripts mais antigos."
 
 #. type: delimited block .
 #: en/git-merge-base.txt:148
@@ -36824,11 +33458,7 @@ msgstr "Discussão sobre o modo do ponto de forquilha"
 #: en/git-merge-base.txt:168
 #, priority:100
 msgid "After working on the `topic` branch created with `git switch -c topic origin/master`, the history of remote-tracking branch `origin/master` may have been rewound and rebuilt, leading to a history of this shape:"
-msgstr ""
-"Depois de trabalhar no ramo `topic` criado com o comando `git switch -c "
-"topic origin/master`, o histórico do ramo monitorado remotamente `origin/"
-"master` pode ter sido retrocedido e reconstruído, levando a um histórico "
-"desta forma:"
+msgstr "Depois de trabalhar no ramo `topic` criado com o comando `git switch -c topic origin/master`, o histórico do ramo monitorado remotamente `origin/master` pode ter sido retrocedido e reconstruído, levando a um histórico desta forma:"
 
 #. type: delimited block .
 #: en/git-merge-base.txt:177
@@ -36854,35 +33484,19 @@ msgstr ""
 #: en/git-merge-base.txt:184
 #, priority:100
 msgid "where `origin/master` used to point at commits B0, B1, B2 and now it points at B, and your `topic` branch was started on top of it back when `origin/master` was at B0, and you built three commits, D0, D1, and D, on top of it.  Imagine that you now want to rebase the work you did on the topic on top of the updated origin/master."
-msgstr ""
-"onde `origin/master` costumava apontar para os commits 'B0', 'B1', 'B2' e "
-"agora aponta para 'B', e o seu ramo `topic` foi iniciada sobre ela quando `"
-"origin/master` estava em 'B0' e você construiu três commits, 'D0', 'D1' e "
-"'D' em cima dele.  Imagine que agora você quer refazer o trabalho realizado "
-"no tópico sobre o `origin/master` atualizado."
+msgstr "onde `origin/master` costumava apontar para os commits 'B0', 'B1', 'B2' e agora aponta para 'B', e o seu ramo `topic` foi iniciada sobre ela quando `origin/master` estava em 'B0' e você construiu três commits, 'D0', 'D1' e 'D' em cima dele.  Imagine que agora você quer refazer o trabalho realizado no tópico sobre o `origin/master` atualizado."
 
 #. type: Plain text
 #: en/git-merge-base.txt:190
 #, priority:100
 msgid "In such a case, `git merge-base origin/master topic` would return the parent of B0 in the above picture, but B0^..D is *not* the range of commits you would want to replay on top of B (it includes B0, which is not what you wrote; it is a commit the other side discarded when it moved its tip from B0 to B1)."
-msgstr ""
-"Nesse caso o comando `git merge-base origin/master topic' retornaria a "
-"inicial do 'B0' na imagem acima, porém 'B0^..D' *não é* o intervalo dos "
-"commits que você deseja reproduzir em cima do 'B' ( inclui 'B0', que não é o "
-"que você escreveu; é um commit que o outro lado descartou quando mudou o seu "
-"cume de 'B0' para 'B1')."
+msgstr "Nesse caso o comando `git merge-base origin/master topic' retornaria a inicial do 'B0' na imagem acima, porém 'B0^..D' *não é* o intervalo dos commits que você deseja reproduzir em cima do 'B' ( inclui 'B0', que não é o que você escreveu; é um commit que o outro lado descartou quando mudou o seu cume de 'B0' para 'B1')."
 
 #. type: Plain text
 #: en/git-merge-base.txt:198
 #, priority:100
 msgid "`git merge-base --fork-point origin/master topic` is designed to help in such a case.  It takes not only B but also B0, B1, and B2 (i.e. old tips of the remote-tracking branches your repository's reflog knows about) into account to see on which commit your topic branch was built and finds B0, allowing you to replay only the commits on your topic, excluding the commits the other side later discarded."
-msgstr ""
-"O comando `git merge-base --fork-point origin/master topic` foi projetado "
-"para ajudar nesse caso.  Ele leva não apenas B, mas também B0, B1 e B2 (ou "
-"seja, dicas antigas do monitoramento dos ramos remotos onde o seu reflog "
-"conhece) para ver em qual commit o tópico do seu ramo foi construído e "
-"encontra o B0, permitindo a reprodução de apenas os commits no seu tópico, "
-"excluindo os commits que o outro lado descartou posteriormente."
+msgstr "O comando `git merge-base --fork-point origin/master topic` foi projetado para ajudar nesse caso.  Ele leva não apenas B, mas também B0, B1 e B2 (ou seja, dicas antigas do monitoramento dos ramos remotos onde o seu reflog conhece) para ver em qual commit o tópico do seu ramo foi construído e encontra o B0, permitindo a reprodução de apenas os commits no seu tópico, excluindo os commits que o outro lado descartou posteriormente."
 
 #. type: Plain text
 #: en/git-merge-base.txt:200
@@ -36912,9 +33526,7 @@ msgstr "    $ git rebase --onto origin/master $fork_point topic\n"
 #: en/git-merge-base.txt:209
 #, priority:100
 msgid "will replay D0, D1 and D on top of B to create a new history of this shape:"
-msgstr ""
-"repetirá 'D0', 'D1' e 'D' em cima do 'B' para criar um novo histórico dessa "
-"forma:"
+msgstr "repetirá 'D0', 'D1' e 'D' em cima do 'B' para criar um novo histórico dessa forma:"
 
 #. type: delimited block .
 #: en/git-merge-base.txt:218
@@ -36940,29 +33552,13 @@ msgstr ""
 #: en/git-merge-base.txt:226
 #, priority:100
 msgid "A caveat is that older reflog entries in your repository may be expired by `git gc`.  If B0 no longer appears in the reflog of the remote-tracking branch `origin/master`, the `--fork-point` mode obviously cannot find it and fails, avoiding to give a random and useless result (such as the parent of B0, like the same command without the `--fork-point` option gives)."
-msgstr ""
-"Uma ressalva é que as entradas antigas do reflog no seu repositório podem "
-"ser reveladas através do comando `git gc`.  Caso 'B0' não apareça mais no "
-"reflog do ramo monitorado remotamente `origin/master`, o modo `--fork-point` "
-"obviamente não poderá encontrá-lo e irá falhar evitando dar um resultado "
-"aleatório e inútil (como a inicial do 'B0', como o mesmo comando sem a opção "
-"`--fork-point` oferece)."
+msgstr "Uma ressalva é que as entradas antigas do reflog no seu repositório podem ser reveladas através do comando `git gc`.  Caso 'B0' não apareça mais no reflog do ramo monitorado remotamente `origin/master`, o modo `--fork-point` obviamente não poderá encontrá-lo e irá falhar evitando dar um resultado aleatório e inútil (como a inicial do 'B0', como o mesmo comando sem a opção `--fork-point` oferece)."
 
 #. type: Plain text
 #: en/git-merge-base.txt:237
 #, priority:100
 msgid "Also, the remote-tracking branch you use the `--fork-point` mode with must be the one your topic forked from its tip.  If you forked from an older commit than the tip, this mode would not find the fork point (imagine in the above sample history B0 did not exist, origin/master started at B1, moved to B2 and then B, and you forked your topic at origin/master^ when origin/master was B1; the shape of the history would be the same as above, without B0, and the parent of B1 is what `git merge-base origin/master topic` correctly finds, but the `--fork-point` mode will not, because it is not one of the commits that used to be at the tip of origin/master)."
-msgstr ""
-"Além disso, o ramo monitorado remotamente com o qual você utiliza o modo "
-"`--fork-point` deve ser aquele onde seu tópico foi extraído.  Caso você "
-"bifurque a partir de um commit mais antigo que o cume, este modo não "
-"encontrou o ponto de bifurcação (imagine no histórico de amostra acima do "
-"'B0' não exista, o `origin/master` iniciado com 'B1', movido para o 'B2' e "
-"depois 'B', você bifurcou o seu tópico na `origin/master^` quando a `origin/"
-"master` era o 'B1'; o formato do histórico seria o mesmo que o acima, sem o "
-"'B0', e a inicial do 'B1' é o que o `git merge-base origin/master topic` "
-"encontra corretamente, porém o modo `--fork-point` não será, porque não é um "
-"dos commits que costumava estar no cume de `origin/master`)."
+msgstr "Além disso, o ramo monitorado remotamente com o qual você utiliza o modo `--fork-point` deve ser aquele onde seu tópico foi extraído.  Caso você bifurque a partir de um commit mais antigo que o cume, este modo não encontrou o ponto de bifurcação (imagine no histórico de amostra acima do 'B0' não exista, o `origin/master` iniciado com 'B1', movido para o 'B2' e depois 'B', você bifurcou o seu tópico na `origin/master^` quando a `origin/master` era o 'B1'; o formato do histórico seria o mesmo que o acima, sem o 'B0', e a inicial do 'B1' é o que o `git merge-base origin/master topic` encontra corretamente, porém o modo `--fork-point` não será, porque não é um dos commits que costumava estar no cume de `origin/master`)."
 
 #. type: Title -
 #: en/git-merge-base.txt:240
@@ -37004,25 +33600,13 @@ msgstr ""
 #: en/git-merge-file.txt:25
 #, priority:100
 msgid "'git merge-file' incorporates all changes that lead from the `<base-file>` to `<other-file>` into `<current-file>`. The result ordinarily goes into `<current-file>`. 'git merge-file' is useful for combining separate changes to an original. Suppose `<base-file>` is the original, and both `<current-file>` and `<other-file>` are modifications of `<base-file>`, then 'git merge-file' combines both changes."
-msgstr ""
-"O comando 'git merge-file' incorpora todas as alterações que levam de "
-"`<arquivo-base>` para `<outro-arquivo>` no `<arquivo-atual>`. O resultado "
-"normalmente é inserido no `<arquivo-atual>`. O comando 'git merge-file' é "
-"útil para combinar as alterações separadas em um original. Suponha que "
-"`<arquivo-base>` seja o original e ambos os `<arquivo-atual>` e `<outro-"
-"arquivo>` sejam alterações do `<arquivo-base>`, então o comando 'git merge-"
-"file' faz a combinação das duas alterações ."
+msgstr "O comando 'git merge-file' incorpora todas as alterações que levam de `<arquivo-base>` para `<outro-arquivo>` no `<arquivo-atual>`. O resultado normalmente é inserido no `<arquivo-atual>`. O comando 'git merge-file' é útil para combinar as alterações separadas em um original. Suponha que `<arquivo-base>` seja o original e ambos os `<arquivo-atual>` e `<outro-arquivo>` sejam alterações do `<arquivo-base>`, então o comando 'git merge-file' faz a combinação das duas alterações ."
 
 #. type: Plain text
 #: en/git-merge-file.txt:30
 #, priority:100
 msgid "A conflict occurs if both `<current-file>` and `<other-file>` have changes in a common segment of lines. If a conflict is found, 'git merge-file' normally outputs a warning and brackets the conflict with lines containing <<<<<<< and >>>>>>> markers. A typical conflict will look like this:"
-msgstr ""
-"Ocorre um conflito se ambos `<arquivo-atual>`e o `<outro-arquivo>` tiver "
-"alterações em um segmento comum das linhas. Caso um conflito seja "
-"encontrado, o comando 'git merge-file' normalmente gera um aviso e coloca o "
-"conflito entre as linhas que contêm os marcadores '<<<<<<<' e '>>>>>>>'. Um "
-"conflito típico ficaria assim:"
+msgstr "Ocorre um conflito se ambos `<arquivo-atual>`e o `<outro-arquivo>` tiver alterações em um segmento comum das linhas. Caso um conflito seja encontrado, o comando 'git merge-file' normalmente gera um aviso e coloca o conflito entre as linhas que contêm os marcadores '<<<<<<<' e '>>>>>>>'. Um conflito típico ficaria assim:"
 
 #. type: Plain text
 #: en/git-merge-file.txt:36
@@ -37044,31 +33628,19 @@ msgstr ""
 #: en/git-merge-file.txt:42
 #, priority:100
 msgid "If there are conflicts, the user should edit the result and delete one of the alternatives.  When `--ours`, `--theirs`, or `--union` option is in effect, however, these conflicts are resolved favouring lines from `<current-file>`, lines from `<other-file>`, or lines from both respectively.  The length of the conflict markers can be given with the `--marker-size` option."
-msgstr ""
-"Caso haja conflitos, o usuário deve editar o resultado e excluir uma das "
-"alternativas.  Quando a opção `--ours` (nosso), `--theirs` (deles) ou "
-"`--union` (união) está em vigor e no entanto, estes conflitos são resolvidos "
-"favorecendo as linhas vindas do `<arquivo-atual> `, as linhas vindas do "
-"`<outro-arquivo>` ou as linhas de ambos, respectivamente.  O comprimento dos "
-"marcadores de conflito pode ser definidos através da opção `--marker-size`."
+msgstr "Caso haja conflitos, o usuário deve editar o resultado e excluir uma das alternativas.  Quando a opção `--ours` (nosso), `--theirs` (deles) ou `--union` (união) está em vigor e no entanto, estes conflitos são resolvidos favorecendo as linhas vindas do `<arquivo-atual> `, as linhas vindas do `<outro-arquivo>` ou as linhas de ambos, respectivamente.  O comprimento dos marcadores de conflito pode ser definidos através da opção `--marker-size`."
 
 #. type: Plain text
 #: en/git-merge-file.txt:46
 #, priority:100
 msgid "The exit value of this program is negative on error, and the number of conflicts otherwise (truncated to 127 if there are more than that many conflicts). If the merge was clean, the exit value is 0."
-msgstr ""
-"O valor na saída deste programa é negativo caso ocorra um erro, se não o "
-"número de conflito (truncado para 127 caso haja mais que muitos conflitos). "
-"Caso a mesclagem esteja limpa, o valor na saída será 0."
+msgstr "O valor na saída deste programa é negativo caso ocorra um erro, se não o número de conflito (truncado para 127 caso haja mais que muitos conflitos). Caso a mesclagem esteja limpa, o valor na saída será 0."
 
 #. type: Plain text
 #: en/git-merge-file.txt:50
 #, priority:100
 msgid "'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it implements all of RCS 'merge''s functionality which is needed by linkgit:git[1]."
-msgstr ""
-"O comando 'git merge-file' foi projetado para ser um clone reduzido do RCS "
-"'merge'; isto é, implementa toda a funcionalidade de 'mesclagem' do RCS, "
-"necessária ao linkgit:git[1]."
+msgstr "O comando 'git merge-file' foi projetado para ser um clone reduzido do RCS 'merge'; isto é, implementa toda a funcionalidade de 'mesclagem' do RCS, necessária ao linkgit:git[1]."
 
 #. type: Labeled list
 #: en/git-merge-file.txt:55
@@ -37080,20 +33652,13 @@ msgstr "-L <rótulo>"
 #: en/git-merge-file.txt:62
 #, priority:100
 msgid "This option may be given up to three times, and specifies labels to be used in place of the corresponding file names in conflict reports. That is, `git merge-file -L x -L y -L z a b c` generates output that looks like it came from files x, y and z instead of from files a, b and c."
-msgstr ""
-"Essa opção pode ser utilizada até três vezes e define os rótulos para serem "
-"utilizados em vez dos nomes dos arquivos correspondentes nos relatórios de "
-"conflito. Ou seja, `git merge-file -L x -L y -L z a b c` gera uma saída onde "
-"parece que veio dos arquivos 'x', 'y' e 'z' em vez dos arquivos 'a', 'b' e "
-"'c'."
+msgstr "Essa opção pode ser utilizada até três vezes e define os rótulos para serem utilizados em vez dos nomes dos arquivos correspondentes nos relatórios de conflito. Ou seja, `git merge-file -L x -L y -L z a b c` gera uma saída onde parece que veio dos arquivos 'x', 'y' e 'z' em vez dos arquivos 'a', 'b' e 'c'."
 
 #. type: Plain text
 #: en/git-merge-file.txt:66
 #, priority:100
 msgid "Send results to standard output instead of overwriting `<current-file>`."
-msgstr ""
-"Envie os resultados para a saída padrão, em vez de sobrescrever o `<arquivo "
-"atual>`."
+msgstr "Envie os resultados para a saída padrão, em vez de sobrescrever o `<arquivo atual>`."
 
 #. type: Plain text
 #: en/git-merge-file.txt:69
@@ -37123,9 +33688,7 @@ msgstr "--union"
 #: en/git-merge-file.txt:78
 #, priority:100
 msgid "Instead of leaving conflicts in the file, resolve conflicts favouring our (or their or both) side of the lines."
-msgstr ""
-"Em vez de deixar conflitos no arquivo, resolva conflitos favorecendo o nosso "
-"lado (ou o deles, ou ambos) das linhas."
+msgstr "Em vez de deixar conflitos no arquivo, resolva conflitos favorecendo o nosso lado (ou o deles, ou ambos) das linhas."
 
 #. type: Labeled list
 #: en/git-merge-file.txt:83
@@ -37137,9 +33700,7 @@ msgstr "`git merge-file README.my README README.upstream`"
 #: en/git-merge-file.txt:87
 #, priority:100
 msgid "combines the changes of README.my and README.upstream since README, tries to merge them and writes the result into README.my."
-msgstr ""
-"combina as alterações de 'README.my' e 'README.upstream' desde o 'README', "
-"tenta mesclá-las e grava o resultado no 'README.my'."
+msgstr "combina as alterações de 'README.my' e 'README.upstream' desde o 'README', tenta mesclá-las e grava o resultado no 'README.my'."
 
 #. type: Labeled list
 #: en/git-merge-file.txt:88
@@ -37151,9 +33712,7 @@ msgstr "`git merge-file -L a -L b -L c tmp/a123 tmp/b234 tmp/c345`"
 #: en/git-merge-file.txt:92
 #, priority:100
 msgid "merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and `c` instead of `tmp/a123` and `tmp/c345`."
-msgstr ""
-"mescla 'tmp/a123' e 'tmp/c345' com a base 'tmp/b234', mas utiliza os rótulos "
-"`a` e `c` em vez do `tmp/a123` e `tmp/c345`."
+msgstr "mescla 'tmp/a123' e 'tmp/c345' com a base 'tmp/b234', mas utiliza os rótulos `a` e `c` em vez do `tmp/a123` e `tmp/c345`."
 
 #. type: Title =
 #: en/git-merge-index.txt:2
@@ -37165,9 +33724,7 @@ msgstr "git-merge-index(1)"
 #: en/git-merge-index.txt:7
 #, priority:100
 msgid "git-merge-index - Run a merge for files needing merging"
-msgstr ""
-"git-merge-index - Executa uma mesclagem para os arquivos que precisam ser "
-"mesclados"
+msgstr "git-merge-index - Executa uma mesclagem para os arquivos que precisam ser mesclados"
 
 #. type: Plain text
 #: en/git-merge-index.txt:13
@@ -37179,75 +33736,49 @@ msgstr "'git merge-index' [-o] [-q] <merge-program> (-a | [--] <arquivo>*)\n"
 #: en/git-merge-index.txt:20
 #, priority:100
 msgid "This looks up the <file>(s) in the index and, if there are any merge entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4.  File modes for the three files are passed as arguments 5, 6 and 7."
-msgstr ""
-"Ele procura pelos `<arquivos>` no índice e caso haja alguma mesclagem na "
-"entrada, passa o hash SHA-1 para estes arquivos em forma de comandos 1, 2, 3 "
-"(opções vazias caso não haja um arquivo) e `<arquivo>` como a opção 4.  Os "
-"modos do arquivo para os três arquivos são encaminhados como as opções 5, 6 "
-"e 7."
+msgstr "Ele procura pelos `<arquivos>` no índice e caso haja alguma mesclagem na entrada, passa o hash SHA-1 para estes arquivos em forma de comandos 1, 2, 3 (opções vazias caso não haja um arquivo) e `<arquivo>` como a opção 4.  Os modos do arquivo para os três arquivos são encaminhados como as opções 5, 6 e 7."
 
 #. type: Plain text
 #: en/git-merge-index.txt:28
 #, priority:100
 msgid "Run merge against all files in the index that need merging."
-msgstr ""
-"Execute a mesclagem em todos os arquivos no índice que precisam ser "
-"mesclados."
+msgstr "Execute a mesclagem em todos os arquivos no índice que precisam ser mesclados."
 
 #. type: Plain text
 #: en/git-merge-index.txt:34
 #, priority:100
 msgid "Instead of stopping at the first failed merge, do all of them in one shot - continue with merging even when previous merges returned errors, and only return the error code after all the merges."
-msgstr ""
-"Em vez de parar na primeira mesclagem com problemas, faça todos eles de uma "
-"vez só - continue com a mesclagem mesmo quando as mesclagens anteriores "
-"retornarem erros e retorne apenas o código do erro ao final de todas as "
-"mesclagens."
+msgstr "Em vez de parar na primeira mesclagem com problemas, faça todos eles de uma vez só - continue com a mesclagem mesmo quando as mesclagens anteriores retornarem erros e retorne apenas o código do erro ao final de todas as mesclagens."
 
 #. type: Plain text
 #: en/git-merge-index.txt:39
 #, priority:100
 msgid "Do not complain about a failed merge program (a merge program failure usually indicates conflicts during the merge). This is for porcelains which might want to emit custom messages."
-msgstr ""
-"Não reclame sobre um programa de mesclagem que falhou (uma falha no programa "
-"de mesclagem geralmente indica conflitos durante o processo). Isto serve "
-"apenas para porcelanas que queiram emitir mensagens personalizadas."
+msgstr "Não reclame sobre um programa de mesclagem que falhou (uma falha no programa de mesclagem geralmente indica conflitos durante o processo). Isto serve apenas para porcelanas que queiram emitir mensagens personalizadas."
 
 #. type: Plain text
 #: en/git-merge-index.txt:43
 #, priority:100
 msgid "If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code."
-msgstr ""
-"Caso o comando 'git merge-index' seja chamado com vários <arquivo>s (ou -a), "
-"ele os processará por vez, parando apenas caso o merge retorne um código com "
-"uma saída diferente de zero."
+msgstr "Caso o comando 'git merge-index' seja chamado com vários <arquivo>s (ou -a), ele os processará por vez, parando apenas caso o merge retorne um código com uma saída diferente de zero."
 
 #. type: Plain text
 #: en/git-merge-index.txt:46
 #, priority:100
 msgid "Typically this is run with a script calling Git's imitation of the 'merge' command from the RCS package."
-msgstr ""
-"Normalmente, é executado com um script chamando a imitação do comando "
-"'merge' pelo Git vindo do pacote RCS."
+msgstr "Normalmente, é executado com um script chamando a imitação do comando 'merge' pelo Git vindo do pacote RCS."
 
 #. type: Plain text
 #: en/git-merge-index.txt:49
 #, priority:100
 msgid "A sample script called 'git merge-one-file' is included in the distribution."
-msgstr ""
-"Um script de exemplo chamado 'git merge-one-file' está incluso na "
-"distribuição."
+msgstr "Um script de exemplo chamado 'git merge-one-file' está incluso na distribuição."
 
 #. type: Plain text
 #: en/git-merge-index.txt:54
 #, priority:100
 msgid "ALERT ALERT ALERT! The Git \"merge object order\" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why."
-msgstr ""
-"ALERTA ALERTA ALERTA! A \"ordem da mesclagem dos objetos\" do Git é "
-"diferente da ordem de mesclagem do objeto no programa RCS 'merge'. Na ordem "
-"acima, o original é o primeiro. Porém, a ordem das opções para o programa de "
-"mesclagem 'merge' de três vias é ter o original no meio. Não me pergunte o "
-"por quê."
+msgstr "ALERTA ALERTA ALERTA! A \"ordem da mesclagem dos objetos\" do Git é diferente da ordem de mesclagem do objeto no programa RCS 'merge'. Na ordem acima, o original é o primeiro. Porém, a ordem das opções para o programa de mesclagem 'merge' de três vias é ter o original no meio. Não me pergunte o por quê."
 
 #. type: Plain text
 #: en/git-merge-index.txt:56 en/git-svn.txt:171
@@ -37293,11 +33824,7 @@ msgstr ""
 #: en/git-merge-index.txt:80
 #, priority:100
 msgid "where the latter example shows how 'git merge-index' will stop trying to merge once anything has returned an error (i.e., `cat` returned an error for the AA file, because it didn't exist in the original, and thus 'git merge-index' didn't even try to merge the MM thing)."
-msgstr ""
-"onde o último exemplo mostra como o comando 'git merge-index' interrompe as "
-"tentativas de mesclagem depois que algo retorna um erro (ou seja, `cat` "
-"retornou um erro para o arquivo 'AA', porque ele não existia no original e "
-"portanto, 'git merge-index' sequer tentou mesclar o tal 'MM')."
+msgstr "onde o último exemplo mostra como o comando 'git merge-index' interrompe as tentativas de mesclagem depois que algo retorna um erro (ou seja, `cat` retornou um erro para o arquivo 'AA', porque ele não existia no original e portanto, 'git merge-index' sequer tentou mesclar o tal 'MM')."
 
 #. type: Title =
 #: en/git-merge-one-file.txt:2
@@ -37309,9 +33836,7 @@ msgstr "git-merge-one-file(1)"
 #: en/git-merge-one-file.txt:7
 #, priority:100
 msgid "git-merge-one-file - The standard helper program to use with git-merge-index"
-msgstr ""
-"git-merge-one-file - O programa auxiliar predefinido que será utilizado com "
-"o comando git-merge-index"
+msgstr "git-merge-one-file - O programa auxiliar predefinido que será utilizado com o comando git-merge-index"
 
 #. type: Plain text
 #: en/git-merge-one-file.txt:13
@@ -37323,10 +33848,7 @@ msgstr "'git merge-one-file'\n"
 #: en/git-merge-one-file.txt:18
 #, priority:100
 msgid "This is the standard helper program to use with 'git merge-index' to resolve a merge after the trivial merge done with 'git read-tree -m'."
-msgstr ""
-"Este é o programa auxiliar predefinido a ser utilizado com o 'git merge-"
-"index' para resolver uma mesclagem após a mesclagem trivial feita com o "
-"comando 'git read-tree -m'."
+msgstr "Este é o programa auxiliar predefinido a ser utilizado com o 'git merge-index' para resolver uma mesclagem após a mesclagem trivial feita com o comando 'git read-tree -m'."
 
 #. type: Title =
 #: en/git-mergetool--lib.txt:2
@@ -37338,43 +33860,31 @@ msgstr "git-mergetool{litdd}lib(1)"
 #: en/git-mergetool--lib.txt:7
 #, priority:100
 msgid "git-mergetool--lib - Common Git merge tool shell scriptlets"
-msgstr ""
-"git-mergetool - lib - Scriptlets do shell, ferramentas de mesclagem comuns "
-"do Git"
+msgstr "git-mergetool - lib - Scriptlets do shell, ferramentas de mesclagem comuns do Git"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:12
 #, no-wrap, priority:100
 msgid "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
-msgstr ""
-"'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
+msgstr "'TOOL_MODE=(diff|merge) . \"$(git --exec-path)/git-mergetool{litdd}lib\"'\n"
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
 #, priority:100
 msgid "This is not a command the end user would want to run.  Ever.  This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones."
-msgstr ""
-"Este não é um comando que o usuário final gostaria de executar.  Nunca.  "
-"This documentation is meant for people who are studying the Porcelain-ish "
-"scripts and/or are writing new ones."
+msgstr "Este não é um comando que o usuário final gostaria de executar.  Nunca.  This documentation is meant for people who are studying the Porcelain-ish scripts and/or are writing new ones."
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:23
 #, priority:100
 msgid "The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working with Git merge tools."
-msgstr ""
-"O scriptlet 'git-mergetool{litdd}lib' foi projetado para ser originado ("
-"utilizando `.`) por outros scripts shell para configurar as funções para "
-"trabalhar com as ferramentas de mesclagem do Git."
+msgstr "O scriptlet 'git-mergetool{litdd}lib' foi projetado para ser originado (utilizando `.`) por outros scripts shell para configurar as funções para trabalhar com as ferramentas de mesclagem do Git."
 
 #. type: Plain text
 #: en/git-mergetool--lib.txt:27
 #, priority:100
 msgid "Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below.  'diff' and 'merge' are valid values."
-msgstr ""
-"Antes de fornecer o 'git-mergetool{litdd}lib', o seu script deve definir "
-"`TOOL_MODE` para informar o modo de operação para as funções listadas "
-"abaixo.  'diff' e 'merge' são valores válidos."
+msgstr "Antes de fornecer o 'git-mergetool{litdd}lib', o seu script deve definir `TOOL_MODE` para informar o modo de operação para as funções listadas abaixo.  'diff' e 'merge' são valores válidos."
 
 #. type: Title -
 #: en/git-mergetool--lib.txt:29 en/git-sh-i18n.txt:28 en/git-sh-setup.txt:34
@@ -37392,11 +33902,7 @@ msgstr "get_merge_tool"
 #: en/git-mergetool--lib.txt:34
 #, priority:100
 msgid "returns a merge tool. the return code is 1 if we returned a guessed merge tool, else 0. '$GIT_MERGETOOL_GUI' may be set to 'true' to search for the appropriate guitool."
-msgstr ""
-"retorna uma ferramenta de mesclagem. o código de retorno é 1 caso a "
-"ferramenta de mesclagem tenha sido encontrada através de uma adivinhação, "
-"senão 0. O '$GIT_MERGETOOL_GUI' pode ser definido como 'true' para localizar "
-"o guitool apropriado."
+msgstr "retorna uma ferramenta de mesclagem. o código de retorno é 1 caso a ferramenta de mesclagem tenha sido encontrada através de uma adivinhação, senão 0. O '$GIT_MERGETOOL_GUI' pode ser definido como 'true' para localizar o guitool apropriado."
 
 #. type: Labeled list
 #: en/git-mergetool--lib.txt:35
@@ -37432,11 +33938,7 @@ msgstr "run_merge_tool"
 #: en/git-mergetool--lib.txt:46
 #, priority:100
 msgid "launches a merge tool given the tool name and a true/false flag to indicate whether a merge base is present.  '$MERGED', '$LOCAL', '$REMOTE', and '$BASE' must be defined for use by the merge tool."
-msgstr ""
-"inicia uma ferramenta de mesclagem com seu nome e uma opção 'true/false' "
-"para indicar se a mesclagem de uma base está presente.  '$MERGED', '$LOCAL', "
-"'$REMOTE' e '$BASE' devem estar definidos para que a ferramenta de mesclagem "
-"possa ser usada."
+msgstr "inicia uma ferramenta de mesclagem com seu nome e uma opção 'true/false' para indicar se a mesclagem de uma base está presente.  '$MERGED', '$LOCAL', '$REMOTE' e '$BASE' devem estar definidos para que a ferramenta de mesclagem possa ser usada."
 
 #. type: Title =
 #: en/git-mergetool.txt:2
@@ -37448,105 +33950,61 @@ msgstr "git-mergetool(1)"
 #: en/git-mergetool.txt:7
 #, priority:240
 msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-"git-mergetool - Execute ferramentas para a resolução de problemas quando "
-"houver conflitos de mesclagem"
+msgstr "git-mergetool - Execute ferramentas para a resolução de problemas quando houver conflitos de mesclagem"
 
 #. type: Plain text
 #: en/git-mergetool.txt:12
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]\n"
-msgstr ""
-"'git mergetool' [--tool=<ferramenta>] [-y | --[no-]prompt] [<arquivo>...]\n"
+msgstr "'git mergetool' [--tool=<ferramenta>] [-y | --[no-]prompt] [<arquivo>...]\n"
 
 #. type: Plain text
 #: en/git-mergetool.txt:18
 #, priority:240
 msgid "Use `git mergetool` to run one of several merge utilities to resolve merge conflicts.  It is typically run after 'git merge'."
-msgstr ""
-"Utilize o comando `git mergetool` para executar um dos vários utilitários de "
-"mesclagem para resolver os conflitos de mesclagem.  Normalmente, é executado "
-"após o comando 'git merge'."
+msgstr "Utilize o comando `git mergetool` para executar um dos vários utilitários de mesclagem para resolver os conflitos de mesclagem.  Normalmente, é executado após o comando 'git merge'."
 
 #. type: Plain text
 #: en/git-mergetool.txt:24
 #, priority:240
 msgid "If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts).  Specifying a directory will include all unresolved files in that path.  If no <file> names are specified, 'git mergetool' will run the merge tool program on every file with merge conflicts."
-msgstr ""
-"Caso um ou mais parâmetros <arquivo> forem informados, o programa da "
-"ferramenta de mesclagem será executado para resolver as diferenças em cada "
-"arquivo (ignorando aqueles quem não tiverem conflitos).  A especificação de "
-"um diretório incluirá todos os arquivos que não foram resolvidos neste "
-"caminho.  Caso nenhum nome <arquivo> seja informado, o comando 'git "
-"mergetool' executará o programa da ferramenta de mesclagem em todos os "
-"arquivos com conflitos de mesclagem."
+msgstr "Caso um ou mais parâmetros <arquivo> forem informados, o programa da ferramenta de mesclagem será executado para resolver as diferenças em cada arquivo (ignorando aqueles quem não tiverem conflitos).  A especificação de um diretório incluirá todos os arquivos que não foram resolvidos neste caminho.  Caso nenhum nome <arquivo> seja informado, o comando 'git mergetool' executará o programa da ferramenta de mesclagem em todos os arquivos com conflitos de mesclagem."
 
 #. type: Plain text
 #: en/git-mergetool.txt:33
 #, priority:240
 msgid "Use the merge resolution program specified by <tool>.  Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge. Run `git mergetool --tool-help` for the list of valid <tool> settings."
-msgstr ""
-"Utilize o programa para a resolução da mesclagem definido através de "
-"<ferramenta>.  Os valores válidos incluem `emerge`, `gvimdiff`, `kdiff3`, "
-"`meld`, `vimdiff`, e `tortoisemerge`. Execute o `git mergetool --tool-help` "
-"para a lista de configurações válidas da <ferramenta>."
+msgstr "Utilize o programa para a resolução da mesclagem definido através de <ferramenta>.  Os valores válidos incluem `emerge`, `gvimdiff`, `kdiff3`, `meld`, `vimdiff`, e `tortoisemerge`. Execute o `git mergetool --tool-help` para a lista de configurações válidas da <ferramenta>."
 
 #. type: Plain text
 #: en/git-mergetool.txt:38
 #, priority:240
 msgid "If a merge resolution program is not specified, 'git mergetool' will use the configuration variable `merge.tool`.  If the configuration variable `merge.tool` is not set, 'git mergetool' will pick a suitable default."
-msgstr ""
-"Caso um programa para resolução da mesclagem não for informado, o comando "
-"'git mergetool' utilizará a variável de configuração `merge.tool`.  Caso a "
-"variável de configuração `merge.tool` não esteja definida, o comando 'git "
-"mergetool' escolherá uma predefinição apropriada."
+msgstr "Caso um programa para resolução da mesclagem não for informado, o comando 'git mergetool' utilizará a variável de configuração `merge.tool`.  Caso a variável de configuração `merge.tool` não esteja definida, o comando 'git mergetool' escolherá uma predefinição apropriada."
 
 #. type: Plain text
 #: en/git-mergetool.txt:44
 #, priority:240
 msgid "You can explicitly provide a full path to the tool by setting the configuration variable `mergetool.<tool>.path`. For example, you can configure the absolute path to kdiff3 by setting `mergetool.kdiff3.path`. Otherwise, 'git mergetool' assumes the tool is available in PATH."
-msgstr ""
-"Você pode de forma explicita informar um caminho completo para a ferramenta, "
-"definindo a variável de configuração `mergetool.<ferramenta>.path`. Por "
-"exemplo, você pode configurar o caminho absoluto para o kdiff3 configurando "
-"a opção `mergetool.kdiff3.path`. Caso contrário, o comando 'git mergetool' "
-"assume que a ferramenta está disponível no PATH."
+msgstr "Você pode de forma explicita informar um caminho completo para a ferramenta, definindo a variável de configuração `mergetool.<ferramenta>.path`. Por exemplo, você pode configurar o caminho absoluto para o kdiff3 configurando a opção `mergetool.kdiff3.path`. Caso contrário, o comando 'git mergetool' assume que a ferramenta está disponível no PATH."
 
 #. type: Plain text
 #: en/git-mergetool.txt:49
 #, priority:240
 msgid "Instead of running one of the known merge tool programs, 'git mergetool' can be customized to run an alternative program by specifying the command line to invoke in a configuration variable `mergetool.<tool>.cmd`."
-msgstr ""
-"Em vez de executar um dos programas informados da ferramenta de mesclagem, o "
-"comando 'git mergetool' pode ser customizado para executar um programa "
-"alternativo, informado na linha de comando para chamar em uma variável de "
-"configuração `mergetool.<ferramenta>.cmd`."
+msgstr "Em vez de executar um dos programas informados da ferramenta de mesclagem, o comando 'git mergetool' pode ser customizado para executar um programa alternativo, informado na linha de comando para chamar em uma variável de configuração `mergetool.<ferramenta>.cmd`."
 
 #. type: Plain text
 #: en/git-mergetool.txt:60
 #, priority:240
 msgid "When 'git mergetool' is invoked with this tool (either through the `-t` or `--tool` option or the `merge.tool` configuration variable) the configured command line will be invoked with `$BASE` set to the name of a temporary file containing the common base for the merge, if available; `$LOCAL` set to the name of a temporary file containing the contents of the file on the current branch; `$REMOTE` set to the name of a temporary file containing the contents of the file to be merged, and `$MERGED` set to the name of the file to which the merge tool should write the result of the merge resolution."
-msgstr ""
-"Quando o comando 'git mergetool' é chamado com esta ferramenta (através da "
-"opção `-t` ou `--tool` ou da variável de configuração `merge.tool`), a linha "
-"de comando configurada será invocada com `$BASE` definido como o nome de um "
-"arquivo temporário contendo a base comum para a mesclagem, caso esteja "
-"disponível; `$LOCAL` definido como o nome de um arquivo temporário que "
-"contém o conteúdo do arquivo no ramo atual; `$ REMOTE` definido como o nome "
-"de um arquivo temporário que contém o conteúdo do arquivo a ser mesclado e "
-"`$MERGED` definido como o nome do arquivo onde a ferramenta de mesclagem "
-"deve gravar o resultado da resolução da mesclagem."
+msgstr "Quando o comando 'git mergetool' é chamado com esta ferramenta (através da opção `-t` ou `--tool` ou da variável de configuração `merge.tool`), a linha de comando configurada será invocada com `$BASE` definido como o nome de um arquivo temporário contendo a base comum para a mesclagem, caso esteja disponível; `$LOCAL` definido como o nome de um arquivo temporário que contém o conteúdo do arquivo no ramo atual; `$ REMOTE` definido como o nome de um arquivo temporário que contém o conteúdo do arquivo a ser mesclado e `$MERGED` definido como o nome do arquivo onde a ferramenta de mesclagem deve gravar o resultado da resolução da mesclagem."
 
 #. type: Plain text
 #: en/git-mergetool.txt:66
 #, priority:240
 msgid "If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable `mergetool.<tool>.trustExitCode` can be set to `true`.  Otherwise, 'git mergetool' will prompt the user to indicate the success of the resolution after the custom tool has exited."
-msgstr ""
-"Caso a ferramenta de mesclagem personalizada indicar corretamente o sucesso "
-"da resolução de uma mesclagem com o seu código na saída, a variável de "
-"configuração `mergetool.<ferramenta>.trustExitCode` poderá ser definida como "
-"`true`.  Caso contrário, o 'git mergetool' solicitará ao usuário que indique "
-"o sucesso da resolução após o encerramento da ferramenta personalizada."
+msgstr "Caso a ferramenta de mesclagem personalizada indicar corretamente o sucesso da resolução de uma mesclagem com o seu código na saída, a variável de configuração `mergetool.<ferramenta>.trustExitCode` poderá ser definida como `true`.  Caso contrário, o 'git mergetool' solicitará ao usuário que indique o sucesso da resolução após o encerramento da ferramenta personalizada."
 
 #. type: Plain text
 #: en/git-mergetool.txt:69
@@ -37558,19 +34016,13 @@ msgstr "Exibe uma lista das ferramentas de mesclagem que podem ser utilizadas co
 #: en/git-mergetool.txt:77
 #, priority:240
 msgid "Don't prompt before each invocation of the merge resolution program.  This is the default if the merge resolution program is explicitly specified with the `--tool` option or with the `merge.tool` configuration variable."
-msgstr ""
-"Não avise antes de cada invocação do programa de resolução da mesclagem.  "
-"Esta é a predefinição caso o programa para a resolução da mesclagem seja "
-"informada de forma explicita com a opção `tool` ou com a variável de "
-"configuração `merge.tool`."
+msgstr "Não avise antes de cada invocação do programa de resolução da mesclagem.  Esta é a predefinição caso o programa para a resolução da mesclagem seja informada de forma explicita com a opção `tool` ou com a variável de configuração `merge.tool`."
 
 #. type: Plain text
 #: en/git-mergetool.txt:81
 #, priority:240
 msgid "Prompt before each invocation of the merge resolution program to give the user a chance to skip the path."
-msgstr ""
-"Avise antes de cada invocação do programa para a resolução da mesclagem, "
-"para dar ao usuário a chance de ignorar o caminho."
+msgstr "Avise antes de cada invocação do programa para a resolução da mesclagem, para dar ao usuário a chance de ignorar o caminho."
 
 #. type: Labeled list
 #: en/git-mergetool.txt:83
@@ -37582,11 +34034,7 @@ msgstr "--gui"
 #: en/git-mergetool.txt:89
 #, priority:240
 msgid "When 'git-mergetool' is invoked with the `-g` or `--gui` option the default merge tool will be read from the configured `merge.guitool` variable instead of `merge.tool`. If `merge.guitool` is not set, we will fallback to the tool configured under `merge.tool`."
-msgstr ""
-"Quando o comando 'git-difftool' é chamado com a opção `-g` ou `--gui`, a "
-"ferramenta diff predefinida será lida na variável de configuração `diff."
-"guitool` em vez do `diff.tool`. Caso a variável `diff.guitool` não esteja "
-"definida, retroagiremos para a ferramenta configurada em `merge.guitool`."
+msgstr "Quando o comando 'git-difftool' é chamado com a opção `-g` ou `--gui`, a ferramenta diff predefinida será lida na variável de configuração `diff.guitool` em vez do `diff.tool`. Caso a variável `diff.guitool` não esteja definida, retroagiremos para a ferramenta configurada em `merge.guitool`."
 
 #. type: Labeled list
 #: en/git-mergetool.txt:90
@@ -37598,20 +34046,13 @@ msgstr "--no-gui"
 #: en/git-mergetool.txt:94
 #, priority:240
 msgid "This overrides a previous `-g` or `--gui` setting and reads the default merge tool will be read from the configured `merge.tool` variable."
-msgstr ""
-"Substitui uma configuração anterior `-g` ou `--gui` e faz a leitura da "
-"ferramenta de mesclagem predefinida através da variável `merge.tool` já "
-"configurada."
+msgstr "Substitui uma configuração anterior `-g` ou `--gui` e faz a leitura da ferramenta de mesclagem predefinida através da variável `merge.tool` já configurada."
 
 #. type: Plain text
 #: en/git-mergetool.txt:101
 #, priority:240
 msgid "Process files in the order specified in the <orderfile>, which has one shell glob pattern per line.  This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]).  To cancel `diff.orderFile`, use `-O/dev/null`."
-msgstr ""
-"Processe os arquivos na ordem especificada na <ordem-do-arquivo> que tenha "
-"um padrão \"shell glob\" por linha.  Substitui a variável de configuração "
-"`diff.orderFile` (consulte o comando linkgit:git-config[1]).  Para cancelar "
-"a variável `diff.orderFile`, utilize `-O/dev/null`."
+msgstr "Processe os arquivos na ordem especificada na <ordem-do-arquivo> que tenha um padrão \"shell glob\" por linha.  Substitui a variável de configuração `diff.orderFile` (consulte o comando linkgit:git-config[1]).  Para cancelar a variável `diff.orderFile`, utilize `-O/dev/null`."
 
 #. type: Title -
 #: en/git-mergetool.txt:103
@@ -37629,10 +34070,7 @@ msgstr "O `git mergetool` cria arquivos de backup` * .orig` enquanto lida com as
 #: en/git-mergetool.txt:111
 #, priority:240
 msgid "Setting the `mergetool.keepBackup` configuration variable to `false` causes `git mergetool` to automatically remove the backup as files are successfully merged."
-msgstr ""
-"Definir a variável de configuração `mergetool.keepBackup` como` false` faz "
-"com que o comando `git mergetool` remova automaticamente o backup enquanto "
-"os arquivos forem sendo mesclados com sucesso."
+msgstr "Definir a variável de configuração `mergetool.keepBackup` como` false` faz com que o comando `git mergetool` remova automaticamente o backup enquanto os arquivos forem sendo mesclados com sucesso."
 
 #. type: Title =
 #: en/git-merge-tree.txt:2
@@ -37656,11 +34094,7 @@ msgstr "'git merge-tree' <base-tree> <ramo1> <ramo2>\n"
 #: en/git-merge-tree.txt:21
 #, priority:100
 msgid "Reads three tree-ish, and output trivial merge results and conflicting stages to the standard output.  This is similar to what three-way 'git read-tree -m' does, but instead of storing the results in the index, the command outputs the entries to the standard output."
-msgstr ""
-"Faz a leitura de três árvores e produz resultados comuns de mesclagem assim "
-"como encaminha os estágios conflitantes para a saída padrão.  Isso é "
-"semelhante ao que o 'git read-tree -m' no entanto, em vez de armazenar os "
-"resultados no índice, o comando externa as entradas na saída padrão."
+msgstr "Faz a leitura de três árvores e produz resultados comuns de mesclagem assim como encaminha os estágios conflitantes para a saída padrão.  Isso é semelhante ao que o 'git read-tree -m' no entanto, em vez de armazenar os resultados no índice, o comando externa as entradas na saída padrão."
 
 #. type: Plain text
 #: en/git-merge-tree.txt:26
@@ -37742,15 +34176,7 @@ msgstr ""
 #: en/git-merge.txt:54
 #, priority:240
 msgid "The second syntax (\"`git merge --abort`\") can only be run after the merge has resulted in conflicts. 'git merge --abort' will abort the merge process and try to reconstruct the pre-merge state. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), 'git merge --abort' will in some cases be unable to reconstruct the original (pre-merge) changes. Therefore:"
-msgstr ""
-"A segunda sintaxe (\"`git merge --abort`\") só pode ser executada após o "
-"resultado da mesclagem apresentar conflitos. O comando 'git merge abort' "
-"abortará o processo de mesclagem e tentará reconstruir a condição anterior a "
-"mesclagem. No entanto, Caso haja alterações com commits não realizados "
-"quando a mesclagem for iniciada (e especialmente caso estas alterações forem "
-"modificadas posteriormente após o início da mesclagem), o 'git merge abort' "
-"será, em alguns casos, incapaz de reconstruir as alterações originais "
-"(pré-mesclagem). Portanto:"
+msgstr "A segunda sintaxe (\"`git merge --abort`\") só pode ser executada após o resultado da mesclagem apresentar conflitos. O comando 'git merge abort' abortará o processo de mesclagem e tentará reconstruir a condição anterior a mesclagem. No entanto, Caso haja alterações com commits não realizados quando a mesclagem for iniciada (e especialmente caso estas alterações forem modificadas posteriormente após o início da mesclagem), o 'git merge abort' será, em alguns casos, incapaz de reconstruir as alterações originais (pré-mesclagem). Portanto:"
 
 #. type: Plain text
 #: en/git-merge.txt:58
@@ -37762,41 +34188,31 @@ msgid ""
 msgstr ""
 "*Aviso*: É desencorajado executar o comando 'git merge' com alterações\n"
 "não-triviais dos commits que não foram feitos é desencorajado: enquanto\n"
-"possível, pode deixá-lo em uma condição difícil de sair no caso de haver um "
-"conflito.\n"
+"possível, pode deixá-lo em uma condição difícil de sair no caso de haver um conflito.\n"
 
 #. type: Plain text
 #: en/git-merge.txt:61
 #, priority:240
 msgid "The third syntax (\"`git merge --continue`\") can only be run after the merge has resulted in conflicts."
-msgstr ""
-"A terceira sintaxe (\"`git merge --continue`\") só pode ser executada depois "
-"que a mesclagem apresentar conflitos."
+msgstr "A terceira sintaxe (\"`git merge --continue`\") só pode ser executada depois que a mesclagem apresentar conflitos."
 
 #. type: Plain text
 #: en/git-merge.txt:69
 #, priority:240
 msgid "Set the commit message to be used for the merge commit (in case one is created)."
-msgstr ""
-"Defina a mensagem do commit que será utilizada para a mesclagem do commit ("
-"no caso de uma ser criada)."
+msgstr "Defina a mensagem do commit que será utilizada para a mesclagem do commit (no caso de uma ser criada)."
 
 #. type: Plain text
 #: en/git-merge.txt:72 en/git-merge.txt:84
 #, priority:240
 msgid "If `--log` is specified, a shortlog of the commits being merged will be appended to the specified message."
-msgstr ""
-"Caso `--log` seja utilizado, um atalho dos commits que estão sendo mesclados "
-"será anexado à mensagem informada."
+msgstr "Caso `--log` seja utilizado, um atalho dos commits que estão sendo mesclados será anexado à mensagem informada."
 
 #. type: Plain text
 #: en/git-merge.txt:76
 #, priority:240
 msgid "The 'git fmt-merge-msg' command can be used to give a good default for automated 'git merge' invocations. The automated message can include the branch description."
-msgstr ""
-"O comando 'git fmt-merge-msg' pode ser utilizado para informar uma boa "
-"predefinição para as invocações automatizadas do comando 'git merge'. A "
-"mensagem automatizada pode incluir a descrição da ramificação."
+msgstr "O comando 'git fmt-merge-msg' pode ser utilizado para informar uma boa predefinição para as invocações automatizadas do comando 'git merge'. A mensagem automatizada pode incluir a descrição da ramificação."
 
 #. type: Plain text
 #: en/git-merge.txt:81
@@ -37814,32 +34230,19 @@ msgstr "Silently overwrite ignored files from the merge result. Este é o compor
 #: en/git-merge.txt:99
 #, priority:240
 msgid "Abort the current conflict resolution process, and try to reconstruct the pre-merge state. If an autostash entry is present, apply it to the worktree."
-msgstr ""
-"Interrompa o processo atual da resolução de conflitos e tente reconstruir a "
-"condição de pré-mesclagem. Caso uma entrada de \"autostash\" esteja "
-"presente, aplique-a à árvore de trabalho."
+msgstr "Interrompa o processo atual da resolução de conflitos e tente reconstruir a condição de pré-mesclagem. Caso uma entrada de \"autostash\" esteja presente, aplique-a à árvore de trabalho."
 
 #. type: Plain text
 #: en/git-merge.txt:104
 #, priority:240
 msgid "If there were uncommitted worktree changes present when the merge started, 'git merge --abort' will in some cases be unable to reconstruct these changes. It is therefore recommended to always commit or stash your changes before running 'git merge'."
-msgstr ""
-"Caso haja commits não realizados presentes na árvore de trabalho quando a "
-"mesclagem for iniciada, o comando 'git merge --abort' será, em alguns casos, "
-"incapaz de reconstruir essas alterações. Portanto, é recomendável sempre "
-"fazer o commit ou acumular as suas alterações antes de executar o 'git "
-"merge'."
+msgstr "Caso haja commits não realizados presentes na árvore de trabalho quando a mesclagem for iniciada, o comando 'git merge --abort' será, em alguns casos, incapaz de reconstruir essas alterações. Portanto, é recomendável sempre fazer o commit ou acumular as suas alterações antes de executar o 'git merge'."
 
 #. type: Plain text
 #: en/git-merge.txt:110
 #, priority:240
 msgid "'git merge --abort' is equivalent to 'git reset --merge' when `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in which case 'git merge --abort' applies the stash entry to the worktree whereas 'git reset --merge' will save the stashed changes in the stash list."
-msgstr ""
-"O comando 'git merge --abort' é o equivalente ao 'git reset --merge' quando "
-"`MERGE_HEAD` estiver presente ou a menos que o `MERGE_AUTOSTASH` também "
-"esteja; neste caso, o comando 'git merge --abort' aplica a entrada 'stash' "
-"na área de trabalho enquanto 'git reset --merge' salvará as alterações "
-"acumuladas na lista do estoque."
+msgstr "O comando 'git merge --abort' é o equivalente ao 'git reset --merge' quando `MERGE_HEAD` estiver presente ou a menos que o `MERGE_AUTOSTASH` também esteja; neste caso, o comando 'git merge --abort' aplica a entrada 'stash' na área de trabalho enquanto 'git reset --merge' salvará as alterações acumuladas na lista do estoque."
 
 #. type: Plain text
 #: en/git-merge.txt:115
@@ -37851,39 +34254,25 @@ msgstr "Não se preocupa com a mesclagem em andamento. Mantenha o índice e a á
 #: en/git-merge.txt:120
 #, priority:240
 msgid "After a 'git merge' stops due to conflicts you can conclude the merge by running 'git merge --continue' (see \"HOW TO RESOLVE CONFLICTS\" section below)."
-msgstr ""
-"Depois que um 'git merge' for interrompido por causa dos conflitos, é "
-"possível concluir a mesclagem executando o comando 'git merge --continue' ("
-"consulte a seção \"COMO RESOLVER CONFLITOS\" abaixo)."
+msgstr "Depois que um 'git merge' for interrompido por causa dos conflitos, é possível concluir a mesclagem executando o comando 'git merge --continue' (consulte a seção \"COMO RESOLVER CONFLITOS\" abaixo)."
 
 #. type: Plain text
 #: en/git-merge.txt:125
 #, priority:240
 msgid "Commits, usually other branch heads, to merge into our branch.  Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)."
-msgstr ""
-"Os commits, geralmente outros cabeçalhos do ramo que serão mesclados na "
-"nossa filial.  A especificação de mais de um commit criará uma mesclagem com "
-"mais de duas origens (carinhosamente chamada de mesclagem polvo (octopus "
-"merge))."
+msgstr "Os commits, geralmente outros cabeçalhos do ramo que serão mesclados na nossa filial.  A especificação de mais de um commit criará uma mesclagem com mais de duas origens (carinhosamente chamada de mesclagem polvo (octopus merge))."
 
 #. type: Plain text
 #: en/git-merge.txt:129
 #, priority:240
 msgid "If no commit is given from the command line, merge the remote-tracking branches that the current branch is configured to use as its upstream.  See also the configuration section of this manual page."
-msgstr ""
-"Caso nenhum commit seja informado na linha de comando, mescle as "
-"ramificações monitoradas remotamente para que a ramificação atual esteja "
-"configurada para ser utilizada como sua upstream.  Consulte também a seção "
-"de configuração desta página do manual."
+msgstr "Caso nenhum commit seja informado na linha de comando, mescle as ramificações monitoradas remotamente para que a ramificação atual esteja configurada para ser utilizada como sua upstream.  Consulte também a seção de configuração desta página do manual."
 
 #. type: Plain text
 #: en/git-merge.txt:133
 #, priority:240
 msgid "When `FETCH_HEAD` (and no other commit) is specified, the branches recorded in the `.git/FETCH_HEAD` file by the previous invocation of `git fetch` for merging are merged to the current branch."
-msgstr ""
-"Quando `FETCH_HEAD` (e nenhum outro commit) for definido, as ramificações "
-"registradas no arquivo `.git/FETCH_HEAD` através da invocação anterior para "
-"mesclagem com o comando `git fetch`, serão mescladas no ramo atual."
+msgstr "Quando `FETCH_HEAD` (e nenhum outro commit) for definido, as ramificações registradas no arquivo `.git/FETCH_HEAD` através da invocação anterior para mesclagem com o comando `git fetch`, serão mescladas no ramo atual."
 
 #. type: Title -
 #: en/git-merge.txt:136
@@ -37919,15 +34308,7 @@ msgstr "MESCLAGEM COM AVANÇO RÁPIDO"
 #: en/git-merge.txt:165
 #, priority:240
 msgid "Often the current branch head is an ancestor of the named commit.  This is the most common case especially when invoked from 'git pull': you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision.  In this case, a new commit is not needed to store the combined history; instead, the `HEAD` (along with the index) is updated to point at the named commit, without creating an extra merge commit."
-msgstr ""
-"Frequentemente, o cabeçalho do ramo atual é um ancestral do commit "
-"informado.  Este é o caso mais comum especialmente quando invocado a partir "
-"do comando 'git pull': você está monitorando um repositório upstream, não "
-"efetuou as alterações locais e agora deseja atualizar para uma revisão "
-"upstream mais recente.  Nesse caso, não é necessário um novo commit para "
-"armazenar o histórico combinado; em vez disso, o `HEAD` (junto com o índice) "
-"é atualizado para apontar para o commit informado sem criar uma mesclagem "
-"extra do commit."
+msgstr "Frequentemente, o cabeçalho do ramo atual é um ancestral do commit informado.  Este é o caso mais comum especialmente quando invocado a partir do comando 'git pull': você está monitorando um repositório upstream, não efetuou as alterações locais e agora deseja atualizar para uma revisão upstream mais recente.  Nesse caso, não é necessário um novo commit para armazenar o histórico combinado; em vez disso, o `HEAD` (junto com o índice) é atualizado para apontar para o commit informado sem criar uma mesclagem extra do commit."
 
 #. type: Plain text
 #: en/git-merge.txt:167
@@ -37945,20 +34326,13 @@ msgstr "MESCLAGEM REAL"
 #: en/git-merge.txt:174
 #, priority:240
 msgid "Except in a fast-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents."
-msgstr ""
-"Exceto em uma mesclagem de avanço rápido (veja acima), as ramificações que "
-"serão mescladas devem ser vinculadas através de uma consolidação da "
-"mesclagem que tenha ambas como as suas origens."
+msgstr "Exceto em uma mesclagem de avanço rápido (veja acima), as ramificações que serão mescladas devem ser vinculadas através de uma consolidação da mesclagem que tenha ambas como as suas origens."
 
 #. type: Plain text
 #: en/git-merge.txt:179
 #, priority:240
 msgid "A merged version reconciling the changes from all branches to be merged is committed, and your `HEAD`, index, and working tree are updated to it.  It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them."
-msgstr ""
-"Uma versão mesclada que reconcilia as alterações de todas as ramificações "
-"que serão mescladas, o commit é feito e o seu `HEAD`, índice e a árvore de "
-"trabalho são atualizados para ela.  É possível ter alterações na árvore de "
-"trabalho, desde que não se sobreponham; a atualização irá preservá-las."
+msgstr "Uma versão mesclada que reconcilia as alterações de todas as ramificações que serão mescladas, o commit é feito e o seu `HEAD`, índice e a árvore de trabalho são atualizados para ela.  É possível ter alterações na árvore de trabalho, desde que não se sobreponham; a atualização irá preservá-las."
 
 #. type: Plain text
 #: en/git-merge.txt:182
@@ -37982,39 +34356,25 @@ msgstr "O \"ref\" do `MERGE_HEAD` é definido para indicar o `HEAD` do outro ram
 #: en/git-merge.txt:187
 #, priority:240
 msgid "Paths that merged cleanly are updated both in the index file and in your working tree."
-msgstr ""
-"Os caminhos que foram mesclados corretamente são atualizados no arquivo do "
-"índice e na sua árvore de trabalho."
+msgstr "Os caminhos que foram mesclados corretamente são atualizados no arquivo do índice e na sua árvore de trabalho."
 
 #. type: Plain text
 #: en/git-merge.txt:193
 #, priority:240
 msgid "For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`).  The working tree files contain the result of the \"merge\" program; i.e. 3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
-msgstr ""
-"Para os caminhos conflitantes, o arquivo do índice registra até três versões:"
-" o estágio 1 armazena a versão do ancestral comum, o estágio 2 do `HEAD` e o "
-"estágio 3 do `MERGE_HEAD` (você pode inspecionar os estágios com `git ls-"
-"files -u`).  Os arquivos da árvore de trabalho contêm o resultado do "
-"programa \"merge\"; ou seja, os resultados da mesclagem em três direções com "
-"os marcadores de conflito familiares `<<<`, `===` e `>>>`."
+msgstr "Para os caminhos conflitantes, o arquivo do índice registra até três versões: o estágio 1 armazena a versão do ancestral comum, o estágio 2 do `HEAD` e o estágio 3 do `MERGE_HEAD` (você pode inspecionar os estágios com `git ls-files -u`).  Os arquivos da árvore de trabalho contêm o resultado do programa \"merge\"; ou seja, os resultados da mesclagem em três direções com os marcadores de conflito familiares `<<<`, `===` e `>>>`."
 
 #. type: Plain text
 #: en/git-merge.txt:197
 #, priority:240
 msgid "No other changes are made.  In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i.e. matching `HEAD`."
-msgstr ""
-"Nenhuma outra alteração é feita.  Em particular, as alterações locais que "
-"você tinha antes de iniciar a mesclagem permanecerão as mesmas e as entradas "
-"do índice para elas permanecerão como estavam, ou seja, correspondendo com `"
-"HEAD '."
+msgstr "Nenhuma outra alteração é feita.  Em particular, as alterações locais que você tinha antes de iniciar a mesclagem permanecerão as mesmas e as entradas do índice para elas permanecerão como estavam, ou seja, correspondendo com `HEAD '."
 
 #. type: Plain text
 #: en/git-merge.txt:200
 #, priority:240
 msgid "If you tried a merge which resulted in complex conflicts and want to start over, you can recover with `git merge --abort`."
-msgstr ""
-"Caso tenha tentado uma mesclagem que resultou em conflitos complexos e "
-"queira recomeçar, execute o comando `git merge --abort`."
+msgstr "Caso tenha tentado uma mesclagem que resultou em conflitos complexos e queira recomeçar, execute o comando `git merge --abort`."
 
 #. type: Title -
 #: en/git-merge.txt:202
@@ -38026,31 +34386,19 @@ msgstr "MESCLANDO TAG"
 #: en/git-merge.txt:209
 #, priority:240
 msgid "When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast-forward merge is possible, and the commit message template is prepared with the tag message.  Additionally, if the tag is signed, the signature check is reported as a comment in the message template. See also linkgit:git-tag[1]."
-msgstr ""
-"Ao mesclar uma tag anotada (e possivelmente assinada), o Git sempre cria a "
-"mesclagem de um commit, mesmo que seja possível realizar uma mesclagem de "
-"avanço rápido, o modelo da mensagem do commit é preparado com a mensagem da "
-"tag.  Além disso, caso a tag esteja assinada, a verificação da assinatura "
-"será relatada como um comentário no modelo de mensagem. Consulte também "
-"linkgit:git-tag[1]."
+msgstr "Ao mesclar uma tag anotada (e possivelmente assinada), o Git sempre cria a mesclagem de um commit, mesmo que seja possível realizar uma mesclagem de avanço rápido, o modelo da mensagem do commit é preparado com a mensagem da tag.  Além disso, caso a tag esteja assinada, a verificação da assinatura será relatada como um comentário no modelo de mensagem. Consulte também linkgit:git-tag[1]."
 
 #. type: Plain text
 #: en/git-merge.txt:213
 #, priority:240
 msgid "When you want to just integrate with the work leading to the commit that happens to be tagged, e.g. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit."
-msgstr ""
-"Quando você deseja apenas integrar-se ao trabalho que leva ao commit que "
-"está marcado, por exemplo, sincronizando com um ponto de liberação upstream, "
-"talvez você não queira fazer uma consolidação desnecessária da mesclagem."
+msgstr "Quando você deseja apenas integrar-se ao trabalho que leva ao commit que está marcado, por exemplo, sincronizando com um ponto de liberação upstream, talvez você não queira fazer uma consolidação desnecessária da mesclagem."
 
 #. type: Plain text
 #: en/git-merge.txt:217
 #, priority:240
 msgid "In such a case, you can \"unwrap\" the tag yourself before feeding it to `git merge`, or pass `--ff-only` when you do not have any work on your own. e.g."
-msgstr ""
-"Neste caso, você pode \"desembrulhar\" a etiqueta antes de encaminhá-la para "
-"o comando `git merge` ou passar ao `--ffff-only` quando você não tiver "
-"nenhum trabalho feito por conta própria. por exemplo."
+msgstr "Neste caso, você pode \"desembrulhar\" a etiqueta antes de encaminhá-la para o comando `git merge` ou passar ao `--ffff-only` quando você não tiver nenhum trabalho feito por conta própria. por exemplo."
 
 #. type: delimited block -
 #: en/git-merge.txt:222
@@ -38074,24 +34422,13 @@ msgstr "COMO OS CONFLITOS SÃO APRESENTADOS"
 #: en/git-merge.txt:235
 #, priority:240
 msgid "During a merge, the working tree files are updated to reflect the result of the merge.  Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim.  When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area."
-msgstr ""
-"Durante uma mesclagem, os arquivos da árvore de trabalho são atualizados "
-"para refletir o resultado da mesclagem.  Entre as alterações feitas no "
-"ancestral da versão comum, as que não se sobrepõem (ou seja, você alterou "
-"uma área do arquivo enquanto o outro lado deixou a área intacta ou vice-"
-"versa) são incorporadas no resultado final, literalmente.  Quando os dois "
-"lados que fizeram as alterações na mesma área, porém, o Git não pode "
-"escolher aleatoriamente um lado sobre o outro e solicita que você o resolva, "
-"deixando intacto o que os dois lados fizeram nessa área."
+msgstr "Durante uma mesclagem, os arquivos da árvore de trabalho são atualizados para refletir o resultado da mesclagem.  Entre as alterações feitas no ancestral da versão comum, as que não se sobrepõem (ou seja, você alterou uma área do arquivo enquanto o outro lado deixou a área intacta ou vice-versa) são incorporadas no resultado final, literalmente.  Quando os dois lados que fizeram as alterações na mesma área, porém, o Git não pode escolher aleatoriamente um lado sobre o outro e solicita que você o resolva, deixando intacto o que os dois lados fizeram nessa área."
 
 #. type: Plain text
 #: en/git-merge.txt:238
 #, priority:240
 msgid "By default, Git uses the same style as the one used by the \"merge\" program from the RCS suite to present such a conflicted hunk, like this:"
-msgstr ""
-"É predefinido que o Git utilize o mesmo estilo que o utilizado pelo programa "
-"\"merge\" (mesclar) do conjunto RCS para apresentar um pedaço conflitante, "
-"como este:"
+msgstr "É predefinido que o Git utilize o mesmo estilo que o utilizado pelo programa \"merge\" (mesclar) do conjunto RCS para apresentar um pedaço conflitante, como este:"
 
 #. type: delimited block -
 #: en/git-merge.txt:249
@@ -38121,30 +34458,19 @@ msgstr ""
 #: en/git-merge.txt:254
 #, priority:240
 msgid "The area where a pair of conflicting changes happened is marked with markers `<<<<<<<`, `=======`, and `>>>>>>>`.  The part before the `=======` is typically your side, and the part afterwards is typically their side."
-msgstr ""
-"A área onde ocorreu um para de alterações conflitantes é marcada com os "
-"marcadores `<<<<<<<`, `=======` e `>>>>>>>`.  A parte anterior ao `=======` "
-"é tipicamente do seu lado e a parte posterior é tipicamente do lado deles."
+msgstr "A área onde ocorreu um para de alterações conflitantes é marcada com os marcadores `<<<<<<<`, `=======` e `>>>>>>>`.  A parte anterior ao `=======` é tipicamente do seu lado e a parte posterior é tipicamente do lado deles."
 
 #. type: Plain text
 #: en/git-merge.txt:260
 #, priority:240
 msgid "The default format does not show what the original said in the conflicting area.  You cannot tell how many lines are deleted and replaced with Barbie's remark on your side.  The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy."
-msgstr ""
-"O formato predefinido não exibe o que o original disse na área conflitante.  "
-"Você não pode dizer quantas linhas foram excluídas e substituídas através "
-"das observações do seu lado.  A única coisa que é possível dizer é que o seu "
-"lado quer dizer que é difícil e você prefere ir às compras, enquanto o outro "
-"lado quer dizer que é fácil."
+msgstr "O formato predefinido não exibe o que o original disse na área conflitante.  Você não pode dizer quantas linhas foram excluídas e substituídas através das observações do seu lado.  A única coisa que é possível dizer é que o seu lado quer dizer que é difícil e você prefere ir às compras, enquanto o outro lado quer dizer que é fácil."
 
 #. type: Plain text
 #: en/git-merge.txt:264
 #, priority:240
 msgid "An alternative style can be used by setting the \"merge.conflictStyle\" configuration variable to \"diff3\".  In \"diff3\" style, the above conflict may look like this:"
-msgstr ""
-"Um estilo alternativo pode ser utilizado ao definir a variável de "
-"configuração \"merge.conflictStyle\" como \"diff3\".  No estilo \"diff3\", o "
-"conflito acima pode ser assim:"
+msgstr "Um estilo alternativo pode ser utilizado ao definir a variável de configuração \"merge.conflictStyle\" como \"diff3\".  No estilo \"diff3\", o conflito acima pode ser assim:"
 
 #. type: delimited block -
 #: en/git-merge.txt:277
@@ -38178,13 +34504,7 @@ msgstr ""
 #: en/git-merge.txt:285
 #, priority:240
 msgid "In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses another `|||||||` marker that is followed by the original text.  You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude.  You can sometimes come up with a better resolution by viewing the original."
-msgstr ""
-"Além dos marcadores `<<<<<<<`, `=======` e `>>>>>>>` `, ele utiliza outro "
-"marcador `|||||||` que é seguido pelo texto original.  Você pode dizer que o "
-"original acabou de declarar um fato e o seu lado simplesmente cedeu a essa "
-"afirmação e desistiu, enquanto o outro lado tentou ter uma atitude mais "
-"positiva.  Às vezes, você pode ter uma resolução melhor visualizando o "
-"original."
+msgstr "Além dos marcadores `<<<<<<<`, `=======` e `>>>>>>>` `, ele utiliza outro marcador `|||||||` que é seguido pelo texto original.  Você pode dizer que o original acabou de declarar um fato e o seu lado simplesmente cedeu a essa afirmação e desistiu, enquanto o outro lado tentou ter uma atitude mais positiva.  Às vezes, você pode ter uma resolução melhor visualizando o original."
 
 #. type: Title -
 #: en/git-merge.txt:288
@@ -38202,22 +34522,13 @@ msgstr "Após encontrar um conflito, você pode fazer duas coisas:"
 #: en/git-merge.txt:296
 #, priority:240
 msgid "Decide not to merge.  The only clean-ups you need are to reset the index file to the `HEAD` commit to reverse 2. and to clean up working tree changes made by 2. and 3.; `git merge --abort` can be used for this."
-msgstr ""
-"Decida não fazer a mesclagem.  As únicas limpezas necessárias são para "
-"redefinir o arquivo no índice para o commit `HEAD` para que '2' seja "
-"revertido. e para limpar as alterações na árvore de trabalho feitas por '2'. "
-"e o '3' .; O `git merge --abort` pode ser utilizado para isso."
+msgstr "Decida não fazer a mesclagem.  As únicas limpezas necessárias são para redefinir o arquivo no índice para o commit `HEAD` para que '2' seja revertido. e para limpar as alterações na árvore de trabalho feitas por '2'. e o '3' .; O `git merge --abort` pode ser utilizado para isso."
 
 #. type: Plain text
 #: en/git-merge.txt:303
 #, priority:240
 msgid "Resolve the conflicts.  Git will mark the conflicts in the working tree.  Edit the files into shape and 'git add' them to the index.  Use 'git commit' or 'git merge --continue' to seal the deal. The latter command checks whether there is a (interrupted) merge in progress before calling 'git commit'."
-msgstr ""
-"Resolva os conflitos.  O Git marcará os conflitos na árvore de trabalho.  "
-"Edite os arquivos em ordem e comando 'git add' adiciona eles ao índice.  "
-"Utilize o comando 'git commit' ou 'git merge --continue' para selar o "
-"acordo. O último comando verifica a existência de uma mesclagem "
-"(interrompida) em andamento antes de chamar o comando 'git commit'."
+msgstr "Resolva os conflitos.  O Git marcará os conflitos na árvore de trabalho.  Edite os arquivos em ordem e comando 'git add' adiciona eles ao índice.  Utilize o comando 'git commit' ou 'git merge --continue' para selar o acordo. O último comando verifica a existência de uma mesclagem (interrompida) em andamento antes de chamar o comando 'git commit'."
 
 #. type: Plain text
 #: en/git-merge.txt:305
@@ -38229,44 +34540,31 @@ msgstr "Você pode trabalhar o conflito com uma quantidade de ferramentas:"
 #: en/git-merge.txt:308
 #, priority:240
 msgid "Use a mergetool.  `git mergetool` to launch a graphical mergetool which will work you through the merge."
-msgstr ""
-"Utilize uma ferramenta de mesclagem \"mergetool\".  `git mergetool` para "
-"iniciar uma ferramenta gráfica para lhe auxiliar através do processo de "
-"mesclagem."
+msgstr "Utilize uma ferramenta de mesclagem \"mergetool\".  `git mergetool` para iniciar uma ferramenta gráfica para lhe auxiliar através do processo de mesclagem."
 
 #. type: Plain text
 #: en/git-merge.txt:312
 #, priority:240
 msgid "Look at the diffs.  `git diff` will show a three-way diff, highlighting changes from both the `HEAD` and `MERGE_HEAD` versions."
-msgstr ""
-"Veja as diferenças dos arquivos diff.  O `git diff` exibirá um diff de três "
-"vias, destacando as alterações das versões` HEAD` e `MERGE_HEAD`."
+msgstr "Veja as diferenças dos arquivos diff.  O `git diff` exibirá um diff de três vias, destacando as alterações das versões` HEAD` e `MERGE_HEAD`."
 
 #. type: Plain text
 #: en/git-merge.txt:316
 #, priority:240
 msgid "Look at the diffs from each branch. `git log --merge -p <path>` will show diffs first for the `HEAD` version and then the `MERGE_HEAD` version."
-msgstr ""
-"Veja as diferenças de cada ramo. O comando `git log --merge -p <caminho>` "
-"exibirá as diferenças primeiro para a versão `HEAD` e depois para a versão "
-"`MERGE_HEAD`."
+msgstr "Veja as diferenças de cada ramo. O comando `git log --merge -p <caminho>` exibirá as diferenças primeiro para a versão `HEAD` e depois para a versão `MERGE_HEAD`."
 
 #. type: Plain text
 #: en/git-merge.txt:321
 #, priority:240
 msgid "Look at the originals.  `git show :1:filename` shows the common ancestor, `git show :2:filename` shows the `HEAD` version, and `git show :3:filename` shows the `MERGE_HEAD` version."
-msgstr ""
-"Consulte os originais.  O comando `git show :1:filename` exibe o ancestral "
-"comum, `git show :2:filename` exibe a versão do `HEAD` e o `git show "
-":3:filename` exibe a versão do `MERGE_HEAD`."
+msgstr "Consulte os originais.  O comando `git show :1:filename` exibe o ancestral comum, `git show :2:filename` exibe a versão do `HEAD` e o `git show :3:filename` exibe a versão do `MERGE_HEAD`."
 
 #. type: Plain text
 #: en/git-merge.txt:328
 #, priority:240
 msgid "Merge branches `fixes` and `enhancements` on top of the current branch, making an octopus merge:"
-msgstr ""
-"Mescla as ramificações `fixes` e `enhancements` no cume do ramo atual, "
-"fazendo um conjunto de mesclagens:"
+msgstr "Mescla as ramificações `fixes` e `enhancements` no cume do ramo atual, fazendo um conjunto de mesclagens:"
 
 #. type: delimited block -
 #: en/git-merge.txt:331
@@ -38278,9 +34576,7 @@ msgstr "$ git merge fixes enhancements\n"
 #: en/git-merge.txt:335
 #, priority:240
 msgid "Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
-msgstr ""
-"Mescle o ramo `obsolete` (obsoleto) no ramo atual, utilizando a `nossa` "
-"estratégia de mesclagem:"
+msgstr "Mescle o ramo `obsolete` (obsoleto) no ramo atual, utilizando a `nossa` estratégia de mesclagem:"
 
 #. type: delimited block -
 #: en/git-merge.txt:338
@@ -38292,9 +34588,7 @@ msgstr "$ git merge -s ours obsolete\n"
 #: en/git-merge.txt:342
 #, priority:240
 msgid "Merge branch `maint` into the current branch, but do not make a new commit automatically:"
-msgstr ""
-"Mescla o ramo `maint` no ramo atual, porém não faça um novo commit de forma "
-"automática:"
+msgstr "Mescla o ramo `maint` no ramo atual, porém não faça um novo commit de forma automática:"
 
 #. type: delimited block -
 #: en/git-merge.txt:345
@@ -38306,18 +34600,13 @@ msgstr "$ git merge --no-commit maint\n"
 #: en/git-merge.txt:349
 #, priority:240
 msgid "This can be used when you want to include further changes to the merge, or want to write your own merge commit message."
-msgstr ""
-"Isso pode ser utilizado quando você queira incluir outras alterações na "
-"mesclagem ou se deseja, grave a sua própria mensagem do commit na mesclagem."
+msgstr "Isso pode ser utilizado quando você queira incluir outras alterações na mesclagem ou se deseja, grave a sua própria mensagem do commit na mesclagem."
 
 #. type: Plain text
 #: en/git-merge.txt:353
 #, priority:240
 msgid "You should refrain from abusing this option to sneak substantial changes into a merge commit.  Small fixups like bumping release/version name would be acceptable."
-msgstr ""
-"Você deve evitar abusar dessa opção para ocultar as alterações substanciais "
-"em uma mesclagem do commit.  Pequenos reparos, como o nome da versão/revisão "
-"são aceitáveis."
+msgstr "Você deve evitar abusar dessa opção para ocultar as alterações substanciais em uma mesclagem do commit.  Pequenos reparos, como o nome da versão/revisão são aceitáveis."
 
 #. type: Labeled list
 #: en/git-merge.txt:361
@@ -38329,10 +34618,7 @@ msgstr "branch.<nome>.mergeOptions"
 #: en/git-merge.txt:365
 #, priority:240
 msgid "Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported."
-msgstr ""
-"Define as opções predefinidas de mesclagem no ramo <nome>. A sintaxe e as "
-"opções que são compatíveis são iguais às do 'git merge', porém atualmente os "
-"valores das opções que contêm os caracteres de espaço não são compatíveis."
+msgstr "Define as opções predefinidas de mesclagem no ramo <nome>. A sintaxe e as opções que são compatíveis são iguais às do 'git merge', porém atualmente os valores das opções que contêm os caracteres de espaço não são compatíveis."
 
 #. type: Plain text
 #: en/git-merge.txt:374
@@ -38362,9 +34648,7 @@ msgstr "'git mktag'\n"
 #: en/git-mktag.txt:18
 #, priority:100
 msgid "Reads a tag contents on standard input and creates a tag object that can also be used to sign other objects."
-msgstr ""
-"Lê o conteúdo de uma tag na entrada padrão e cria um objeto tag que também "
-"pode ser utilizado para assinar os outros objetos."
+msgstr "Lê o conteúdo de uma tag na entrada padrão e cria um objeto tag que também pode ser utilizado para assinar os outros objetos."
 
 #. type: Plain text
 #: en/git-mktag.txt:20
@@ -38382,9 +34666,7 @@ msgstr "Formato da Tag"
 #: en/git-mktag.txt:25
 #, priority:100
 msgid "A tag signature file, to be fed to this command's standard input, has a very simple fixed format: four lines of"
-msgstr ""
-"Um arquivo de assinatura da tag que será alimentado na entrada padrão deste "
-"comando, possui um formato fixo muito simples: quatro linhas de"
+msgstr "Um arquivo de assinatura da tag que será alimentado na entrada padrão deste comando, possui um formato fixo muito simples: quatro linhas de"
 
 #. type: Plain text
 #: en/git-mktag.txt:30
@@ -38404,12 +34686,7 @@ msgstr ""
 #: en/git-mktag.txt:36
 #, priority:100
 msgid "followed by some 'optional' free-form message (some tags created by older Git may not have `tagger` line).  The message, when exists, is separated by a blank line from the header.  The message part may contain a signature that Git itself doesn't care about, but that can be verified with gpg."
-msgstr ""
-"seguido por alguma mensagem de forma livre 'opcional' (algumas tags criadas "
-"através de um Git mais antigo podem não ter a linha `tagger`).  A mensagem, "
-"quando existe, é separada por uma linha em branco do cabeçalho.  A parte da "
-"mensagem pode conter uma assinatura ignorada pelo Git mas que pode ser "
-"verificada com o gpg."
+msgstr "seguido por alguma mensagem de forma livre 'opcional' (algumas tags criadas através de um Git mais antigo podem não ter a linha `tagger`).  A mensagem, quando existe, é separada por uma linha em branco do cabeçalho.  A parte da mensagem pode conter uma assinatura ignorada pelo Git mas que pode ser verificada com o gpg."
 
 #. type: Title =
 #: en/git-mktree.txt:2
@@ -38421,8 +34698,7 @@ msgstr "git-mktree(1)"
 #: en/git-mktree.txt:7
 #, priority:100
 msgid "git-mktree - Build a tree-object from ls-tree formatted text"
-msgstr ""
-"git-mktree - Constrói um objeto árvore a partir do texto formatado em ls-tree"
+msgstr "git-mktree - Constrói um objeto árvore a partir do texto formatado em ls-tree"
 
 #. type: Plain text
 #: en/git-mktree.txt:13
@@ -38434,11 +34710,7 @@ msgstr "'git mktree' [-z] [--missing] [--batch]\n"
 #: en/git-mktree.txt:20
 #, priority:100
 msgid "Reads standard input in non-recursive `ls-tree` output format, and creates a tree object.  The order of the tree entries is normalized by mktree so pre-sorting the input is not required.  The object name of the tree object built is written to the standard output."
-msgstr ""
-"Lê a entrada padrão no formato de saída não-recursivo `ls-tree` e cria um "
-"objeto árvore.  A ordem das entradas da árvore é normalizada pelo 'mktree', "
-"portanto, a pré-classificação da entrada não é necessária.  O nome do objeto "
-"árvore construído é gravado na saída padrão."
+msgstr "Lê a entrada padrão no formato de saída não-recursivo `ls-tree` e cria um objeto árvore.  A ordem das entradas da árvore é normalizada pelo 'mktree', portanto, a pré-classificação da entrada não é necessária.  O nome do objeto árvore construído é gravado na saída padrão."
 
 #. type: Plain text
 #: en/git-mktree.txt:25
@@ -38456,22 +34728,13 @@ msgstr "--missing"
 #: en/git-mktree.txt:31
 #, priority:100
 msgid "Allow missing objects.  The default behaviour (without this option)  is to verify that each tree entry's sha1 identifies an existing object.  This option has no effect on the treatment of gitlink entries (aka \"submodules\") which are always allowed to be missing."
-msgstr ""
-"Permite os objetos que estejam ausentes.  O comportamento predefinido (sem "
-"essa opção) é verificar se o sha1 de cada entrada na árvore consegue "
-"identificar um objeto existente.  Esta opção não tem efeito no tratamento de "
-"entradas do \"gitlink\" (também conhecidas como \"submódulos\") que sempre "
-"podem estar ausentes."
+msgstr "Permite os objetos que estejam ausentes.  O comportamento predefinido (sem essa opção) é verificar se o sha1 de cada entrada na árvore consegue identificar um objeto existente.  Esta opção não tem efeito no tratamento de entradas do \"gitlink\" (também conhecidas como \"submódulos\") que sempre podem estar ausentes."
 
 #. type: Plain text
 #: en/git-mktree.txt:37
 #, priority:100
 msgid "Allow building of more than one tree object before exiting.  Each tree is separated by as single blank line. The final new-line is optional.  Note - if the `-z` option is used, lines are terminated with NUL."
-msgstr ""
-"Permita a construção de mais de um objeto árvore antes de encerrar.  Cada "
-"árvore é separada por uma única linha em branco. A nova linha final é "
-"opcional.  Observação - caso a opção `-z` for utilizado, as linhas serão "
-"terminadas com `NUL`."
+msgstr "Permita a construção de mais de um objeto árvore antes de encerrar.  Cada árvore é separada por uma única linha em branco. A nova linha final é opcional.  Observação - caso a opção `-z` for utilizado, as linhas serão terminadas com `NUL`."
 
 #. type: Title =
 #: en/git-mv.txt:2
@@ -38547,13 +34810,7 @@ msgstr "Relate os nomes dos arquivos conforme eles vão sendo movidos."
 #: en/git-mv.txt:54
 #, priority:280
 msgid "Moving a submodule using a gitfile (which means they were cloned with a Git version 1.7.8 or newer) will update the gitfile and core.worktree setting to make the submodule work in the new location.  It also will attempt to update the submodule.<name>.path setting in the linkgit:gitmodules[5] file and stage that file (unless -n is used)."
-msgstr ""
-"Mover um submódulo utilizando um gitfile (o que significa que eles foram "
-"clonados com uma versão 1.7.8 ou mais recente do Git) atualizará a "
-"configuração `gitfile` e `core.worktree` para fazer com que o submódulo "
-"funcione no novo local.  Ele também tentará atualizar o `submodule.<nome>."
-"path` no arquivo linkgit: gitmodules [5] e preparar este arquivo (a menos "
-"que a opção `-n` seja utilizada)."
+msgstr "Mover um submódulo utilizando um gitfile (o que significa que eles foram clonados com uma versão 1.7.8 ou mais recente do Git) atualizará a configuração `gitfile` e `core.worktree` para fazer com que o submódulo funcione no novo local.  Ele também tentará atualizar o `submodule.<nome>.path` no arquivo linkgit: gitmodules [5] e preparar este arquivo (a menos que a opção `-n` seja utilizada)."
 
 #. type: Plain text
 #: en/git-mv.txt:66
@@ -38587,16 +34844,13 @@ msgstr ""
 #: en/git-name-rev.txt:19
 #, priority:100
 msgid "Finds symbolic names suitable for human digestion for revisions given in any format parsable by 'git rev-parse'."
-msgstr ""
-"Localiza os nomes simbólicos adequados para a revisão das pessoas através de "
-"qualquer formato analisável pelo comando 'git rev-parse'."
+msgstr "Localiza os nomes simbólicos adequados para a revisão das pessoas através de qualquer formato analisável pelo comando 'git rev-parse'."
 
 #. type: Plain text
 #: en/git-name-rev.txt:26
 #, priority:100
 msgid "Do not use branch names, but only tags to name the commits"
-msgstr ""
-"Não utilize os nomes dos ramos e sim apenas as tags para nomear os commits"
+msgstr "Não utilize os nomes dos ramos e sim apenas as tags para nomear os commits"
 
 #. type: Labeled list
 #: en/git-name-rev.txt:27
@@ -38608,26 +34862,13 @@ msgstr "--refs=<padrão>"
 #: en/git-name-rev.txt:32
 #, priority:100
 msgid "Only use refs whose names match a given shell pattern.  The pattern can be one of branch name, tag name or fully qualified ref name. If given multiple times, use refs whose names match any of the given shell patterns. Use `--no-refs` to clear any previous ref patterns given."
-msgstr ""
-"Use apenas as refs cujos nomes coincidam com um determinado padrão shell.  O "
-"padrão pode ser um nome do ramo, nome da tag ou um nome de referência "
-"totalmente qualificado. Caso seja utilizado várias vezes, utilize as refs "
-"cujos nomes coincidam com qualquer um dos padrões shell informados. Utilize "
-"`--no-refs` para limpar quaisquer padrões \"ref\" anteriores."
+msgstr "Use apenas as refs cujos nomes coincidam com um determinado padrão shell.  O padrão pode ser um nome do ramo, nome da tag ou um nome de referência totalmente qualificado. Caso seja utilizado várias vezes, utilize as refs cujos nomes coincidam com qualquer um dos padrões shell informados. Utilize `--no-refs` para limpar quaisquer padrões \"ref\" anteriores."
 
 #. type: Plain text
 #: en/git-name-rev.txt:41
 #, priority:100
 msgid "Do not use any ref whose name matches a given shell pattern. The pattern can be one of branch name, tag name or fully qualified ref name. If given multiple times, a ref will be excluded when it matches any of the given patterns. When used together with --refs, a ref will be used as a match only when it matches at least one --refs pattern and does not match any --exclude patterns. Use `--no-exclude` to clear the list of exclude patterns."
-msgstr ""
-"Não utilize nenhuma \"ref\" cujo nome coincida com um determinado padrão "
-"shell. O padrão pode ser um nome do ramo, nome da tag ou um nome de "
-"referência totalmente qualificado. Caso seja utilizado várias vezes, uma "
-"\"ref\" será excluída quando coincidir com qualquer um dos padrões "
-"informados. Quando utilizado junto com `--refs`, uma \"ref\" será utilizada "
-"como uma correspondência apenas quando coincidir com pelo menos um padrão "
-"`--refs` e não coincidir com nenhum padrão `--exclude`. Utilize `--no-"
-"exclude` para limpar a lista dos padrões de exclusão."
+msgstr "Não utilize nenhuma \"ref\" cujo nome coincida com um determinado padrão shell. O padrão pode ser um nome do ramo, nome da tag ou um nome de referência totalmente qualificado. Caso seja utilizado várias vezes, uma \"ref\" será excluída quando coincidir com qualquer um dos padrões informados. Quando utilizado junto com `--refs`, uma \"ref\" será utilizada como uma correspondência apenas quando coincidir com pelo menos um padrão `--refs` e não coincidir com nenhum padrão `--exclude`. Utilize `--no-exclude` para limpar a lista dos padrões de exclusão."
 
 #. type: Plain text
 #: en/git-name-rev.txt:44
@@ -38645,10 +34886,7 @@ msgstr "Transform stdin by substituting all the 40-character SHA-1 hexes (say $h
 #: en/git-name-rev.txt:56
 #, priority:100
 msgid "Instead of printing both the SHA-1 and the name, print only the name.  If given with --tags the usual tag prefix of \"tags/\" is also omitted from the name, matching the output of `git-describe` more closely."
-msgstr ""
-"Em vez de imprimir o SHA-1 e o nome, imprima apenas o nome.  Caso seja "
-"utilizado com `--tags`, o prefixo usual de \"tags/\" também é omitido do "
-"nome, coincidindo mais com a saída do `git-description`."
+msgstr "Em vez de imprimir o SHA-1 e o nome, imprima apenas o nome.  Caso seja utilizado com `--tags`, o prefixo usual de \"tags/\" também é omitido do nome, coincidindo mais com a saída do `git-description`."
 
 #. type: Labeled list
 #: en/git-name-rev.txt:57
@@ -38660,19 +34898,13 @@ msgstr "--no-undefined"
 #: en/git-name-rev.txt:60
 #, priority:100
 msgid "Die with error code != 0 when a reference is undefined, instead of printing `undefined`."
-msgstr ""
-"Encerramento com um código de erro != 0 quando uma referência for "
-"indefinida, em vez de exibir `undefined`."
+msgstr "Encerramento com um código de erro != 0 quando uma referência for indefinida, em vez de exibir `undefined`."
 
 #. type: Plain text
 #: en/git-name-rev.txt:71
 #, priority:100
 msgid "Given a commit, find out where it is relative to the local refs. Say somebody wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a.  Of course, you look into the commit, but that only tells you what happened, but not the context."
-msgstr ""
-"Informado um commit, descubra onde ele é relativo às refs locais. Digamos "
-"que alguém tenha escrito sobre esse fantástico commit "
-"33db5f4d9027a10e477ccf054b2c1ab94f74c85a.  Obviamente, você analisa o "
-"commit, porém isso apenas informa o que aconteceu e não o contexto."
+msgstr "Informado um commit, descubra onde ele é relativo às refs locais. Digamos que alguém tenha escrito sobre esse fantástico commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a.  Obviamente, você analisa o commit, porém isso apenas informa o que aconteceu e não o contexto."
 
 #. type: Plain text
 #: en/git-name-rev.txt:73
@@ -38694,9 +34926,7 @@ msgstr ""
 #: en/git-name-rev.txt:80
 #, priority:100
 msgid "Now you are wiser, because you know that it happened 940 revisions before v0.99."
-msgstr ""
-"Agora você está mais esperto, pois sabe que ocorreram 940 revisões antes da "
-"versão v0.99."
+msgstr "Agora você está mais esperto, pois sabe que ocorreram 940 revisões antes da versão v0.99."
 
 #. type: Plain text
 #: en/git-name-rev.txt:82
@@ -38740,11 +34970,9 @@ msgid ""
 "'git notes' get-ref\n"
 msgstr ""
 "'git notes' [list [<objeto>]]\n"
-"'git notes' add [-f] [--allow-empty] [-F <arquivo> | -m <msg> | (-c | -C) "
-"<objeto>] [<objeto>]\n"
+"'git notes' add [-f] [--allow-empty] [-F <arquivo> | -m <msg> | (-c | -C) <objeto>] [<objeto>]\n"
 "'git notes' copy [-f] ( --stdin | <a-partir-do-objeto> [<para-o-objeto>] )\n"
-"'git notes' append [--allow-empty] [-F <arquivo> | -m <msg> | (-c | -C) "
-"<objeto>] [<objeto>]\n"
+"'git notes' append [--allow-empty] [-F <arquivo> | -m <msg> | (-c | -C) <objeto>] [<objeto>]\n"
 "'git notes' edit [--allow-empty] [<objeto>]\n"
 "'git notes' show [<objeto>]\n"
 "'git notes' merge [-v | -q] [-s <estratégia> ] <notes-ref>\n"
@@ -38758,59 +34986,37 @@ msgstr ""
 #: en/git-notes.txt:29
 #, priority:100
 msgid "Adds, removes, or reads notes attached to objects, without touching the objects themselves."
-msgstr ""
-"Adiciona, remove ou lê as anotações anexadas aos objetos, sem tocar nos "
-"próprios objetos."
+msgstr "Adiciona, remove ou lê as anotações anexadas aos objetos, sem tocar nos próprios objetos."
 
 #. type: Plain text
 #: en/git-notes.txt:34
 #, priority:100
 msgid "By default, notes are saved to and read from `refs/notes/commits`, but this default can be overridden.  See the OPTIONS, CONFIGURATION, and ENVIRONMENT sections below.  If this ref does not exist, it will be quietly created when it is first needed to store a note."
-msgstr ""
-"É predefinido que as anotações sejam salvas e lidas do `refs/notes/commits`, "
-"mas esta predefinição pode ser substituída.  Consulte as seções OPÇÕES, "
-"CONFIGURAÇÃO e AMBIENTE abaixo.  Caso esta referência não exista, ela será "
-"criada de forma silenciosa quando for necessário armazenar uma nota pela "
-"primeira vez."
+msgstr "É predefinido que as anotações sejam salvas e lidas do `refs/notes/commits`, mas esta predefinição pode ser substituída.  Consulte as seções OPÇÕES, CONFIGURAÇÃO e AMBIENTE abaixo.  Caso esta referência não exista, ela será criada de forma silenciosa quando for necessário armazenar uma nota pela primeira vez."
 
 #. type: Plain text
 #: en/git-notes.txt:41
 #, priority:100
 msgid "A typical use of notes is to supplement a commit message without changing the commit itself. Notes can be shown by 'git log' along with the original commit message. To distinguish these notes from the message stored in the commit object, the notes are indented like the message, after an unindented line saying \"Notes (<refname>):\" (or \"Notes:\" for `refs/notes/commits`)."
-msgstr ""
-"Uma utilização típica das anotações é complementar uma mensagem de um commit "
-"sem alterar o próprio commit. As anotações podem ser exibidas com o comando "
-"'git log' junto com a mensagem do commit original. Para distinguir entre "
-"estas anotações da mensagem armazenada no commit do objeto, as anotações são "
-"recuadas como a mensagem, após uma linha não recolocada dizendo \"Notes "
-"(<refname>):\" (ou \"Notes:\" para `refs/notes/commits`) ."
+msgstr "Uma utilização típica das anotações é complementar uma mensagem de um commit sem alterar o próprio commit. As anotações podem ser exibidas com o comando 'git log' junto com a mensagem do commit original. Para distinguir entre estas anotações da mensagem armazenada no commit do objeto, as anotações são recuadas como a mensagem, após uma linha não recolocada dizendo \"Notes (<refname>):\" (ou \"Notes:\" para `refs/notes/commits`) ."
 
 #. type: Plain text
 #: en/git-notes.txt:45
 #, priority:100
 msgid "Notes can also be added to patches prepared with `git format-patch` by using the `--notes` option. Such notes are added as a patch commentary after a three dash separator line."
-msgstr ""
-"As anotações também podem ser adicionadas aos patches preparados com o "
-"comando `git format-patch` utilizando a opção `--notes`. Tais anotações são "
-"adicionadas como um comentário de um patch após uma linha separadora com "
-"três traços."
+msgstr "As anotações também podem ser adicionadas aos patches preparados com o comando `git format-patch` utilizando a opção `--notes`. Tais anotações são adicionadas como um comentário de um patch após uma linha separadora com três traços."
 
 #. type: Plain text
 #: en/git-notes.txt:48
 #, priority:100
 msgid "To change which notes are shown by 'git log', see the \"notes.displayRef\" configuration in linkgit:git-log[1]."
-msgstr ""
-"Para alterar quais as anotações são exibidas através do comando 'git log', "
-"consulte a configuração \"notes.displayRef\" no linkgit:git-log[1]."
+msgstr "Para alterar quais as anotações são exibidas através do comando 'git log', consulte a configuração \"notes.displayRef\" no linkgit:git-log[1]."
 
 #. type: Plain text
 #: en/git-notes.txt:51
 #, priority:100
 msgid "See the \"notes.rewrite.<command>\" configuration for a way to carry notes across commands that rewrite commits."
-msgstr ""
-"Consulte a configuração \"notes.rewrite.<comando>\" para conhecer uma "
-"maneira de transportar as anotações através dos comandos que reescrevem os "
-"commits."
+msgstr "Consulte a configuração \"notes.rewrite.<comando>\" para conhecer uma maneira de transportar as anotações através dos comandos que reescrevem os commits."
 
 #. type: Title -
 #: en/git-notes.txt:54
@@ -38828,11 +35034,7 @@ msgstr "list"
 #: en/git-notes.txt:61
 #, priority:100
 msgid "List the notes object for a given object. If no object is given, show a list of all note objects and the objects they annotate (in the format \"<note object> <annotated object>\").  This is the default subcommand if no subcommand is given."
-msgstr ""
-"Liste as anotações do objeto para um determinado objeto. Caso nenhum objeto "
-"seja informado, exiba uma lista com todas as anotações dos objetos e os "
-"objetos que eles anotam (no formato \"<nota do objeto> <objeto anotado>\").  "
-"Este é o subcomando predefinido caso nenhum subcomando seja utilizado."
+msgstr "Liste as anotações do objeto para um determinado objeto. Caso nenhum objeto seja informado, exiba uma lista com todas as anotações dos objetos e os objetos que eles anotam (no formato \"<nota do objeto> <objeto anotado>\").  Este é o subcomando predefinido caso nenhum subcomando seja utilizado."
 
 #. type: Labeled list
 #: en/git-notes.txt:62
@@ -38844,13 +35046,7 @@ msgstr "add"
 #: en/git-notes.txt:69
 #, priority:100
 msgid "Add notes for a given object (defaults to HEAD). Abort if the object already has notes (use `-f` to overwrite existing notes).  However, if you're using `add` interactively (using an editor to supply the notes contents), then - instead of aborting - the existing notes will be opened in the editor (like the `edit` subcommand)."
-msgstr ""
-"Adiciona anotações para um determinado objeto (a predefinição retorna para "
-"`HEAD`). Interrompa caso o objeto já tiver anotações (utilize `-f` para "
-"substituir as anotações já existentes).  No entanto, caso você esteja "
-"utilizando `add` de forma interativa (utilizando um editor para editar o "
-"conteúdo das notas), então - em vez de interromper - as anotações já "
-"existentes serão abertas no editor (como o subcomando `edit`)."
+msgstr "Adiciona anotações para um determinado objeto (a predefinição retorna para `HEAD`). Interrompa caso o objeto já tiver anotações (utilize `-f` para substituir as anotações já existentes).  No entanto, caso você esteja utilizando `add` de forma interativa (utilizando um editor para editar o conteúdo das notas), então - em vez de interromper - as anotações já existentes serão abertas no editor (como o subcomando `edit`)."
 
 #. type: Labeled list
 #: en/git-notes.txt:70
@@ -38862,12 +35058,7 @@ msgstr "copy"
 #: en/git-notes.txt:76
 #, priority:100
 msgid "Copy the notes for the first object onto the second object (defaults to HEAD). Abort if the second object already has notes, or if the first object has none (use -f to overwrite existing notes to the second object). This subcommand is equivalent to: `git notes add [-f] -C $(git notes list <from-object>) <to-object>`"
-msgstr ""
-"Copie as anotações para o primeiro objeto no segundo (a predefinição retorna "
-"para `HEAD`). Interrompa caso o segundo objeto já tenha as anotações ou caso "
-"o primeiro objeto não tiver nenhuma (utilize '-f' para substituir as "
-"anotações existentes no segundo objeto). Este subcomando se equivale a: `git "
-"notes add [-f] -C $(git notes list <do-objeto>) <para-o-objeto>`"
+msgstr "Copie as anotações para o primeiro objeto no segundo (a predefinição retorna para `HEAD`). Interrompa caso o segundo objeto já tenha as anotações ou caso o primeiro objeto não tiver nenhuma (utilize '-f' para substituir as anotações existentes no segundo objeto). Este subcomando se equivale a: `git notes add [-f] -C $(git notes list <do-objeto>) <para-o-objeto>`"
 
 #. type: Plain text
 #: en/git-notes.txt:78
@@ -38885,10 +35076,7 @@ msgstr "<do-objeto> SP <para-o-objeto> [ SP <rest> ] LF\n"
 #: en/git-notes.txt:86
 #, priority:100
 msgid "on standard input, and copy the notes from each <from-object> to its corresponding <to-object>.  (The optional `<rest>` is ignored so that the command can read the input given to the `post-rewrite` hook.)"
-msgstr ""
-"na entrada padrão e copie as anotações de cada <do-objeto> para o seu "
-"<para-o-objeto> correspondente.  (O `<rest>` opcional é ignorado para que o "
-"comando possa ler a entrada informada ao gancho `post-rewrite`.)"
+msgstr "na entrada padrão e copie as anotações de cada <do-objeto> para o seu <para-o-objeto> correspondente.  (O `<rest>` opcional é ignorado para que o comando possa ler a entrada informada ao gancho `post-rewrite`.)"
 
 #. type: Labeled list
 #: en/git-notes.txt:87
@@ -38900,9 +35088,7 @@ msgstr "append"
 #: en/git-notes.txt:90
 #, priority:100
 msgid "Append to the notes of an existing object (defaults to HEAD).  Creates a new notes object if needed."
-msgstr ""
-"Anexe às anotações de um objeto já existente (a predefinição retorna para "
-"`HEAD`).  Cria uma nova anotação no objeto, caso seja necessário."
+msgstr "Anexe às anotações de um objeto já existente (a predefinição retorna para `HEAD`).  Cria uma nova anotação no objeto, caso seja necessário."
 
 #. type: Labeled list
 #: en/git-notes.txt:91
@@ -38914,9 +35100,7 @@ msgstr "edit"
 #: en/git-notes.txt:93
 #, priority:100
 msgid "Edit the notes for a given object (defaults to HEAD)."
-msgstr ""
-"Edite as anotações para um determinado objeto (a predefinição retorna para "
-"`HEAD`)."
+msgstr "Edite as anotações para um determinado objeto (a predefinição retorna para `HEAD`)."
 
 #. type: Labeled list
 #: en/git-notes.txt:94
@@ -38928,9 +35112,7 @@ msgstr "show"
 #: en/git-notes.txt:96
 #, priority:100
 msgid "Show the notes for a given object (defaults to HEAD)."
-msgstr ""
-"Mostrar as anotações para um determinado objeto (a predefinição retorna para "
-"`HEAD`)."
+msgstr "Mostrar as anotações para um determinado objeto (a predefinição retorna para `HEAD`)."
 
 #. type: Labeled list
 #: en/git-notes.txt:97 en/git-submodule.txt:160
@@ -38942,25 +35124,13 @@ msgstr "merge"
 #: en/git-notes.txt:102
 #, priority:100
 msgid "Merge the given notes ref into the current notes ref.  This will try to merge the changes made by the given notes ref (called \"remote\") since the merge-base (if any) into the current notes ref (called \"local\")."
-msgstr ""
-"Mescle as anotações \"ref\" informadas nas anotações \"ref\" atuais.  Será "
-"feita uma tentativa para mesclar as alterações feitas através das anotações "
-"\"ref\" informada (chamadas \"remotas\") desde a base de mesclagem (caso "
-"haja) nas anotações \"ref\" atuais (chamadas \"locais\")."
+msgstr "Mescle as anotações \"ref\" informadas nas anotações \"ref\" atuais.  Será feita uma tentativa para mesclar as alterações feitas através das anotações \"ref\" informada (chamadas \"remotas\") desde a base de mesclagem (caso haja) nas anotações \"ref\" atuais (chamadas \"locais\")."
 
 #. type: Plain text
 #: en/git-notes.txt:111
 #, priority:100
 msgid "If conflicts arise and a strategy for automatically resolving conflicting notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual\" resolver is used. This resolver checks out the conflicting notes in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to manually resolve the conflicts there.  When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
-msgstr ""
-"Caso surjam conflitos e uma estratégia para resolver automaticamente as "
-"notas conflitantes (consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA "
-"MESCLAGEM\") não sejam utilizadas, o resolvedor \"manual\" será utilizado. "
-"Este resolvedor verifica se as notas conflitantes em uma árvore de trabalho "
-"especial (`.git/NOTES_MERGE_WORKTREE`) instrui o usuário a resolver "
-"manualmente os conflitos lá.  Quando for concluído, o usuário pode finalizar "
-"a mesclagem com o comando 'git notes merge --commit' ou interromper a "
-"mesclagem com o comando 'git notes merge --abort'."
+msgstr "Caso surjam conflitos e uma estratégia para resolver automaticamente as notas conflitantes (consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM\") não sejam utilizadas, o resolvedor \"manual\" será utilizado. Este resolvedor verifica se as notas conflitantes em uma árvore de trabalho especial (`.git/NOTES_MERGE_WORKTREE`) instrui o usuário a resolver manualmente os conflitos lá.  Quando for concluído, o usuário pode finalizar a mesclagem com o comando 'git notes merge --commit' ou interromper a mesclagem com o comando 'git notes merge --abort'."
 
 #. type: Labeled list
 #: en/git-notes.txt:112 en/git-worktree.txt:105
@@ -38972,10 +35142,7 @@ msgstr "remove"
 #: en/git-notes.txt:117
 #, priority:100
 msgid "Remove the notes for given objects (defaults to HEAD). When giving zero or one object from the command line, this is equivalent to specifying an empty note message to the `edit` subcommand."
-msgstr ""
-"Remova as anotações para determinados objetos (a predefinição retorna para "
-"`HEAD`). Ao atribuir zero ou um objeto a partir da linha de comando, isso "
-"equivale a informar uma mensagem com anotação vazia para o subcomando `edit`."
+msgstr "Remova as anotações para determinados objetos (a predefinição retorna para `HEAD`). Ao atribuir zero ou um objeto a partir da linha de comando, isso equivale a informar uma mensagem com anotação vazia para o subcomando `edit`."
 
 #. type: Labeled list
 #: en/git-notes.txt:118 en/git-worktree.txt:101
@@ -38999,37 +35166,25 @@ msgstr "get-ref"
 #: en/git-notes.txt:124
 #, priority:100
 msgid "Print the current notes ref. This provides an easy way to retrieve the current notes ref (e.g. from scripts)."
-msgstr ""
-"Exiba as anotações \"ref\" atuais. Fornece uma maneira fácil de recuperar as "
-"anotações \"ref\" atuais (dos scripts por exemplo)."
+msgstr "Exiba as anotações \"ref\" atuais. Fornece uma maneira fácil de recuperar as anotações \"ref\" atuais (dos scripts por exemplo)."
 
 #. type: Plain text
 #: en/git-notes.txt:131
 #, priority:100
 msgid "When adding notes to an object that already has notes, overwrite the existing notes (instead of aborting)."
-msgstr ""
-"Ao adicionar as anotações em um objeto que já possa anotações, substitua as "
-"anotações existentes (em vez de abortar)."
+msgstr "Ao adicionar as anotações em um objeto que já possa anotações, substitua as anotações existentes (em vez de abortar)."
 
 #. type: Plain text
 #: en/git-notes.txt:139
 #, priority:100
 msgid "Use the given note message (instead of prompting).  If multiple `-m` options are given, their values are concatenated as separate paragraphs.  Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
-msgstr ""
-"Utilize uma mensagem da anotação informada (em vez de solicitar).  Caso "
-"várias opções `-m` seja informadas, os seus valores serão concatenados como "
-"parágrafos separados.  Serão removidas as linhas começando com `#` e as "
-"linhas vazias que não estejam em uma única linha entre os parágrafos."
+msgstr "Utilize uma mensagem da anotação informada (em vez de solicitar).  Caso várias opções `-m` seja informadas, os seus valores serão concatenados como parágrafos separados.  Serão removidas as linhas começando com `#` e as linhas vazias que não estejam em uma única linha entre os parágrafos."
 
 #. type: Plain text
 #: en/git-notes.txt:146
 #, priority:100
 msgid "Take the note message from the given file.  Use '-' to read the note message from the standard input.  Lines starting with `#` and empty lines other than a single line between paragraphs will be stripped out."
-msgstr ""
-"Pegue a mensagem da anotação do arquivo informado.  Utilize '-' para ler a "
-"mensagem da nota vindo da entrada padrão.  Serão removidas as linhas "
-"começando com `#` e as linhas vazias que não estejam em uma única linha "
-"entre os parágrafos."
+msgstr "Pegue a mensagem da anotação do arquivo informado.  Utilize '-' para ler a mensagem da nota vindo da entrada padrão.  Serão removidas as linhas começando com `#` e as linhas vazias que não estejam em uma única linha entre os parágrafos."
 
 #. type: Labeled list
 #: en/git-notes.txt:147
@@ -39047,10 +35202,7 @@ msgstr "--reuse-message=<objeto>"
 #: en/git-notes.txt:152
 #, priority:100
 msgid "Take the given blob object (for example, another note) as the note message. (Use `git notes copy <object>` instead to copy notes between objects.)"
-msgstr ""
-"Tome o objeto bolha informada (outra nota por exemplo) como uma mensagem da "
-"nota. (Utiliza `git notes copy <objeto>` em vez da copia das notas entre os "
-"objetos.)"
+msgstr "Tome o objeto bolha informada (outra nota por exemplo) como uma mensagem da nota. (Utiliza `git notes copy <objeto>` em vez da copia das notas entre os objetos.)"
 
 #. type: Labeled list
 #: en/git-notes.txt:153
@@ -39068,17 +35220,13 @@ msgstr "--reedit-message=<objeto>"
 #: en/git-notes.txt:157
 #, priority:100
 msgid "Like '-C', but with `-c` the editor is invoked, so that the user can further edit the note message."
-msgstr ""
-"Assim como '-C', porém com `-c` o editor é invocado para que o usuário possa "
-"editar mais a mensagem da nota."
+msgstr "Assim como '-C', porém com `-c` o editor é invocado para que o usuário possa editar mais a mensagem da nota."
 
 #. type: Plain text
 #: en/git-notes.txt:161
 #, priority:100
 msgid "Allow an empty note object to be stored. The default behavior is to automatically remove empty notes."
-msgstr ""
-"Permita que uma anotação vazia do objeto seja armazenado. O comportamento "
-"predefinido é remover automaticamente as anotações que estiverem vazias."
+msgstr "Permita que uma anotação vazia do objeto seja armazenado. O comportamento predefinido é remover automaticamente as anotações que estiverem vazias."
 
 #. type: Labeled list
 #: en/git-notes.txt:162
@@ -39090,36 +35238,25 @@ msgstr "--ref <ref>"
 #: en/git-notes.txt:168
 #, priority:100
 msgid "Manipulate the notes tree in <ref>.  This overrides `GIT_NOTES_REF` and the \"core.notesRef\" configuration.  The ref specifies the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
-msgstr ""
-"Manipule as anotações da árvore na <ref>.  Sobrescreve o `GIT_NOTES_REF` e a "
-"configuração \"core.notesRef\".  A \"ref\" determina o nome completo quando "
-"começa com `refs/notes/`; quando começa com `notes/`, `refs/` e caso "
-"contrário `refs/notes/` é prefixado para formar um nome completo da \"ref\"."
+msgstr "Manipule as anotações da árvore na <ref>.  Sobrescreve o `GIT_NOTES_REF` e a configuração \"core.notesRef\".  A \"ref\" determina o nome completo quando começa com `refs/notes/`; quando começa com `notes/`, `refs/` e caso contrário `refs/notes/` é prefixado para formar um nome completo da \"ref\"."
 
 #. type: Plain text
 #: en/git-notes.txt:172
 #, priority:100
 msgid "Do not consider it an error to request removing notes from an object that does not have notes attached to it."
-msgstr ""
-"Não considere um erro ao solicitar a remoção das anotações de um objeto que "
-"não possua anotações anexadas."
+msgstr "Não considere um erro ao solicitar a remoção das anotações de um objeto que não possua anotações anexadas."
 
 #. type: Plain text
 #: en/git-notes.txt:177
 #, priority:100
 msgid "Also read the object names to remove notes from the standard input (there is no reason you cannot combine this with object names from the command line)."
-msgstr ""
-"Leia também os nomes dos objetos para remover anotações da entrada padrão ("
-"não há motivo para não combinar isso com os nomes dos objetos na linha de "
-"comando)."
+msgstr "Leia também os nomes dos objetos para remover anotações da entrada padrão (não há motivo para não combinar isso com os nomes dos objetos na linha de comando)."
 
 #. type: Plain text
 #: en/git-notes.txt:182
 #, priority:100
 msgid "Do not remove anything; just report the object names whose notes would be removed."
-msgstr ""
-"Não remova nada; apenas relate os nomes dos objetos cujas anotações seriam "
-"removidas."
+msgstr "Não remova nada; apenas relate os nomes dos objetos cujas anotações seriam removidas."
 
 #. type: Labeled list
 #: en/git-notes.txt:183 en/git-rebase.txt:360 en/merge-options.txt:119
@@ -39131,14 +35268,7 @@ msgstr "-s <estratégia>"
 #: en/git-notes.txt:191
 #, priority:100
 msgid "When merging notes, resolve notes conflicts using the given strategy. The following strategies are recognized: \"manual\" (default), \"ours\", \"theirs\", \"union\" and \"cat_sort_uniq\".  This option overrides the \"notes.mergeStrategy\" configuration setting.  See the \"NOTES MERGE STRATEGIES\" section below for more information on each notes merge strategy."
-msgstr ""
-"Ao mesclar as anotações, resolva os conflitos das anotações utilizando uma "
-"determinada estratégia. As seguintes estratégias são reconhecidas: \"manual\""
-" (predefinido), \"ours\" (nosso), \"theirs\" (deles), \"union\" (união) e "
-"\"cat_sort_uniq\".  Esta opção substitui a configuração \"notes."
-"mergeStrategy\".  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA "
-"MESCLAGEM\" abaixo para obter mais informações sobre a estratégia de "
-"mesclagem de cada nota."
+msgstr "Ao mesclar as anotações, resolva os conflitos das anotações utilizando uma determinada estratégia. As seguintes estratégias são reconhecidas: \"manual\" (predefinido), \"ours\" (nosso), \"theirs\" (deles), \"union\" (união) e \"cat_sort_uniq\".  Esta opção substitui a configuração \"notes.mergeStrategy\".  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM\" abaixo para obter mais informações sobre a estratégia de mesclagem de cada nota."
 
 #. type: Labeled list
 #: en/git-notes.txt:192 en/merge-options.txt:1
@@ -39150,23 +35280,13 @@ msgstr "--commit"
 #: en/git-notes.txt:200
 #, priority:100
 msgid "Finalize an in-progress 'git notes merge'. Use this option when you have resolved the conflicts that 'git notes merge' stored in .git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF symref is updated to the resulting commit."
-msgstr ""
-"Finalize um 'git notes merge' em andamento. Utilize esta opção quando tiver "
-"resolvido os conflitos que o comando 'git notes merge' armazenou em `.git/"
-"NOTES_MERGE_WORKTREE`. Isso altera o commit parcial da mesclagem criado pelo "
-"comando 'git notes merge' (armazenado em `.git/NOTES_MERGE_PARTIAL`) "
-"adicionando as anotações em `.git/NOTES_MERGE_WORKTREE`. As notas \"ref\" "
-"armazenadas no 'symref' `.git/NOTES_MERGE_REF` são atualizadas no commit "
-"resultante."
+msgstr "Finalize um 'git notes merge' em andamento. Utilize esta opção quando tiver resolvido os conflitos que o comando 'git notes merge' armazenou em `.git/NOTES_MERGE_WORKTREE`. Isso altera o commit parcial da mesclagem criado pelo comando 'git notes merge' (armazenado em `.git/NOTES_MERGE_PARTIAL`) adicionando as anotações em `.git/NOTES_MERGE_WORKTREE`. As notas \"ref\" armazenadas no 'symref' `.git/NOTES_MERGE_REF` são atualizadas no commit resultante."
 
 #. type: Plain text
 #: en/git-notes.txt:205
 #, priority:100
 msgid "Abort/reset an in-progress 'git notes merge', i.e. a notes merge with conflicts. This simply removes all files related to the notes merge."
-msgstr ""
-"Interrompa/redefina um comando 'git notes merge' em andamento, ou seja, "
-"mesmo com conflitos, uma anotação será mesclada. Simplesmente remove todos "
-"os arquivos relacionados as anotações da mesclagem."
+msgstr "Interrompa/redefina um comando 'git notes merge' em andamento, ou seja, mesmo com conflitos, uma anotação será mesclada. Simplesmente remove todos os arquivos relacionados as anotações da mesclagem."
 
 #. type: Plain text
 #: en/git-notes.txt:209
@@ -39178,45 +35298,25 @@ msgstr "Quando mesclar as anotações, opere em silêncio."
 #: en/git-notes.txt:215
 #, priority:100
 msgid "When merging notes, be more verbose.  When pruning notes, report all object names whose notes are removed."
-msgstr ""
-"Quando mesclar as anotações, seja loquaz.  Quando remover as anotações, "
-"relate todos os nomes dos objetos cujas notas foram removidas."
+msgstr "Quando mesclar as anotações, seja loquaz.  Quando remover as anotações, relate todos os nomes dos objetos cujas notas foram removidas."
 
 #. type: Plain text
 #: en/git-notes.txt:229
 #, ignore-ellipsis, priority:100
 msgid "Commit notes are blobs containing extra information about an object (usually information to supplement a commit's message).  These blobs are taken from notes refs.  A notes ref is usually a branch which contains \"files\" whose paths are the object names for the objects they describe, with some directory separators included for performance reasons footnote:[Permitted pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory names of two hexadecimal digits each followed by a filename with the rest of the object ID.]."
-msgstr ""
-"As anotações dos commits são bolhas que contêm informações extras sobre um "
-"objeto (geralmente informações para complementar a mensagem de um commit).  "
-"Estas bolhas são retiradas das anotações refs.  Uma anotação \"ref\" "
-"geralmente é um ramo que contém \"arquivos\" cujos caminhos são os nomes dos "
-"objetos que o descrevem, com alguns separadores do diretório incluídos por "
-"motivos de desempenho, nota de rodapé: [Os nomes dos caminhos permitidos têm "
-"o formato 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': uma sequência com os "
-"nomes dos diretórios com dois dígitos hexadecimais cada um, seguido por um "
-"nome do arquivo com o resto do ID do objeto.]."
+msgstr "As anotações dos commits são bolhas que contêm informações extras sobre um objeto (geralmente informações para complementar a mensagem de um commit).  Estas bolhas são retiradas das anotações refs.  Uma anotação \"ref\" geralmente é um ramo que contém \"arquivos\" cujos caminhos são os nomes dos objetos que o descrevem, com alguns separadores do diretório incluídos por motivos de desempenho, nota de rodapé: [Os nomes dos caminhos permitidos têm o formato 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': uma sequência com os nomes dos diretórios com dois dígitos hexadecimais cada um, seguido por um nome do arquivo com o resto do ID do objeto.]."
 
 #. type: Plain text
 #: en/git-notes.txt:236
 #, priority:100
 msgid "Every notes change creates a new commit at the specified notes ref.  You can therefore inspect the history of the notes by invoking, e.g., `git log -p notes/commits`.  Currently the commit message only records which operation triggered the update, and the commit authorship is determined according to the usual rules (see linkgit:git-commit[1]).  These details may change in the future."
-msgstr ""
-"Cada modificação nas anotações cria um novo commit nas anotações \"ref\" "
-"especificadas.  Portanto, você pode inspecionar o histórico das notas "
-"invocando por exemplo o comando `git log -p notes/commits`.  Atualmente, a "
-"mensagem do commit registra apenas qual a operação acionou a atualização, já "
-"a autoria da confirmação é determinada de acordo com as regras usuais ("
-"consulte linkgit:git-commit[1]).  Estes detalhes podem mudar no futuro."
+msgstr "Cada modificação nas anotações cria um novo commit nas anotações \"ref\" especificadas.  Portanto, você pode inspecionar o histórico das notas invocando por exemplo o comando `git log -p notes/commits`.  Atualmente, a mensagem do commit registra apenas qual a operação acionou a atualização, já a autoria da confirmação é determinada de acordo com as regras usuais (consulte linkgit:git-commit[1]).  Estes detalhes podem mudar no futuro."
 
 #. type: Plain text
 #: en/git-notes.txt:240
 #, priority:100
 msgid "It is also permitted for a notes ref to point directly to a tree object, in which case the history of the notes can be read with `git log -p -g <refname>`."
-msgstr ""
-"Também é permitido que uma anotação da \"ref\" aponte diretamente para um "
-"objeto na árvore, caso onde o histórico das anotações podem ser lidos com `"
-"git log -p -g <refname>`."
+msgstr "Também é permitido que uma anotação da \"ref\" aponte diretamente para um objeto na árvore, caso onde o histórico das anotações podem ser lidos com `git log -p -g <refname>`."
 
 #. type: Title -
 #: en/git-notes.txt:243
@@ -39228,70 +35328,43 @@ msgstr "OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM"
 #: en/git-notes.txt:252
 #, priority:100
 msgid "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree.  When done, the user can either finalize the merge with 'git notes merge --commit', or abort the merge with 'git notes merge --abort'."
-msgstr ""
-"The default notes merge strategy is \"manual\", which checks out conflicting "
-"notes in a special work tree for resolving notes conflicts (`.git/"
-"NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in "
-"that work tree.  Quando for concluído, o usuário pode finalizar a mesclagem "
-"com o comando 'git notes merge --commit' ou interromper a mesclagem com o "
-"comando 'git notes merge --abort'."
+msgstr "The default notes merge strategy is \"manual\", which checks out conflicting notes in a special work tree for resolving notes conflicts (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in that work tree.  Quando for concluído, o usuário pode finalizar a mesclagem com o comando 'git notes merge --commit' ou interromper a mesclagem com o comando 'git notes merge --abort'."
 
 #. type: Plain text
 #: en/git-notes.txt:255
 #, priority:100
 msgid "Users may select an automated merge strategy from among the following using either -s/--strategy option or configuring notes.mergeStrategy accordingly:"
-msgstr ""
-"Os usuários podem selecionar uma estratégia de mesclagem automatizada dentre "
-"as opções a seguir, utilizando a opção `-s/--strategy` ou configurando a "
-"opção `notes.mergeStrategy` de acordo:"
+msgstr "Os usuários podem selecionar uma estratégia de mesclagem automatizada dentre as opções a seguir, utilizando a opção `-s/--strategy` ou configurando a opção `notes.mergeStrategy` de acordo:"
 
 #. type: Plain text
 #: en/git-notes.txt:258
 #, priority:100
 msgid "\"ours\" automatically resolves conflicting notes in favor of the local version (i.e. the current notes ref)."
-msgstr ""
-"O \"ours\" (nosso) resolve automaticamente as anotações conflitantes em "
-"favor da versão local (ou seja, as anotações \"ref\" atuais)."
+msgstr "O \"ours\" (nosso) resolve automaticamente as anotações conflitantes em favor da versão local (ou seja, as anotações \"ref\" atuais)."
 
 #. type: Plain text
 #: en/git-notes.txt:262
 #, priority:100
 msgid "\"theirs\" automatically resolves notes conflicts in favor of the remote version (i.e. the given notes ref being merged into the current notes ref)."
-msgstr ""
-"O \"deles\" resolve automaticamente os conflitos das anotações em favor da "
-"versão remota (ou seja, as anotações dadas ao \"ref\" são mescladas nas "
-"anotações atuais da \"ref\")."
+msgstr "O \"deles\" resolve automaticamente os conflitos das anotações em favor da versão remota (ou seja, as anotações dadas ao \"ref\" são mescladas nas anotações atuais da \"ref\")."
 
 #. type: Plain text
 #: en/git-notes.txt:265
 #, priority:100
 msgid "\"union\" automatically resolves notes conflicts by concatenating the local and remote versions."
-msgstr ""
-"O \"union\" resolve automaticamente os conflitos das anotações concatenando "
-"as versões locais e remotas."
+msgstr "O \"union\" resolve automaticamente os conflitos das anotações concatenando as versões locais e remotas."
 
 #. type: Plain text
 #: en/git-notes.txt:275
 #, priority:100
 msgid "\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating the local and remote versions, this strategy also sorts the resulting lines, and removes duplicate lines from the result. This is equivalent to applying the \"cat | sort | uniq\" shell pipeline to the local and remote versions. This strategy is useful if the notes follow a line-based format where one wants to avoid duplicated lines in the merge result.  Note that if either the local or remote version contain duplicate lines prior to the merge, these will also be removed by this notes merge strategy."
-msgstr ""
-"O \"cat_sort_uniq\" é semelhante ao \"union\", porém, além de concatenar as "
-"versões locais e remotas, essa estratégia também classifica as linhas "
-"resultantes e remove as linhas que estiverem no resultado. Isso é "
-"equivalente ao aplicação do pipeline shell \"cat | sort | uniq\" nas versões "
-"locais e remotos. Essa estratégia é útil caso as notas sigam um formato com "
-"base nas linhas, onde se deseja evitar as linhas duplicadas no resultado da "
-"mesclagem.  Observe que, caso a versão local ou remota tiver linhas "
-"duplicadas antes da mesclagem, elas também serão removidas por esta anotação "
-"estratégica de mesclagem."
+msgstr "O \"cat_sort_uniq\" é semelhante ao \"union\", porém, além de concatenar as versões locais e remotas, essa estratégia também classifica as linhas resultantes e remove as linhas que estiverem no resultado. Isso é equivalente ao aplicação do pipeline shell \"cat | sort | uniq\" nas versões locais e remotos. Essa estratégia é útil caso as notas sigam um formato com base nas linhas, onde se deseja evitar as linhas duplicadas no resultado da mesclagem.  Observe que, caso a versão local ou remota tiver linhas duplicadas antes da mesclagem, elas também serão removidas por esta anotação estratégica de mesclagem."
 
 #. type: Plain text
 #: en/git-notes.txt:282
 #, priority:100
 msgid "You can use notes to add annotations with information that was not available at the time a commit was written."
-msgstr ""
-"Você pode utilizar notas para adicionar anotações com as informação do que "
-"não estava disponível no momento em que o commit foi feito."
+msgstr "Você pode utilizar notas para adicionar anotações com as informação do que não estava disponível no momento em que o commit foi feito."
 
 #. type: delimited block -
 #: en/git-notes.txt:288
@@ -39321,10 +35394,7 @@ msgstr ""
 #: en/git-notes.txt:296
 #, priority:100
 msgid "In principle, a note is a regular Git blob, and any kind of (non-)format is accepted.  You can binary-safely create notes from arbitrary files using 'git hash-object':"
-msgstr ""
-"Em princípio, uma anotação é uma bolha Git comum e qualquer outro tipo de "
-"formato (não) é aceito.  Você pode criar com segurança as anotações binárias "
-"a partir de arquivos arbitrários utilizando o comando 'git hash-object':"
+msgstr "Em princípio, uma anotação é uma bolha Git comum e qualquer outro tipo de formato (não) é aceito.  Você pode criar com segurança as anotações binárias a partir de arquivos arbitrários utilizando o comando 'git hash-object':"
 
 #. type: delimited block -
 #: en/git-notes.txt:301
@@ -39342,13 +35412,7 @@ msgstr ""
 #: en/git-notes.txt:308
 #, priority:100
 msgid "(You cannot simply use `git notes --ref=built add -F a.out HEAD` because that is not binary-safe.)  Of course, it doesn't make much sense to display non-text-format notes with 'git log', so if you use such notes, you'll probably need to write some special-purpose tools to do something useful with them."
-msgstr ""
-"(Você não pode simplesmente utilizar o comando `git notes --ref=built add -F "
-"a.out HEAD` porque isso não é seguro para os arquivos binários.) É claro que "
-"não faz muito sentido exibir as anotações que não foram formatadas com 'git "
-"log', portanto, caso utilize estas anotações, provavelmente precisará "
-"escrever algumas ferramentas com um propósito especial para fazer algo útil "
-"com elas."
+msgstr "(Você não pode simplesmente utilizar o comando `git notes --ref=built add -F a.out HEAD` porque isso não é seguro para os arquivos binários.) É claro que não faz muito sentido exibir as anotações que não foram formatadas com 'git log', portanto, caso utilize estas anotações, provavelmente precisará escrever algumas ferramentas com um propósito especial para fazer algo útil com elas."
 
 #. type: Labeled list
 #: en/git-notes.txt:313
@@ -39360,10 +35424,7 @@ msgstr "core.notesRef"
 #: en/git-notes.txt:318
 #, priority:100
 msgid "Notes ref to read and manipulate instead of `refs/notes/commits`.  Must be an unabbreviated ref name.  This setting can be overridden through the environment and command line."
-msgstr ""
-"Notas \"ref\" para ler e manipular em vez do `refs/notes/commits`.  Deve ser "
-"um nome \"ref\" sem abreviação.  Esta configuração pode ser substituída por "
-"uma variável de ambiente e através da linha de comando."
+msgstr "Notas \"ref\" para ler e manipular em vez do `refs/notes/commits`.  Deve ser um nome \"ref\" sem abreviação.  Esta configuração pode ser substituída por uma variável de ambiente e através da linha de comando."
 
 #. type: Labeled list
 #: en/git-notes.txt:319
@@ -39375,19 +35436,13 @@ msgstr "notes.mergeStrategy"
 #: en/git-notes.txt:324
 #, priority:100
 msgid "Which merge strategy to choose by default when resolving notes conflicts.  Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`.  Defaults to `manual`.  See \"NOTES MERGE STRATEGIES\" section above for more information on each strategy."
-msgstr ""
-"Qual estratégia predefinida de mesclagem escolher ao resolver os conflitos "
-"das anotações.  Deve ser uma das opções `manual`, `ours` (nosso), `theirs` "
-"(deles), `union` (união) ou `cat_sort_uniq`.  A predefinição retorna para "
-"`manual`.  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM\""
-" acima para obter mais informações sobre cada estratégia."
+msgstr "Qual estratégia predefinida de mesclagem escolher ao resolver os conflitos das anotações.  Deve ser uma das opções `manual`, `ours` (nosso), `theirs` (deles), `union` (união) ou `cat_sort_uniq`.  A predefinição retorna para `manual`.  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM\" acima para obter mais informações sobre cada estratégia."
 
 #. type: Plain text
 #: en/git-notes.txt:326
 #, priority:100
 msgid "This setting can be overridden by passing the `--strategy` option."
-msgstr ""
-"Esta configuração pode ser substituída ao utilizar a opção `--strategy`."
+msgstr "Esta configuração pode ser substituída ao utilizar a opção `--strategy`."
 
 #. type: Labeled list
 #: en/git-notes.txt:327
@@ -39399,24 +35454,13 @@ msgstr "notes.<nome>.mergeStrategy"
 #: en/git-notes.txt:332
 #, priority:100
 msgid "Which merge strategy to choose when doing a notes merge into refs/notes/<name>.  This overrides the more general \"notes.mergeStrategy\".  See the \"NOTES MERGE STRATEGIES\" section above for more information on each available strategy."
-msgstr ""
-"Qual estratégia de mesclagem escolher ao fazer uma anotação na mesclagem em `"
-"refs/notes/<nome>`.  Isso substitui a opção \"notes.mergeStrategy\" que é "
-"mais genérica.  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA "
-"MESCLAGEM\" acima para obter mais informações sobre cada estratégia "
-"disponível."
+msgstr "Qual estratégia de mesclagem escolher ao fazer uma anotação na mesclagem em `refs/notes/<nome>`.  Isso substitui a opção \"notes.mergeStrategy\" que é mais genérica.  Consulte a seção \"OBSERVAÇÕES SOBRE AS ESTRATÉGIAS DA MESCLAGEM\" acima para obter mais informações sobre cada estratégia disponível."
 
 #. type: Plain text
 #: en/git-notes.txt:341
 #, priority:100
 msgid "Which ref (or refs, if a glob or specified more than once), in addition to the default set by `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages with the 'git log' family of commands.  This setting can be overridden on the command line or by the `GIT_NOTES_DISPLAY_REF` environment variable.  See linkgit:git-log[1]."
-msgstr ""
-"Qual ref (ou refs, caso um \"glob\" seja especificado mais de uma vez), além "
-"do padrão definido pela variável `core.notesRef` ou` GIT_NOTES_REF`, para "
-"ler as anotações durante a exibição das mensagens do commit junto com a "
-"família de comandos 'git log'.  Esta configuração pode ser substituída na "
-"linha de comando ou pela variável de ambiente `GIT_NOTES_DISPLAY_REF`.  "
-"Consulte linkgit:git-log[1]."
+msgstr "Qual ref (ou refs, caso um \"glob\" seja especificado mais de uma vez), além do padrão definido pela variável `core.notesRef` ou` GIT_NOTES_REF`, para ler as anotações durante a exibição das mensagens do commit junto com a família de comandos 'git log'.  Esta configuração pode ser substituída na linha de comando ou pela variável de ambiente `GIT_NOTES_DISPLAY_REF`.  Consulte linkgit:git-log[1]."
 
 #. type: Labeled list
 #: en/git-notes.txt:342
@@ -39428,19 +35472,13 @@ msgstr "notes.rewrite.<comando>"
 #: en/git-notes.txt:347
 #, priority:100
 msgid "When rewriting commits with <command> (currently `amend` or `rebase`), if this variable is `false`, git will not copy notes from the original to the rewritten commit.  Defaults to `true`.  See also \"`notes.rewriteRef`\" below."
-msgstr ""
-"Ao reescrever os commits com o <comando> (atualmente `ammend` ou `rebase`), "
-"caso esta variável seja `false`, o git não copiará as anotações do original "
-"para o commit que foi reescrito.  A predefinição retorna para `true`.  "
-"Consulte também \"`notes.rewriteRef`\" abaixo."
+msgstr "Ao reescrever os commits com o <comando> (atualmente `ammend` ou `rebase`), caso esta variável seja `false`, o git não copiará as anotações do original para o commit que foi reescrito.  A predefinição retorna para `true`.  Consulte também \"`notes.rewriteRef`\" abaixo."
 
 #. type: Plain text
 #: en/git-notes.txt:350
 #, priority:100
 msgid "This setting can be overridden by the `GIT_NOTES_REWRITE_REF` environment variable."
-msgstr ""
-"Esta configuração pode ser substituída pela variável de ambiente "
-"`GIT_NOTES_REWRITE_REF`."
+msgstr "Esta configuração pode ser substituída pela variável de ambiente `GIT_NOTES_REWRITE_REF`."
 
 #. type: Labeled list
 #: en/git-notes.txt:351
@@ -39452,19 +35490,13 @@ msgstr "notes.rewriteMode"
 #: en/git-notes.txt:356
 #, priority:100
 msgid "When copying notes during a rewrite, what to do if the target commit already has a note.  Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.  Defaults to `concatenate`."
-msgstr ""
-"Ao copiar as anotações durante uma reescrita, o que fazer caso o commit de "
-"destino já tiver uma anotação.  Deve ser uma das opção `overwrite`,` "
-"concatenate`, `cat_sort_uniq` ou` ignore`.  A predefinição retorna para "
-"`concatenate`."
+msgstr "Ao copiar as anotações durante uma reescrita, o que fazer caso o commit de destino já tiver uma anotação.  Deve ser uma das opção `overwrite`,` concatenate`, `cat_sort_uniq` ou` ignore`.  A predefinição retorna para `concatenate`."
 
 #. type: Plain text
 #: en/git-notes.txt:359
 #, priority:100
 msgid "This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment variable."
-msgstr ""
-"Esta configuração pode ser substituída pela variável de ambiente "
-"`GIT_NOTES_REWRITE_MODE`."
+msgstr "Esta configuração pode ser substituída pela variável de ambiente `GIT_NOTES_REWRITE_MODE`."
 
 #. type: Labeled list
 #: en/git-notes.txt:360
@@ -39476,19 +35508,13 @@ msgstr "notes.rewriteRef"
 #: en/git-notes.txt:365
 #, priority:100
 msgid "When copying notes during a rewrite, specifies the (fully qualified) ref whose notes should be copied.  May be a glob, in which case notes in all matching refs will be copied.  You may also specify this configuration several times."
-msgstr ""
-"Ao copiar as anotações durante uma reescrita, defina a \"ref\" (totalmente "
-"qualificada) cujas anotações devem ser copiadas.  Pode ser um agrupamento "
-"\"glob\", onde as anotações em todas as referências coincidentes serão "
-"copiadas.  É possível também utilizar esta configuração várias vezes."
+msgstr "Ao copiar as anotações durante uma reescrita, defina a \"ref\" (totalmente qualificada) cujas anotações devem ser copiadas.  Pode ser um agrupamento \"glob\", onde as anotações em todas as referências coincidentes serão copiadas.  É possível também utilizar esta configuração várias vezes."
 
 #. type: Plain text
 #: en/git-notes.txt:368
 #, priority:100
 msgid "Does not have a default value; you must configure this variable to enable note rewriting."
-msgstr ""
-"Não possui um valor predefinido; você deve configurar esta variável para "
-"ativar a reescrita das anotações."
+msgstr "Não possui um valor predefinido; você deve configurar esta variável para ativar a reescrita das anotações."
 
 #. type: Plain text
 #: en/git-notes.txt:370
@@ -39506,9 +35532,7 @@ msgstr "`GIT_NOTES_REF`"
 #: en/git-notes.txt:378
 #, priority:100
 msgid "Which ref to manipulate notes from, instead of `refs/notes/commits`.  This overrides the `core.notesRef` setting."
-msgstr ""
-"De qual \"ref\" manipular as anotações, em vez do `refs/notes/commits`.  "
-"Sobrescreve a configuração `core.notesRef`."
+msgstr "De qual \"ref\" manipular as anotações, em vez do `refs/notes/commits`.  Sobrescreve a configuração `core.notesRef`."
 
 #. type: Labeled list
 #: en/git-notes.txt:379
@@ -39520,19 +35544,13 @@ msgstr "`GIT_NOTES_DISPLAY_REF`"
 #: en/git-notes.txt:385
 #, priority:100
 msgid "Colon-delimited list of refs or globs indicating which refs, in addition to the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when showing commit messages.  This overrides the `notes.displayRef` setting."
-msgstr ""
-"Uma lista delimitada por dois pontos das refs ou \"globs\" indicando quais "
-"as refs, além da predefinição do `core.notesRef` ou` GIT_NOTES_REF`, para "
-"ler as anotações ao exibir as mensagens dos commits.  Sobrescreve a "
-"configuração `notes.displayRef`."
+msgstr "Uma lista delimitada por dois pontos das refs ou \"globs\" indicando quais as refs, além da predefinição do `core.notesRef` ou` GIT_NOTES_REF`, para ler as anotações ao exibir as mensagens dos commits.  Sobrescreve a configuração `notes.displayRef`."
 
 #. type: Plain text
 #: en/git-notes.txt:388
 #, priority:100
 msgid "A warning will be issued for refs that do not exist, but a glob that does not match any refs is silently ignored."
-msgstr ""
-"Um aviso será emitido para as refs que não existam, porém um agrupamento "
-"\"glob\" que não corresponda a nenhuma referência é ignorada em silêncio."
+msgstr "Um aviso será emitido para as refs que não existam, porém um agrupamento \"glob\" que não corresponda a nenhuma referência é ignorada em silêncio."
 
 #. type: Labeled list
 #: en/git-notes.txt:389
@@ -39544,11 +35562,7 @@ msgstr "`GIT_NOTES_REWRITE_MODE`"
 #: en/git-notes.txt:394
 #, priority:100
 msgid "When copying notes during a rewrite, what to do if the target commit already has a note.  Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.  This overrides the `core.rewriteMode` setting."
-msgstr ""
-"Ao copiar as anotações durante uma reescrita, o que fazer caso o commit de "
-"destino já tiver uma anotação.  Deve ser uma das opção `overwrite`,` "
-"concatenate`, `cat_sort_uniq` ou` ignore`.  Sobrescreve a configuração `core."
-"rewriteMode`."
+msgstr "Ao copiar as anotações durante uma reescrita, o que fazer caso o commit de destino já tiver uma anotação.  Deve ser uma das opção `overwrite`,` concatenate`, `cat_sort_uniq` ou` ignore`.  Sobrescreve a configuração `core.rewriteMode`."
 
 #. type: Labeled list
 #: en/git-notes.txt:395
@@ -39560,19 +35574,13 @@ msgstr "`GIT_NOTES_REWRITE_REF`"
 #: en/git-notes.txt:399
 #, priority:100
 msgid "When rewriting commits, which notes to copy from the original to the rewritten commit.  Must be a colon-delimited list of refs or globs."
-msgstr ""
-"Ao reescrever os commits, as anotações que serão copiadas do original para o "
-"commit que será reescrito.  Deve ser uma lista delimitada por dois pontos "
-"das refs ou globs."
+msgstr "Ao reescrever os commits, as anotações que serão copiadas do original para o commit que será reescrito.  Deve ser uma lista delimitada por dois pontos das refs ou globs."
 
 #. type: Plain text
 #: en/git-notes.txt:402
 #, priority:100
 msgid "If not set in the environment, the list of notes to copy depends on the `notes.rewrite.<command>` and `notes.rewriteRef` settings."
-msgstr ""
-"Caso não esteja definido no ambiente, a lista das anotações que serão "
-"copiadas irá depender das configurações `notes.rewrite.<comando>` e `notes."
-"rewriteRef`."
+msgstr "Caso não esteja definido no ambiente, a lista das anotações que serão copiadas irá depender das configurações `notes.rewrite.<comando>` e `notes.rewriteRef`."
 
 #. type: Title =
 #: en/git-p4.txt:2
@@ -39595,8 +35603,7 @@ msgid ""
 "'git p4 rebase'\n"
 "'git p4 submit' [<submit options>] [<master branch name>]\n"
 msgstr ""
-"'git p4 clone' [<opções-de-sincronismo>] [<opções-da-clonagem>] <caminho-do-"
-"depósito-p4>...\n"
+"'git p4 clone' [<opções-de-sincronismo>] [<opções-da-clonagem>] <caminho-do-depósito-p4>...\n"
 "'git p4 sync' [<opções-de-sincronismo>] [<caminho-do-depósito-p4>...]\n"
 "'git p4 rebase'\n"
 "'git p4 submit' [<opções-de-envio>] [<nome-do-ramo-master>]\n"
@@ -39605,23 +35612,13 @@ msgstr ""
 #: en/git-p4.txt:22
 #, priority:100
 msgid "This command provides a way to interact with p4 repositories using Git."
-msgstr ""
-"Este comando fornece uma maneira de interagir com os repositórios p4 "
-"utilizando o Git."
+msgstr "Este comando fornece uma maneira de interagir com os repositórios p4 utilizando o Git."
 
 #. type: Plain text
 #: en/git-p4.txt:30
 #, priority:100
 msgid "Create a new Git repository from an existing p4 repository using 'git p4 clone', giving it one or more p4 depot paths.  Incorporate new commits from p4 changes with 'git p4 sync'.  The 'sync' command is also used to include new branches from other p4 depot paths.  Submit Git changes back to p4 using 'git p4 submit'.  The command 'git p4 rebase' does a sync plus rebases the current branch onto the updated p4 remote branch."
-msgstr ""
-"Crie um novo repositório Git a partir de um repositório p4 já existente "
-"utilizando o comando 'git p4 clone', informando  a ele um ou mais caminhos "
-"para o depósito p4.  Incorpore os novos commits das alterações do p4 com o "
-"comando 'git p4 sync'.  O comando 'sync' também é utilizado para incluir as "
-"novas ramificações vindas dos outros caminhos do depósito p4.  Envie as "
-"alterações do Git de volta para o p4 utilizando o comando 'git p4 submit'.  "
-"O comando 'git p4 rebase' faz uma sincronização a mais e reconstrói o ramo "
-"atual no ramo remoto p4 já atualizado."
+msgstr "Crie um novo repositório Git a partir de um repositório p4 já existente utilizando o comando 'git p4 clone', informando  a ele um ou mais caminhos para o depósito p4.  Incorpore os novos commits das alterações do p4 com o comando 'git p4 sync'.  O comando 'sync' também é utilizado para incluir as novas ramificações vindas dos outros caminhos do depósito p4.  Envie as alterações do Git de volta para o p4 utilizando o comando 'git p4 submit'.  O comando 'git p4 rebase' faz uma sincronização a mais e reconstrói o ramo atual no ramo remoto p4 já atualizado."
 
 #. type: Plain text
 #: en/git-p4.txt:35
@@ -39657,9 +35654,7 @@ msgstr ""
 #: en/git-p4.txt:50
 #, priority:100
 msgid "Update the Git repository with recent changes from p4, rebasing your work on top:"
-msgstr ""
-"Atualize o repositório Git com as alterações recentes vindos do 'p4', "
-"reorganizando o seu trabalho no topo:"
+msgstr "Atualize o repositório Git com as alterações recentes vindos do 'p4', reorganizando o seu trabalho no topo:"
 
 #. type: delimited block -
 #: en/git-p4.txt:53 en/git-p4.txt:130
@@ -39689,9 +35684,7 @@ msgstr "Clone"
 #: en/git-p4.txt:69
 #, priority:100
 msgid "Generally, 'git p4 clone' is used to create a new Git directory from an existing p4 repository:"
-msgstr ""
-"Geralmente, o comando 'git p4 clone' é utilizado para criar um novo "
-"diretório Git a partir de um repositório p4 já existente:"
+msgstr "Geralmente, o comando 'git p4 clone' é utilizado para criar um novo diretório Git a partir de um repositório p4 já existente:"
 
 #. type: Plain text
 #: en/git-p4.txt:73
@@ -39709,9 +35702,7 @@ msgstr "Cria um repositório Git vazio em um subdiretório chamado 'project'."
 #: en/git-p4.txt:78
 #, priority:100
 msgid "Imports the full contents of the head revision from the given p4 depot path into a single commit in the Git branch 'refs/remotes/p4/master'."
-msgstr ""
-"Importa todo o conteúdo da revisão principal do caminho do depósito p4 "
-"informado em um único commit no ramo Git 'refs/remotes/p4/master'."
+msgstr "Importa todo o conteúdo da revisão principal do caminho do depósito p4 informado em um único commit no ramo Git 'refs/remotes/p4/master'."
 
 #. type: Plain text
 #: en/git-p4.txt:80
@@ -39723,9 +35714,7 @@ msgstr "Cria um ramo local, 'master', deste ramo remoto e faz uma averiguação.
 #: en/git-p4.txt:83
 #, priority:100
 msgid "To reproduce the entire p4 history in Git, use the '@all' modifier on the depot path:"
-msgstr ""
-"Para reproduzir todo o histórico p4 no Git, utilize o modificador '@all' no "
-"caminho do depósito:"
+msgstr "Para reproduzir todo o histórico p4 no Git, utilize o modificador '@all' no caminho do depósito:"
 
 #. type: delimited block -
 #: en/git-p4.txt:85
@@ -39743,9 +35732,7 @@ msgstr "Sync"
 #: en/git-p4.txt:92
 #, priority:100
 msgid "As development continues in the p4 repository, those changes can be included in the Git repository using:"
-msgstr ""
-"À medida que o desenvolvimento continua no repositório p4, estas alterações "
-"podem ser incluídas no repositório Git utilizando:"
+msgstr "À medida que o desenvolvimento continua no repositório p4, estas alterações podem ser incluídas no repositório Git utilizando:"
 
 #. type: delimited block -
 #: en/git-p4.txt:94
@@ -39757,17 +35744,13 @@ msgstr "$ git p4 sync\n"
 #: en/git-p4.txt:96
 #, priority:100
 msgid "This command finds new changes in p4 and imports them as Git commits."
-msgstr ""
-"Este comando encontra as novas alterações no p4 e as importa conforme o Git "
-"realiza os commits."
+msgstr "Este comando encontra as novas alterações no p4 e as importa conforme o Git realiza os commits."
 
 #. type: Plain text
 #: en/git-p4.txt:99
 #, priority:100
 msgid "P4 repositories can be added to an existing Git repository using 'git p4 sync' too:"
-msgstr ""
-"Os repositórios P4 podem ser adicionados a um repositório Git já existente "
-"também utilizando o comando 'git p4 sync':"
+msgstr "Os repositórios P4 podem ser adicionados a um repositório Git já existente também utilizando o comando 'git p4 sync':"
 
 #. type: delimited block -
 #: en/git-p4.txt:104
@@ -39787,31 +35770,19 @@ msgstr ""
 #: en/git-p4.txt:109
 #, priority:100
 msgid "This imports the specified depot into 'refs/remotes/p4/master' in an existing Git repository.  The `--branch` option can be used to specify a different branch to be used for the p4 content."
-msgstr ""
-"Faz a importação do depósito informado para 'refs/remotes/p4/master' em um "
-"repositório Git já existente.  A opção `--branch` pode ser utilizada para "
-"definir um ramo diferente que será utilizado no conteúdo do p4."
+msgstr "Faz a importação do depósito informado para 'refs/remotes/p4/master' em um repositório Git já existente.  A opção `--branch` pode ser utilizada para definir um ramo diferente que será utilizado no conteúdo do p4."
 
 #. type: Plain text
 #: en/git-p4.txt:114
 #, priority:100
 msgid "If a Git repository includes branches 'refs/remotes/origin/p4', these will be fetched and consulted first during a 'git p4 sync'.  Since importing directly from p4 is considerably slower than pulling changes from a Git remote, this can be useful in a multi-developer environment."
-msgstr ""
-"Caso um repositório Git inclua as ramificações 'refs/remotes/origin/p4', "
-"elas serão buscadas e consultadas primeiro durante um comando 'git p4 "
-"sync'.  Como a importação direta do p4 é consideravelmente mais lento do que "
-"extrair as alterações de um ramo Git remoto, pode ser útil em um ambiente "
-"com vários desenvolvedores."
+msgstr "Caso um repositório Git inclua as ramificações 'refs/remotes/origin/p4', elas serão buscadas e consultadas primeiro durante um comando 'git p4 sync'.  Como a importação direta do p4 é consideravelmente mais lento do que extrair as alterações de um ramo Git remoto, pode ser útil em um ambiente com vários desenvolvedores."
 
 #. type: Plain text
 #: en/git-p4.txt:119
 #, priority:100
 msgid "If there are multiple branches, doing 'git p4 sync' will automatically use the \"BRANCH DETECTION\" algorithm to try to partition new changes into the right branch.  This can be overridden with the `--branch` option to specify just a single branch to update."
-msgstr ""
-"Caso haja várias ramificações, ao executar o comando 'git p4 sync' utilizará "
-"de forma automática o algoritmo \"DETECÇÃO DO RAMO\" para tentar particionar "
-"as novas alterações na ramificação correta.  Pode ser substituído pela opção "
-"`--branch` para definir apenas um único ramo que será atualizado."
+msgstr "Caso haja várias ramificações, ao executar o comando 'git p4 sync' utilizará de forma automática o algoritmo \"DETECÇÃO DO RAMO\" para tentar particionar as novas alterações na ramificação correta.  Pode ser substituído pela opção `--branch` para definir apenas um único ramo que será atualizado."
 
 #. type: Title ~
 #: en/git-p4.txt:122
@@ -39823,14 +35794,7 @@ msgstr "Rebase"
 #: en/git-p4.txt:128
 #, priority:100
 msgid "A common working pattern is to fetch the latest changes from the p4 depot and merge them with local uncommitted changes.  Often, the p4 repository is the ultimate location for all code, thus a rebase workflow makes sense.  This command does 'git p4 sync' followed by 'git rebase' to move local commits on top of updated p4 changes."
-msgstr ""
-"Um padrão de trabalho comum é buscar as alterações mais recentes do depósito "
-"p4 e mesclá-las com os commits que não foram alterados localmente.  "
-"Frequentemente, o repositório p4 é o local definitivo para todo o código, "
-"portanto, um fluxo de trabalho de reconstrução da fundação faz todo o "
-"sentido.  Este comando executa o comando 'git p4 sync' seguido do comando "
-"'git rebase' para mover os commits locais no topo das alterações atualizadas "
-"do p4."
+msgstr "Um padrão de trabalho comum é buscar as alterações mais recentes do depósito p4 e mesclá-las com os commits que não foram alterados localmente.  Frequentemente, o repositório p4 é o local definitivo para todo o código, portanto, um fluxo de trabalho de reconstrução da fundação faz todo o sentido.  Este comando executa o comando 'git p4 sync' seguido do comando 'git rebase' para mover os commits locais no topo das alterações atualizadas do p4."
 
 #. type: Title ~
 #: en/git-p4.txt:134
@@ -39842,20 +35806,13 @@ msgstr "Envio"
 #: en/git-p4.txt:140
 #, priority:100
 msgid "Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace.  This should be specified using the `P4CLIENT` environment variable or the Git configuration variable 'git-p4.client'.  The p4 client must exist, but the client root will be created and populated if it does not already exist."
-msgstr ""
-"O envio das alterações de um repositório Git de volta para o repositório p4, "
-"requer um espaço de trabalho do cliente p4 separado.  Isso deve ser definido "
-"utilizando a variável de ambiente `P4CLIENT` ou a variável de configuração "
-"Git 'git-p4.client'.  O cliente p4 deve existir, porém a raiz do cliente "
-"será criada e preenchida caso ainda não exista."
+msgstr "O envio das alterações de um repositório Git de volta para o repositório p4, requer um espaço de trabalho do cliente p4 separado.  Isso deve ser definido utilizando a variável de ambiente `P4CLIENT` ou a variável de configuração Git 'git-p4.client'.  O cliente p4 deve existir, porém a raiz do cliente será criada e preenchida caso ainda não exista."
 
 #. type: Plain text
 #: en/git-p4.txt:143
 #, priority:100
 msgid "To submit all changes that are in the current Git branch but not in the 'p4/master' branch, use:"
-msgstr ""
-"Para enviar todas as alterações que estão no ramo Git atual, mas não no ramo "
-"'p4/master', utilize:"
+msgstr "Para enviar todas as alterações que estão no ramo Git atual, mas não no ramo 'p4/master', utilize:"
 
 #. type: Plain text
 #: en/git-p4.txt:148
@@ -39889,27 +35846,19 @@ msgstr ""
 #: en/git-p4.txt:160
 #, priority:100
 msgid "The upstream reference is generally 'refs/remotes/p4/master', but can be overridden using the `--origin=` command-line option."
-msgstr ""
-"A referência upstream geralmente é 'refs/remotes/p4/master', mas pode ser "
-"substituída utilizando a opção da linha de comando `--origin=`."
+msgstr "A referência upstream geralmente é 'refs/remotes/p4/master', mas pode ser substituída utilizando a opção da linha de comando `--origin=`."
 
 #. type: Plain text
 #: en/git-p4.txt:165
 #, priority:100
 msgid "The p4 changes will be created as the user invoking 'git p4 submit'. The `--preserve-user` option will cause ownership to be modified according to the author of the Git commit.  This option requires admin privileges in p4, which can be granted using 'p4 protect'."
-msgstr ""
-"As alterações no p4 serão criadas à medida que o usuário utilize o comando "
-"'git p4 submit'. A opção `--preserve-user` fará com que a propriedade seja "
-"modificada de acordo com o autor do commit.  Esta opção requer privilégios "
-"de administrador em p4, que podem ser concedidos utilizando 'p4 protect'."
+msgstr "As alterações no p4 serão criadas à medida que o usuário utilize o comando 'git p4 submit'. A opção `--preserve-user` fará com que a propriedade seja modificada de acordo com o autor do commit.  Esta opção requer privilégios de administrador em p4, que podem ser concedidos utilizando 'p4 protect'."
 
 #. type: Plain text
 #: en/git-p4.txt:167
 #, priority:100
 msgid "To shelve changes instead of submitting, use `--shelve` and `--update-shelve`:"
-msgstr ""
-"Para arquivar as alterações em vez de enviá-las, utilize `--shelve` e "
-"`--update-shelve`:"
+msgstr "Para arquivar as alterações em vez de enviá-las, utilize `--shelve` e `--update-shelve`:"
 
 #. type: delimited block -
 #: en/git-p4.txt:171
@@ -39931,18 +35880,13 @@ msgstr "Unshelve"
 #: en/git-p4.txt:178
 #, priority:100
 msgid "Unshelving will take a shelved P4 changelist, and produce the equivalent git commit in the branch refs/remotes/p4-unshelved/<changelist>."
-msgstr ""
-"O desarquivamento pega uma lista de alterações P4 arquivada e produz o "
-"commit equivalente com o git no ramo refs/remotes/p4-unshelved/<changelist>."
+msgstr "O desarquivamento pega uma lista de alterações P4 arquivada e produz o commit equivalente com o git no ramo refs/remotes/p4-unshelved/<changelist>."
 
 #. type: Plain text
 #: en/git-p4.txt:182
 #, priority:100
 msgid "The git commit is created relative to the current origin revision (HEAD by default).  A parent commit is created based on the origin, and then the unshelve commit is created based on that."
-msgstr ""
-"O commit do git é criado com relação à revisão da origem atual (a "
-"predefinição retorna para HEAD).  Um parente de um commit é criado com base "
-"na origem e em seguida, o commit desarquivado é criado com base nisso."
+msgstr "O commit do git é criado com relação à revisão da origem atual (a predefinição retorna para HEAD).  Um parente de um commit é criado com base na origem e em seguida, o commit desarquivado é criado com base nisso."
 
 #. type: Plain text
 #: en/git-p4.txt:184
@@ -39954,9 +35898,7 @@ msgstr "A revisão da origem pode ser alterada com a opção \"--origin\"."
 #: en/git-p4.txt:187
 #, priority:100
 msgid "If the target branch in refs/remotes/p4-unshelved already exists, the old one will be renamed."
-msgstr ""
-"Se o ramo de destino em `refs/remotes/p4-unshelved` já existir, o antigo "
-"será renomeado."
+msgstr "Se o ramo de destino em `refs/remotes/p4-unshelved` já existir, o antigo será renomeado."
 
 #. type: delimited block -
 #: en/git-p4.txt:195
@@ -39974,8 +35916,7 @@ msgstr ""
 "$ git show p4-unshelved/12345\n"
 "<encaminha mais alterações através do p4 para os mesmos arquivos>\n"
 "$ git p4 unshelve 12345\n"
-"<se recusa a fazer o desarquivamento a menos que o git esteja em sincronia "
-"com o p4 novamente>\n"
+"<se recusa a fazer o desarquivamento a menos que o git esteja em sincronia com o p4 novamente>\n"
 
 #. type: Title ~
 #: en/git-p4.txt:202
@@ -40017,9 +35958,7 @@ msgstr "Opções de sincronização"
 #: en/git-p4.txt:216
 #, priority:100
 msgid "These options can be used in the initial 'clone' as well as in subsequent 'sync' operations."
-msgstr ""
-"Estas opções podem ser utilizadas no 'clone' inicial, bem como nas operações "
-"subsequentes de 'sincronização'."
+msgstr "Estas opções podem ser utilizadas no 'clone' inicial, bem como nas operações subsequentes de 'sincronização'."
 
 #. type: Labeled list
 #: en/git-p4.txt:217
@@ -40031,19 +35970,13 @@ msgstr "--branch <ref>"
 #: en/git-p4.txt:221
 #, priority:100
 msgid "Import changes into <ref> instead of refs/remotes/p4/master.  If <ref> starts with refs/, it is used as is.  Otherwise, if it does not start with p4/, that prefix is added."
-msgstr ""
-"Importe as alterações para o <ref> em vez do 'refs/remotes/p4/master'.  Caso "
-"<ref> começar com 'refs/', será utilizado como está.  Caso contrário, se não "
-"iniciar com 'p4/', esse prefixo será adicionado."
+msgstr "Importe as alterações para o <ref> em vez do 'refs/remotes/p4/master'.  Caso <ref> começar com 'refs/', será utilizado como está.  Caso contrário, se não iniciar com 'p4/', esse prefixo será adicionado."
 
 #. type: Plain text
 #: en/git-p4.txt:225
 #, priority:100
 msgid "By default a <ref> not starting with refs/ is treated as the name of a remote-tracking branch (under refs/remotes/).  This behavior can be modified using the --import-local option."
-msgstr ""
-"É predefinido que um <ref> que não comece com 'refs/' seja tratado como o "
-"nome de um ramo monitorado remotamente (em 'refs/remotes/').  Esse "
-"comportamento pode ser alterado utilizando a opção `--import-local`."
+msgstr "É predefinido que um <ref> que não comece com 'refs/' seja tratado como o nome de um ramo monitorado remotamente (em 'refs/remotes/').  Esse comportamento pode ser alterado utilizando a opção `--import-local`."
 
 #. type: Plain text
 #: en/git-p4.txt:227
@@ -40055,9 +35988,7 @@ msgstr "A predefinição do <ref> é \"master\"."
 #: en/git-p4.txt:230
 #, priority:100
 msgid "This example imports a new remote \"p4/proj2\" into an existing Git repository:"
-msgstr ""
-"Este exemplo importa um novo \"p4/proj2\" remoto para um repositório Git já "
-"existente:"
+msgstr "Este exemplo importa um novo \"p4/proj2\" remoto para um repositório Git já existente:"
 
 #. type: delimited block -
 #: en/git-p4.txt:234
@@ -40079,9 +36010,7 @@ msgstr "--detect-branches"
 #: en/git-p4.txt:239
 #, priority:100
 msgid "Use the branch detection algorithm to find new paths in p4.  It is documented below in \"BRANCH DETECTION\"."
-msgstr ""
-"Utilize o algoritmo de detecção do ramo para encontrar os novos caminhos no "
-"'p4'.  Está documentado abaixo em \"DETECÇÃO DO RAMO\"."
+msgstr "Utilize o algoritmo de detecção do ramo para encontrar os novos caminhos no 'p4'.  Está documentado abaixo em \"DETECÇÃO DO RAMO\"."
 
 #. type: Labeled list
 #: en/git-p4.txt:240
@@ -40093,10 +36022,7 @@ msgstr "--changesfile <arquivo>"
 #: en/git-p4.txt:244
 #, priority:100
 msgid "Import exactly the p4 change numbers listed in 'file', one per line.  Normally, 'git p4' inspects the current p4 repository state and detects the changes it should import."
-msgstr ""
-"Importe exatamente os números da alteração p4 listados no 'arquivo', um por "
-"linha.  Normalmente, o 'git p4' inspeciona a condição atual do repositório "
-"p4 e detecta quais as alterações que ele deve importar."
+msgstr "Importe exatamente os números da alteração p4 listados no 'arquivo', um por linha.  Normalmente, o 'git p4' inspeciona a condição atual do repositório p4 e detecta quais as alterações que ele deve importar."
 
 #. type: Labeled list
 #: en/git-p4.txt:245
@@ -40120,10 +36046,7 @@ msgstr "--detect-labels"
 #: en/git-p4.txt:252
 #, priority:100
 msgid "Query p4 for labels associated with the depot paths, and add them as tags in Git. Limited usefulness as only imports labels associated with new changelists. Deprecated."
-msgstr ""
-"Consulte a página 'p4' para os rótulos associados aos caminhos do depósito e "
-"adicione-os como tags no Git. Utilidade limitada, pois importa apenas as "
-"etiquetas associadas a novas listas de alterações. Descontinuada."
+msgstr "Consulte a página 'p4' para os rótulos associados aos caminhos do depósito e adicione-os como tags no Git. Utilidade limitada, pois importa apenas as etiquetas associadas a novas listas de alterações. Descontinuada."
 
 #. type: Labeled list
 #: en/git-p4.txt:253 en/git-p4.txt:430
@@ -40147,13 +36070,7 @@ msgstr "--import-local"
 #: en/git-p4.txt:263
 #, priority:100
 msgid "By default, p4 branches are stored in 'refs/remotes/p4/', where they will be treated as remote-tracking branches by linkgit:git-branch[1] and other commands.  This option instead puts p4 branches in 'refs/heads/p4/'.  Note that future sync operations must specify `--import-local` as well so that they can find the p4 branches in refs/heads."
-msgstr ""
-"É predefinido que os ramos 'p4' sejam armazenadas em 'refs/remotes/p4/', "
-"onde serão tratadas como ramificações monitoradas remotamente pelo linkgit"
-":git-branch[1] e outros comandos.  Esta opção coloca as ramificações 'p4' no "
-"'refs/heads/p4/'.  Observe que as futuras operações de sincronização tam bém "
-"devem especificar a opção `--import-local` para que eles possam encontrar as "
-"ramificações 'p4' em 'refs/heads'."
+msgstr "É predefinido que os ramos 'p4' sejam armazenadas em 'refs/remotes/p4/', onde serão tratadas como ramificações monitoradas remotamente pelo linkgit:git-branch[1] e outros comandos.  Esta opção coloca as ramificações 'p4' no 'refs/heads/p4/'.  Observe que as futuras operações de sincronização tam bém devem especificar a opção `--import-local` para que eles possam encontrar as ramificações 'p4' em 'refs/heads'."
 
 #. type: Labeled list
 #: en/git-p4.txt:264
@@ -40165,12 +36082,7 @@ msgstr "--max-changes <n>"
 #: en/git-p4.txt:270
 #, priority:100
 msgid "Import at most 'n' changes, rather than the entire range of changes included in the given revision specifier. A typical usage would be use '@all' as the revision specifier, but then to use '--max-changes 1000' to import only the last 1000 revisions rather than the entire revision history."
-msgstr ""
-"Importe no máximo 'n' alterações, em vez de todo o intervalo de alterações "
-"incluído no especificador da revisão informado. Um uso comum seria utilizar "
-"'@all' como especificador da revisão, porém depois utilizar a opção '--max-"
-"changes 1000' para importar apenas as últimas 1000 revisões, em vez de todo "
-"o histórico."
+msgstr "Importe no máximo 'n' alterações, em vez de todo o intervalo de alterações incluído no especificador da revisão informado. Um uso comum seria utilizar '@all' como especificador da revisão, porém depois utilizar a opção '--max-changes 1000' para importar apenas as últimas 1000 revisões, em vez de todo o histórico."
 
 #. type: Labeled list
 #: en/git-p4.txt:271
@@ -40182,14 +36094,7 @@ msgstr "--changes-block-size <n>"
 #: en/git-p4.txt:279
 #, priority:100
 msgid "The internal block size to use when converting a revision specifier such as '@all' into a list of specific change numbers. Instead of using a single call to 'p4 changes' to find the full list of changes for the conversion, there are a sequence of calls to 'p4 changes -m', each of which requests one block of changes of the given size. The default block size is 500, which should usually be suitable."
-msgstr ""
-"O tamanho do bloco interno que será utilizado ao converter um especificador "
-"da revisão como '@all' em uma lista com a quantidade específica de "
-"alteração. Em vez de utilizar uma única chamada para 'p4 changes' visando "
-"encontrar a lista completa das alterações para a conversão, há uma sequência "
-"de chamadas para 'p4 changes -m', cada uma das quais solicita um bloco de "
-"alterações com um tamanho definido. O tamanho padrão do bloco é 500, o que "
-"geralmente deve ser o suficiente."
+msgstr "O tamanho do bloco interno que será utilizado ao converter um especificador da revisão como '@all' em uma lista com a quantidade específica de alteração. Em vez de utilizar uma única chamada para 'p4 changes' visando encontrar a lista completa das alterações para a conversão, há uma sequência de chamadas para 'p4 changes -m', cada uma das quais solicita um bloco de alterações com um tamanho definido. O tamanho padrão do bloco é 500, o que geralmente deve ser o suficiente."
 
 #. type: Labeled list
 #: en/git-p4.txt:280
@@ -40201,13 +36106,7 @@ msgstr "--keep-path"
 #: en/git-p4.txt:287
 #, priority:100
 msgid "The mapping of file names from the p4 depot path to Git, by default, involves removing the entire depot path.  With this option, the full p4 depot path is retained in Git.  For example, path '//depot/main/foo/bar.c', when imported from '//depot/main/', becomes 'foo/bar.c'.  With `--keep-path`, the Git path is instead 'depot/main/foo/bar.c'."
-msgstr ""
-"É predefinido para o Git, que seja removido todo o caminho do depósito no "
-"mapeamento do caminho dos nomes dos arquivos do depósito p4.  Com esta "
-"opção, o caminho completo do depósito p4 é mantido no Git.  Por exemplo, o "
-"caminho '//depot/main/foo/bar.c', quando for importado de '//depot/main/', "
-"se torne 'foo/bar.c'.  Com `--keep-path`, o caminho do Git fica 'depot/main/"
-"foo/bar.c'."
+msgstr "É predefinido para o Git, que seja removido todo o caminho do depósito no mapeamento do caminho dos nomes dos arquivos do depósito p4.  Com esta opção, o caminho completo do depósito p4 é mantido no Git.  Por exemplo, o caminho '//depot/main/foo/bar.c', quando for importado de '//depot/main/', se torne 'foo/bar.c'.  Com `--keep-path`, o caminho do Git fica 'depot/main/foo/bar.c'."
 
 #. type: Labeled list
 #: en/git-p4.txt:288
@@ -40219,9 +36118,7 @@ msgstr "--use-client-spec"
 #: en/git-p4.txt:291
 #, priority:100
 msgid "Use a client spec to find the list of interesting files in p4.  See the \"CLIENT SPEC\" section below."
-msgstr ""
-"Use uma especificação do cliente para encontrar a lista dos arquivos "
-"interessantes no p4.  Consulte a seção \"CLIENT SPEC\" abaixo."
+msgstr "Use uma especificação do cliente para encontrar a lista dos arquivos interessantes no p4.  Consulte a seção \"CLIENT SPEC\" abaixo."
 
 #. type: Labeled list
 #: en/git-p4.txt:292
@@ -40233,9 +36130,7 @@ msgstr "-/ <caminho>"
 #: en/git-p4.txt:294
 #, priority:100
 msgid "Exclude selected depot paths when cloning or syncing."
-msgstr ""
-"Exclua os caminhos selecionados do depósito durante a clonagem ou "
-"sincronização."
+msgstr "Exclua os caminhos selecionados do depósito durante a clonagem ou sincronização."
 
 #. type: Title ~
 #: en/git-p4.txt:296
@@ -40247,9 +36142,7 @@ msgstr "Opções de clonagem"
 #: en/git-p4.txt:299
 #, priority:100
 msgid "These options can be used in an initial 'clone', along with the 'sync' options described above."
-msgstr ""
-"Estas opções podem ser utilizadas em um 'clone' inicial, juntamente com as "
-"opções de 'sincronização' descritas acima."
+msgstr "Estas opções podem ser utilizadas em um 'clone' inicial, juntamente com as opções de 'sincronização' descritas acima."
 
 #. type: Labeled list
 #: en/git-p4.txt:300
@@ -40261,9 +36154,7 @@ msgstr "--destination <diretório>"
 #: en/git-p4.txt:304
 #, priority:100
 msgid "Where to create the Git repository.  If not provided, the last component in the p4 depot path is used to create a new directory."
-msgstr ""
-"Onde criar o repositório Git.  Caso não seja utilizado, o último componente  "
-"no depósito p4 é utilizado para criar um novo diretório."
+msgstr "Onde criar o repositório Git.  Caso não seja utilizado, o último componente  no depósito p4 é utilizado para criar um novo diretório."
 
 #. type: Plain text
 #: en/git-p4.txt:307
@@ -40281,9 +36172,7 @@ msgstr "Opções de envio"
 #: en/git-p4.txt:311
 #, priority:100
 msgid "These options can be used to modify 'git p4 submit' behavior."
-msgstr ""
-"Estas opções podem ser utilizadas para modificar o comportamento do 'git p4 "
-"submit'."
+msgstr "Estas opções podem ser utilizadas para modificar o comportamento do 'git p4 submit'."
 
 #. type: Labeled list
 #: en/git-p4.txt:312
@@ -40295,10 +36184,7 @@ msgstr "--origin <commit>"
 #: en/git-p4.txt:316
 #, priority:100
 msgid "Upstream location from which commits are identified to submit to p4.  By default, this is the most recent p4 commit reachable from `HEAD`."
-msgstr ""
-"Localização upstream a partir de onde os commits são identificados para "
-"envio ao 'p4'.  É predefinido que este é o commit 'p4' mais recente "
-"acessível a partir do `HEAD`."
+msgstr "Localização upstream a partir de onde os commits são identificados para envio ao 'p4'.  É predefinido que este é o commit 'p4' mais recente acessível a partir do `HEAD`."
 
 #. type: Plain text
 #: en/git-p4.txt:322
@@ -40316,9 +36202,7 @@ msgstr "--preserve-user"
 #: en/git-p4.txt:326
 #, priority:100
 msgid "Re-author p4 changes before submitting to p4.  This option requires p4 admin privileges."
-msgstr ""
-"Re-escreva as alterações no 'p4' antes de enviá-lo ao 'p4'  Esta opção "
-"requer privilégios de administração 'p4'."
+msgstr "Re-escreva as alterações no 'p4' antes de enviá-lo ao 'p4'  Esta opção requer privilégios de administração 'p4'."
 
 #. type: Labeled list
 #: en/git-p4.txt:327
@@ -40330,17 +36214,13 @@ msgstr "--export-labels"
 #: en/git-p4.txt:330
 #, priority:100
 msgid "Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory."
-msgstr ""
-"Exporte as tags do Git como etiquetas 'p4'. As tags encontradas no Git são "
-"aplicadas ao diretório de trabalho do 'perforce'."
+msgstr "Exporte as tags do Git como etiquetas 'p4'. As tags encontradas no Git são aplicadas ao diretório de trabalho do 'perforce'."
 
 #. type: Plain text
 #: en/git-p4.txt:335
 #, priority:100
 msgid "Show just what commits would be submitted to p4; do not change state in Git or p4."
-msgstr ""
-"Mostre apenas quais os commits seriam enviados ao 'p4'; não mude de condição "
-"no Git ou no 'p4'."
+msgstr "Mostre apenas quais os commits seriam enviados ao 'p4'; não mude de condição no Git ou no 'p4'."
 
 #. type: Labeled list
 #: en/git-p4.txt:336
@@ -40352,12 +36232,7 @@ msgstr "--prepare-p4-only"
 #: en/git-p4.txt:342
 #, priority:100
 msgid "Apply a commit to the p4 workspace, opening, adding and deleting files in p4 as for a normal submit operation.  Do not issue the final \"p4 submit\", but instead print a message about how to submit manually or revert.  This option always stops after the first (oldest) commit.  Git tags are not exported to p4."
-msgstr ""
-"Aplique um commit ao espaço de trabalho 'p4', abrindo, adicionando e "
-"excluindo os arquivos no 'p4' como para uma operação normal de envio.  Não "
-"emita o \"p4 submit\" final, mas exiba uma mensagem sobre como enviar "
-"manualmente ou como reverter.  Esta opção sempre é interrompida após o "
-"primeiro commit (mais antigo).  As tags Git não são exportadas para o 'p4'."
+msgstr "Aplique um commit ao espaço de trabalho 'p4', abrindo, adicionando e excluindo os arquivos no 'p4' como para uma operação normal de envio.  Não emita o \"p4 submit\" final, mas exiba uma mensagem sobre como enviar manualmente ou como reverter.  Esta opção sempre é interrompida após o primeiro commit (mais antigo).  As tags Git não são exportadas para o 'p4'."
 
 #. type: Labeled list
 #: en/git-p4.txt:343
@@ -40369,11 +36244,7 @@ msgstr "--shelve"
 #: en/git-p4.txt:347
 #, priority:100
 msgid "Instead of submitting create a series of shelved changelists.  After creating each shelve, the relevant files are reverted/deleted.  If you have multiple commits pending multiple shelves will be created."
-msgstr ""
-"Em vez de enviar, crie uma série de listas de alterações que foram "
-"arquivadas.  Depois de criar cada prateleira, os arquivos relevantes são "
-"revertidos/excluídos.  Caso tenha vários commits pendentes, várias "
-"prateleiras serão criadas."
+msgstr "Em vez de enviar, crie uma série de listas de alterações que foram arquivadas.  Depois de criar cada prateleira, os arquivos relevantes são revertidos/excluídos.  Caso tenha vários commits pendentes, várias prateleiras serão criadas."
 
 #. type: Labeled list
 #: en/git-p4.txt:348
@@ -40385,10 +36256,7 @@ msgstr "--update-shelve CHANGELIST"
 #: en/git-p4.txt:351
 #, priority:100
 msgid "Update an existing shelved changelist with this commit. Implies --shelve. Repeat for multiple shelved changelists."
-msgstr ""
-"Atualize uma lista de alterações existentes que foram arquivadas com este "
-"commit. Implica no uso da opção `--shelve`. Repita o procedimento para as "
-"várias listas de alterações que foram arquivadas."
+msgstr "Atualize uma lista de alterações existentes que foram arquivadas com este commit. Implica no uso da opção `--shelve`. Repita o procedimento para as várias listas de alterações que foram arquivadas."
 
 #. type: Labeled list
 #: en/git-p4.txt:352
@@ -40400,13 +36268,7 @@ msgstr "--conflict=(ask|skip|quit)"
 #: en/git-p4.txt:358
 #, priority:100
 msgid "Conflicts can occur when applying a commit to p4.  When this happens, the default behavior (\"ask\") is to prompt whether to skip this commit and continue, or quit.  This option can be used to bypass the prompt, causing conflicting commits to be automatically skipped, or to quit trying to apply commits, without prompting."
-msgstr ""
-"Podem ocorrer conflitos durante a aplicação de um commit ao 'p4'.  Quando "
-"isso acontece, o comportamento predefinido (\"ask\") é perguntar se você "
-"deve ignorar este commit e continuar ou encerrar.  Esta opção pode ser "
-"utilizada para ignorar o prompt, fazendo com que os commits conflitantes "
-"sejam ignorados automaticamente ou pare de tentar aplicar os commits sem "
-"nenhum alerta."
+msgstr "Podem ocorrer conflitos durante a aplicação de um commit ao 'p4'.  Quando isso acontece, o comportamento predefinido (\"ask\") é perguntar se você deve ignorar este commit e continuar ou encerrar.  Esta opção pode ser utilizada para ignorar o prompt, fazendo com que os commits conflitantes sejam ignorados automaticamente ou pare de tentar aplicar os commits sem nenhum alerta."
 
 #. type: Labeled list
 #: en/git-p4.txt:359 en/git-submodule.txt:281
@@ -40418,10 +36280,7 @@ msgstr "--branch <ramo>"
 #: en/git-p4.txt:363
 #, priority:100
 msgid "After submitting, sync this named branch instead of the default p4/master.  See the \"Sync options\" section above for more information."
-msgstr ""
-"Após o envio, sincronize esta ramificação informada em vez da predefinição '"
-"p4/master'.  Consulte a seção \"Opções de sincronização\" acima para obter "
-"mais informações."
+msgstr "Após o envio, sincronize esta ramificação informada em vez da predefinição 'p4/master'.  Consulte a seção \"Opções de sincronização\" acima para obter mais informações."
 
 #. type: Labeled list
 #: en/git-p4.txt:364
@@ -40433,9 +36292,7 @@ msgstr "--commit <sha1>|<sha1..sha1>"
 #: en/git-p4.txt:367
 #, priority:100
 msgid "Submit only the specified commit or range of commits, instead of the full list of changes that are in the current Git branch."
-msgstr ""
-"Envie apenas o commit ou o intervalo dos commits informados, em vez da lista "
-"completa de alterações que estão no ramo Git atual."
+msgstr "Envie apenas o commit ou o intervalo dos commits informados, em vez da lista completa de alterações que estão no ramo Git atual."
 
 #. type: Labeled list
 #: en/git-p4.txt:368
@@ -40447,9 +36304,7 @@ msgstr "--disable-rebase"
 #: en/git-p4.txt:371
 #, priority:100
 msgid "Disable the automatic rebase after all commits have been successfully submitted. Can also be set with git-p4.disableRebase."
-msgstr ""
-"Desative a nova reconstrução automática depois que todos os commits forem "
-"enviados com êxito. Também pode ser definido com git-p4.disableRebase."
+msgstr "Desative a nova reconstrução automática depois que todos os commits forem enviados com êxito. Também pode ser definido com git-p4.disableRebase."
 
 #. type: Labeled list
 #: en/git-p4.txt:372
@@ -40461,11 +36316,7 @@ msgstr "--disable-p4sync"
 #: en/git-p4.txt:376
 #, priority:100
 msgid "Disable the automatic sync of p4/master from Perforce after commits have been submitted. Implies --disable-rebase. Can also be set with git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible."
-msgstr ""
-"Desative a sincronização automática do 'p4/master' do \"Perforce\" depois "
-"que os commits tenham sido enviados. Implica no uso da opção `--disable-"
-"rebase`. Também pode ser definido com git-p4.disableP4Sync. A sincronização "
-"com 'origin/master' se for possível ainda continua."
+msgstr "Desative a sincronização automática do 'p4/master' do \"Perforce\" depois que os commits tenham sido enviados. Implica no uso da opção `--disable-rebase`. Também pode ser definido com git-p4.disableP4Sync. A sincronização com 'origin/master' se for possível ainda continua."
 
 #. type: Title -
 #: en/git-p4.txt:378
@@ -40483,18 +36334,13 @@ msgstr "p4-pre-submit"
 #: en/git-p4.txt:387
 #, priority:100
 msgid "The `p4-pre-submit` hook is executed if it exists and is executable.  The hook takes no parameters and nothing from standard input. Exiting with non-zero status from this script prevents `git-p4 submit` from launching.  It can be bypassed with the `--no-verify` command line option."
-msgstr ""
-"O gancho `p4-pre-submit` é executado caso exista e seja executável.  O "
-"gancho não aceita os parâmetros e nada da entrada padrão. Encerrando com uma "
-"condição diferente de zero deste script impede a execução do `git-p4 submit`"
-".  Pode ser contornada com a opção da linha de comando `--no-verify`."
+msgstr "O gancho `p4-pre-submit` é executado caso exista e seja executável.  O gancho não aceita os parâmetros e nada da entrada padrão. Encerrando com uma condição diferente de zero deste script impede a execução do `git-p4 submit`.  Pode ser contornada com a opção da linha de comando `--no-verify`."
 
 #. type: Plain text
 #: en/git-p4.txt:389
 #, priority:100
 msgid "One usage scenario is to run unit tests in the hook."
-msgstr ""
-"Um cenário para a sua utilização é executar os testes da unidade no gancho."
+msgstr "Um cenário para a sua utilização é executar os testes da unidade no gancho."
 
 #. type: Title ~
 #: en/git-p4.txt:391
@@ -40506,21 +36352,13 @@ msgstr "p4-prepare-changelist"
 #: en/git-p4.txt:398
 #, priority:100
 msgid "The `p4-prepare-changelist` hook is executed right after preparing the default changelist message and before the editor is started.  It takes one parameter, the name of the file that contains the changelist text. Exiting with a non-zero status from the script will abort the process."
-msgstr ""
-"O gancho `p4-prepare-changelist` é executado bem depois de preparar a "
-"mensagem da lista de alterações predefinida e antes que o editor seja "
-"iniciado.  É necessário um único parâmetro, o nome do arquivo que contenha o "
-"texto da lista das alterações. Encerrando com uma condição diferente de "
-"zero, faz com que o processo seja interrompido."
+msgstr "O gancho `p4-prepare-changelist` é executado bem depois de preparar a mensagem da lista de alterações predefinida e antes que o editor seja iniciado.  É necessário um único parâmetro, o nome do arquivo que contenha o texto da lista das alterações. Encerrando com uma condição diferente de zero, faz com que o processo seja interrompido."
 
 #. type: Plain text
 #: en/git-p4.txt:402
 #, priority:100
 msgid "The purpose of the hook is to edit the message file in place, and it is not supressed by the `--no-verify` option. This hook is called even if `--prepare-p4-only` is set."
-msgstr ""
-"O propósito do gancho é para editar a mensagem do arquivo em questão, e não "
-"é sobreposto pela opção `--no-verify`. Este gancho é chamado mesmo que a "
-"opção `--prepare-p4-only` seja definida."
+msgstr "O propósito do gancho é para editar a mensagem do arquivo em questão, e não é sobreposto pela opção `--no-verify`. Este gancho é chamado mesmo que a opção `--prepare-p4-only` seja definida."
 
 #. type: Title ~
 #: en/git-p4.txt:404
@@ -40532,22 +36370,13 @@ msgstr "p4-changelist"
 #: en/git-p4.txt:411
 #, priority:100
 msgid "The `p4-changelist` hook is executed after the changelist message has been edited by the user. It can be bypassed with the `--no-verify` option. It takes a single parameter, the name of the file that holds the proposed changelist text. Exiting with a non-zero status causes the command to abort."
-msgstr ""
-"O gancho `p4-changelist` é executado depois que mensagem da lista de "
-"alterações tenha sido editada pelo usuário. Pode ser ignorado com a opção "
-"`--no-check`. É necessário um único parâmetro, o nome do arquivo que "
-"contenha o texto da lista das alterações propostas. Encerre com uma condição "
-"diferente de zero, faz com que o comando seja cancelado."
+msgstr "O gancho `p4-changelist` é executado depois que mensagem da lista de alterações tenha sido editada pelo usuário. Pode ser ignorado com a opção `--no-check`. É necessário um único parâmetro, o nome do arquivo que contenha o texto da lista das alterações propostas. Encerre com uma condição diferente de zero, faz com que o comando seja cancelado."
 
 #. type: Plain text
 #: en/git-p4.txt:415
 #, priority:100
 msgid "The hook is allowed to edit the changelist file and can be used to normalize the text into some project standard format. It can also be used to refuse the Submit after inspect the message file."
-msgstr ""
-"O gancho tem permissão para editar o arquivo da lista de alterações e pode "
-"ser utilizado para normalizar o texto em algum formato predefinido pelo "
-"projeto. Também pode ser utilizado para recusar o envio após a inspeção da "
-"mensagem do arquivo."
+msgstr "O gancho tem permissão para editar o arquivo da lista de alterações e pode ser utilizado para normalizar o texto em algum formato predefinido pelo projeto. Também pode ser utilizado para recusar o envio após a inspeção da mensagem do arquivo."
 
 #. type: Title ~
 #: en/git-p4.txt:417
@@ -40559,11 +36388,7 @@ msgstr "p4-post-changelist"
 #: en/git-p4.txt:423
 #, priority:100
 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 notification and cannot affect the outcome of the git p4 submit action."
-msgstr ""
-"O gancho `p4-post-changelist` é executado depois que o envio tenha ocorrido "
-"com êxito no P4. Não precisa de quaisquer parâmetros e serve primeiramente "
-"para notificações e pode não afetar o resultado da ação do comando 'git p4 "
-"submit'."
+msgstr "O gancho `p4-post-changelist` é executado depois que o envio tenha ocorrido com êxito no P4. Não precisa de quaisquer parâmetros e serve primeiramente para notificações e pode não afetar o resultado da ação do comando 'git p4 submit'."
 
 #. type: Title ~
 #: en/git-p4.txt:427
@@ -40575,9 +36400,7 @@ msgstr "Opções para a reconstrução da fundação"
 #: en/git-p4.txt:429
 #, priority:100
 msgid "These options can be used to modify 'git p4 rebase' behavior."
-msgstr ""
-"Essas opções podem ser utilizadas para modificar o comportamento do 'git p4 "
-"rebase'."
+msgstr "Essas opções podem ser utilizadas para modificar o comportamento do 'git p4 rebase'."
 
 #. type: Plain text
 #: en/git-p4.txt:432
@@ -40601,9 +36424,7 @@ msgstr "--origin"
 #: en/git-p4.txt:439
 #, priority:100
 msgid "Sets the git refspec against which the shelved P4 changelist is compared.  Defaults to p4/master."
-msgstr ""
-"Define o 'git refspec' onde a lista de alterações 'P4' que foi arquivada é "
-"comparada.  A predefinição retorna para 'p4/master'."
+msgstr "Define o 'git refspec' onde a lista de alterações 'P4' que foi arquivada é comparada.  A predefinição retorna para 'p4/master'."
 
 #. type: Title -
 #: en/git-p4.txt:441
@@ -40615,10 +36436,7 @@ msgstr "SINTAXE DO CAMINHO DO DEPÓSITO"
 #: en/git-p4.txt:445
 #, priority:100
 msgid "The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or more space-separated p4 depot paths, with an optional p4 revision specifier on the end:"
-msgstr ""
-"O argumento do caminho do depósito p4 para o comando 'git p4 sync' e o 'git "
-"p4 clone' pode ser um ou mais caminhos para o depósito p4 separados com "
-"espaço, com um especificador opcional da revisão p4 no final:"
+msgstr "O argumento do caminho do depósito p4 para o comando 'git p4 sync' e o 'git p4 clone' pode ser um ou mais caminhos para o depósito p4 separados com espaço, com um especificador opcional da revisão p4 no final:"
 
 #. type: Labeled list
 #: en/git-p4.txt:446
@@ -40630,8 +36448,7 @@ msgstr "\"//depot/my/project\""
 #: en/git-p4.txt:448
 #, priority:100
 msgid "Import one commit with all files in the '#head' change under that tree."
-msgstr ""
-"Importe um commit com todos os arquivos na alteração '#head' sob essa árvore."
+msgstr "Importe um commit com todos os arquivos na alteração '#head' sob essa árvore."
 
 #. type: Labeled list
 #: en/git-p4.txt:449
@@ -40643,8 +36460,7 @@ msgstr "\"//depot/my/project@all\""
 #: en/git-p4.txt:451
 #, priority:100
 msgid "Import one commit for each change in the history of that depot path."
-msgstr ""
-"Importe um commit para cada alteração no histórico desse caminho do depósito."
+msgstr "Importe um commit para cada alteração no histórico desse caminho do depósito."
 
 #. type: Labeled list
 #: en/git-p4.txt:452
@@ -40668,23 +36484,13 @@ msgstr "\"//depot/proj1@all //depot/proj2@all\""
 #: en/git-p4.txt:464
 #, priority:100
 msgid "Import all changes from both named depot paths into a single repository.  Only files below these directories are included.  There is not a subdirectory in Git for each \"proj1\" and \"proj2\".  You must use the `--destination` option when specifying more than one depot path.  The revision specifier must be specified identically on each depot path.  If there are files in the depot paths with the same name, the path with the most recently updated version of the file is the one that appears in Git."
-msgstr ""
-"Importe todas as alterações dos dois caminhos do depósito informados para um "
-"único repositório.  Somente os arquivos abaixo destes diretórios estão "
-"incluídos.  Não há um subdiretório no Git para cada \"proj1\" e \"proj2\".  "
-"Você deve utilizar a opção `--destination` ao informar mais de um caminho do "
-"depósito.  O especificador de revisão deve ser definido de forma idêntica em "
-"cada caminho do depósito.  Caso haja os arquivos com o mesmo nome nos "
-"caminhos do depósito, o caminho com a versão atualizada mais recente do "
-"arquivo é o que irá aparecer no Git."
+msgstr "Importe todas as alterações dos dois caminhos do depósito informados para um único repositório.  Somente os arquivos abaixo destes diretórios estão incluídos.  Não há um subdiretório no Git para cada \"proj1\" e \"proj2\".  Você deve utilizar a opção `--destination` ao informar mais de um caminho do depósito.  O especificador de revisão deve ser definido de forma idêntica em cada caminho do depósito.  Caso haja os arquivos com o mesmo nome nos caminhos do depósito, o caminho com a versão atualizada mais recente do arquivo é o que irá aparecer no Git."
 
 #. type: Plain text
 #: en/git-p4.txt:466
 #, priority:100
 msgid "See 'p4 help revisions' for the full syntax of p4 revision specifiers."
-msgstr ""
-"Consulte 'revisões de ajuda p4' para obter a sintaxe completa dos "
-"especificadores da revisão p4."
+msgstr "Consulte 'revisões de ajuda p4' para obter a sintaxe completa dos especificadores da revisão p4."
 
 #. type: Title -
 #: en/git-p4.txt:469
@@ -40696,50 +36502,25 @@ msgstr "ESPECIFICAÇÃO DO CLIENTE"
 #: en/git-p4.txt:479
 #, priority:100
 msgid "The p4 client specification is maintained with the 'p4 client' command and contains among other fields, a View that specifies how the depot is mapped into the client repository.  The 'clone' and 'sync' commands can consult the client spec when given the `--use-client-spec` option or when the useClientSpec variable is true.  After 'git p4 clone', the useClientSpec variable is automatically set in the repository configuration file.  This allows future 'git p4 submit' commands to work properly; the submit command looks only at the variable and does not have a command-line option."
-msgstr ""
-"A definição do cliente p4 é mantida com o comando 'p4 client' e contém, "
-"entre os outros campos, uma visualização que define como o depósito é "
-"mapeado no repositório do cliente.  Os comandos 'clone' e 'sync' podem "
-"consultar a especificação do cliente quando receber a opção `--use-client-"
-"spec` ou quando a variável `useClientSpec` for verdadeira.  Após o 'git p4 "
-"clone', a variável `useClientSpec` é automaticamente definida no arquivo de "
-"configuração do repositório.  Isso permite que futuros comandos `git p4 "
-"submit` funcionem corretamente; o comando 'submit' examina apenas a variável "
-"e não possui uma opção na linha de comando."
+msgstr "A definição do cliente p4 é mantida com o comando 'p4 client' e contém, entre os outros campos, uma visualização que define como o depósito é mapeado no repositório do cliente.  Os comandos 'clone' e 'sync' podem consultar a especificação do cliente quando receber a opção `--use-client-spec` ou quando a variável `useClientSpec` for verdadeira.  Após o 'git p4 clone', a variável `useClientSpec` é automaticamente definida no arquivo de configuração do repositório.  Isso permite que futuros comandos `git p4 submit` funcionem corretamente; o comando 'submit' examina apenas a variável e não possui uma opção na linha de comando."
 
 #. type: Plain text
 #: en/git-p4.txt:486
 #, ignore-ellipsis, priority:100
 msgid "The full syntax for a p4 view is documented in 'p4 help views'.  'git p4' knows only a subset of the view syntax.  It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace.  Of the possible wildcards, 'git p4' only handles '...', and only when it is at the end of the path.  'git p4' will complain if it encounters an unhandled wildcard."
-msgstr ""
-"A sintaxe completa de uma visualização p4 está documentada em 'p4 help "
-"views'.  O comando 'git p4' conhece apenas um subconjunto da sintaxe de "
-"visualização.  Ele compreende os mapeamentos das várias linhas, "
-"sobreposições com '+', exclusões com '-' e as aspas duplas ao redor do "
-"espaço.  Dos possíveis curingas, o 'git p4' manipula apenas '...' e somente "
-"quando está no final do caminho.  O 'git p4' irá reclamará caso encontre um "
-"curinga sem tratamento."
+msgstr "A sintaxe completa de uma visualização p4 está documentada em 'p4 help views'.  O comando 'git p4' conhece apenas um subconjunto da sintaxe de visualização.  Ele compreende os mapeamentos das várias linhas, sobreposições com '+', exclusões com '-' e as aspas duplas ao redor do espaço.  Dos possíveis curingas, o 'git p4' manipula apenas '...' e somente quando está no final do caminho.  O 'git p4' irá reclamará caso encontre um curinga sem tratamento."
 
 #. type: Plain text
 #: en/git-p4.txt:491
 #, priority:100
 msgid "Bugs in the implementation of overlap mappings exist.  If multiple depot paths map through overlays to the same location in the repository, 'git p4' can choose the wrong one.  This is hard to solve without dedicating a client spec just for 'git p4'."
-msgstr ""
-"Existem bugs na implementação dos mapeamentos da sobreposição.  Caso vários "
-"caminhos do depósito mapearem as sobreposições para o mesmo local no "
-"repositório, 'git p4' poderá escolher o caminho errado.  Isso é difícil de "
-"resolver sem dedicar um cliente específico apenas ao 'git p4'."
+msgstr "Existem bugs na implementação dos mapeamentos da sobreposição.  Caso vários caminhos do depósito mapearem as sobreposições para o mesmo local no repositório, 'git p4' poderá escolher o caminho errado.  Isso é difícil de resolver sem dedicar um cliente específico apenas ao 'git p4'."
 
 #. type: Plain text
 #: en/git-p4.txt:496
 #, priority:100
 msgid "The name of the client can be given to 'git p4' in multiple ways.  The variable 'git-p4.client' takes precedence if it exists.  Otherwise, normal p4 mechanisms of determining the client are used: environment variable `P4CLIENT`, a file referenced by `P4CONFIG`, or the local host name."
-msgstr ""
-"O nome do cliente pode ser atribuído ao 'git p4' de várias maneiras.  A "
-"variável 'git-p4.client' tem precedência, caso exista.  Caso contrário, são "
-"utilizados os mecanismos p4 tradicionais para determinar o cliente utilizado:"
-" a variável de ambiente `P4CLIENT`, um arquivo referenciado por `P4CONFIG` "
-"ou o nome do host local."
+msgstr "O nome do cliente pode ser atribuído ao 'git p4' de várias maneiras.  A variável 'git-p4.client' tem precedência, caso exista.  Caso contrário, são utilizados os mecanismos p4 tradicionais para determinar o cliente utilizado: a variável de ambiente `P4CLIENT`, um arquivo referenciado por `P4CONFIG` ou o nome do host local."
 
 #. type: Title -
 #: en/git-p4.txt:499
@@ -40751,24 +36532,13 @@ msgstr "DETECÇÃO DO RAMO"
 #: en/git-p4.txt:506
 #, priority:100
 msgid "P4 does not have the same concept of a branch as Git.  Instead, p4 organizes its content as a directory tree, where by convention different logical branches are in different locations in the tree.  The 'p4 branch' command is used to maintain mappings between different areas in the tree, and indicate related content.  'git p4' can use these mappings to determine branch relationships."
-msgstr ""
-"O P4 não tem o mesmo conceito de ramificação que o Git.  Em vez disso, o p4 "
-"organiza o seu conteúdo como uma árvore de diretórios, onde por convenção de "
-"diferentes ramificações lógicas que ficam nos diferentes locais da árvore.  "
-"O comando 'p4 branch' é usado para manter os mapeamentos entre as diferentes "
-"áreas da árvore e indicar o conteúdo relacionado.  O 'git p4' pode utilizar "
-"esses mapeamentos para determinar os relacionamentos dos ramos."
+msgstr "O P4 não tem o mesmo conceito de ramificação que o Git.  Em vez disso, o p4 organiza o seu conteúdo como uma árvore de diretórios, onde por convenção de diferentes ramificações lógicas que ficam nos diferentes locais da árvore.  O comando 'p4 branch' é usado para manter os mapeamentos entre as diferentes áreas da árvore e indicar o conteúdo relacionado.  O 'git p4' pode utilizar esses mapeamentos para determinar os relacionamentos dos ramos."
 
 #. type: Plain text
 #: en/git-p4.txt:511
 #, priority:100
 msgid "If you have a repository where all the branches of interest exist as subdirectories of a single depot path, you can use `--detect-branches` when cloning or syncing to have 'git p4' automatically find subdirectories in p4, and to generate these as branches in Git."
-msgstr ""
-"Caso você possua um repositório onde todas as ramificações de interesse "
-"existam como subdiretórios de um único caminho do depósito, é possível "
-"utilizar o comando `--detect-branches` durante a clonagem ou sincronização "
-"para que o comando 'git p4' encontre automaticamente os subdiretórios p4 e "
-"gere-os como os ramos no Git."
+msgstr "Caso você possua um repositório onde todas as ramificações de interesse existam como subdiretórios de um único caminho do depósito, é possível utilizar o comando `--detect-branches` durante a clonagem ou sincronização para que o comando 'git p4' encontre automaticamente os subdiretórios p4 e gere-os como os ramos no Git."
 
 #. type: Plain text
 #: en/git-p4.txt:513
@@ -40814,23 +36584,13 @@ msgstr "git p4 clone --detect-branches //depot@all\n"
 #: en/git-p4.txt:529
 #, priority:100
 msgid "produces a separate branch in 'refs/remotes/p4/' for //depot/main, called 'master', and one for //depot/branch1 called 'depot/branch1'."
-msgstr ""
-"produz uma ramificação separada em 'refs/remotes/p4/' para '//depot/main', "
-"chamado 'master', e uma para '//depot/branch1' chamada 'depot/branch1'."
+msgstr "produz uma ramificação separada em 'refs/remotes/p4/' para '//depot/main', chamado 'master', e uma para '//depot/branch1' chamada 'depot/branch1'."
 
 #. type: Plain text
 #: en/git-p4.txt:539
 #, priority:100
 msgid "However, it is not necessary to create branches in p4 to be able to use them like branches.  Because it is difficult to infer branch relationships automatically, a Git configuration setting 'git-p4.branchList' can be used to explicitly identify branch relationships.  It is a list of \"source:destination\" pairs, like a simple p4 branch specification, where the \"source\" and \"destination\" are the path elements in the p4 repository.  The example above relied on the presence of the p4 branch.  Without p4 branches, the same result will occur with:"
-msgstr ""
-"No entanto, não é necessário criar as ramificações p4 para poder utilizá-las "
-"como ramificações.  Como é difícil inferir nos relacionamentos da "
-"ramificação de forma automática, uma configuração Git 'git-p4.branchList' "
-"pode ser usada para identificar de forma explicita os relacionamentos da "
-"ramificação.  É uma lista de pares \"source:destination\", como uma "
-"especificação p4 simples do ramo onde \"origem\" e \"destino\" são os "
-"elementos do caminho no repositório p4.  O exemplo acima se baseou na "
-"presença do ramo p4.  Sem os ramos p4, o mesmo resultado ocorrerá com:"
+msgstr "No entanto, não é necessário criar as ramificações p4 para poder utilizá-las como ramificações.  Como é difícil inferir nos relacionamentos da ramificação de forma automática, uma configuração Git 'git-p4.branchList' pode ser usada para identificar de forma explicita os relacionamentos da ramificação.  É uma lista de pares \"source:destination\", como uma especificação p4 simples do ramo onde \"origem\" e \"destino\" são os elementos do caminho no repositório p4.  O exemplo acima se baseou na presença do ramo p4.  Sem os ramos p4, o mesmo resultado ocorrerá com:"
 
 #. type: delimited block -
 #: en/git-p4.txt:544
@@ -40850,20 +36610,13 @@ msgstr ""
 #: en/git-p4.txt:553
 #, priority:100
 msgid "The fast-import mechanism used by 'git p4' creates one pack file for each invocation of 'git p4 sync'.  Normally, Git garbage compression (linkgit:git-gc[1]) automatically compresses these to fewer pack files, but explicit invocation of 'git repack -adf' may improve performance."
-msgstr ""
-"O mecanismo de importação rápida usado pelo 'git p4' cria um arquivo de "
-"pacote para cada chamada do 'git p4 sync'.  Normalmente, a compactação de "
-"lixo do Git (linkgit:git-gc[1]) as compacta de forma automática com menos "
-"arquivos no pacote, porém a chamada explícita do comando 'git repack -adf' "
-"pode ajudar a melhorar o desempenho."
+msgstr "O mecanismo de importação rápida usado pelo 'git p4' cria um arquivo de pacote para cada chamada do 'git p4 sync'.  Normalmente, a compactação de lixo do Git (linkgit:git-gc[1]) as compacta de forma automática com menos arquivos no pacote, porém a chamada explícita do comando 'git repack -adf' pode ajudar a melhorar o desempenho."
 
 #. type: Plain text
 #: en/git-p4.txt:559
 #, priority:100
 msgid "The following config settings can be used to modify 'git p4' behavior.  They all are in the 'git-p4' section."
-msgstr ""
-"As seguintes configurações podem ser usadas para alterar o comportamento do "
-"'git p4'.  Todos eles estão na seção 'git-p4'."
+msgstr "As seguintes configurações podem ser usadas para alterar o comportamento do 'git p4'.  Todos eles estão na seção 'git-p4'."
 
 #. type: Title ~
 #: en/git-p4.txt:561
@@ -40881,9 +36634,7 @@ msgstr "git-p4.user"
 #: en/git-p4.txt:565
 #, priority:100
 msgid "User specified as an option to all p4 commands, with '-u <user>'.  The environment variable `P4USER` can be used instead."
-msgstr ""
-"Usuário especificado como uma opção para todos os comandos p4, com '-u "
-"<usuário>'.  A variável de ambiente `P4USER` pode ser utilizada."
+msgstr "Usuário especificado como uma opção para todos os comandos p4, com '-u <usuário>'.  A variável de ambiente `P4USER` pode ser utilizada."
 
 #. type: Labeled list
 #: en/git-p4.txt:566
@@ -40895,9 +36646,7 @@ msgstr "git-p4.password"
 #: en/git-p4.txt:570
 #, priority:100
 msgid "Password specified as an option to all p4 commands, with '-P <password>'.  The environment variable `P4PASS` can be used instead."
-msgstr ""
-"Uma senha definida como uma opção para todos os comandos p4, com '-P "
-"<senha>'.  A variável de ambiente `P4PASS` pode ser utilizada."
+msgstr "Uma senha definida como uma opção para todos os comandos p4, com '-P <senha>'.  A variável de ambiente `P4PASS` pode ser utilizada."
 
 #. type: Labeled list
 #: en/git-p4.txt:571
@@ -40909,9 +36658,7 @@ msgstr "git-p4.port"
 #: en/git-p4.txt:575
 #, priority:100
 msgid "Port specified as an option to all p4 commands, with '-p <port>'.  The environment variable `P4PORT` can be used instead."
-msgstr ""
-"Uma porta definida como uma opção para todos os comandos p4, com '-p "
-"<porta>'.  A variável de ambiente `P4PORT` pode ser utilizada."
+msgstr "Uma porta definida como uma opção para todos os comandos p4, com '-p <porta>'.  A variável de ambiente `P4PORT` pode ser utilizada."
 
 #. type: Labeled list
 #: en/git-p4.txt:576
@@ -40923,9 +36670,7 @@ msgstr "git-p4.host"
 #: en/git-p4.txt:580
 #, priority:100
 msgid "Host specified as an option to all p4 commands, with '-h <host>'.  The environment variable `P4HOST` can be used instead."
-msgstr ""
-"O host definido como uma opção para todos os comandos p4, com '-h <host>'.  "
-"A variável de ambiente `P4HOST` pode ser utilizada."
+msgstr "O host definido como uma opção para todos os comandos p4, com '-h <host>'.  A variável de ambiente `P4HOST` pode ser utilizada."
 
 #. type: Labeled list
 #: en/git-p4.txt:581
@@ -40937,9 +36682,7 @@ msgstr "git-p4.client"
 #: en/git-p4.txt:584
 #, priority:100
 msgid "Client specified as an option to all p4 commands, with '-c <client>', including the client spec."
-msgstr ""
-"Específico do cliente como uma opção para todos os comandos p4, com '-c "
-"<cliente>', incluindo a definição do cliente."
+msgstr "Específico do cliente como uma opção para todos os comandos p4, com '-c <cliente>', incluindo a definição do cliente."
 
 #. type: Labeled list
 #: en/git-p4.txt:585
@@ -40951,12 +36694,7 @@ msgstr "git-p4.retries"
 #: en/git-p4.txt:590
 #, priority:100
 msgid "Specifies the number of times to retry a p4 command (notably, 'p4 sync') if the network times out. The default value is 3.  Set the value to 0 to disable retries or if your p4 version does not support retries (pre 2012.2)."
-msgstr ""
-"Define a quantidade de vezes para tentar novamente um comando p4 ("
-"principalmente, 'p4 sync') caso a rede atinja o tempo limite. O valor "
-"predefinido é 3.  Define o valor como 0 para desativar as tentativas ou se a "
-"sua versão 'p4' não for compatível com tentativas (anteriores a versão 2012."
-"2)."
+msgstr "Define a quantidade de vezes para tentar novamente um comando p4 (principalmente, 'p4 sync') caso a rede atinja o tempo limite. O valor predefinido é 3.  Define o valor como 0 para desativar as tentativas ou se a sua versão 'p4' não for compatível com tentativas (anteriores a versão 2012.2)."
 
 #. type: Title ~
 #: en/git-p4.txt:592
@@ -40974,13 +36712,7 @@ msgstr "git-p4.syncFromOrigin"
 #: en/git-p4.txt:599
 #, priority:100
 msgid "Because importing commits from other Git repositories is much faster than importing them from p4, a mechanism exists to find p4 changes first in Git remotes.  If branches exist under 'refs/remote/origin/p4', those will be fetched and used when syncing from p4.  This variable can be set to 'false' to disable this behavior."
-msgstr ""
-"Como a importação dos commits dos outros repositórios Git é muito mais "
-"rápido do que a importação através do 'p4', existe um mecanismo para "
-"encontrar as alterações 'p4' primeiro nos ramos remotos do Git.  Caso "
-"existam ramos em 'refs/remote/origin/p4', elas serão buscadas e utilizada "
-"durante a sincronização a partir do 'p4'.  Para desativar esse "
-"comportamento, esta variável pode ser definida como 'false'."
+msgstr "Como a importação dos commits dos outros repositórios Git é muito mais rápido do que a importação através do 'p4', existe um mecanismo para encontrar as alterações 'p4' primeiro nos ramos remotos do Git.  Caso existam ramos em 'refs/remote/origin/p4', elas serão buscadas e utilizada durante a sincronização a partir do 'p4'.  Para desativar esse comportamento, esta variável pode ser definida como 'false'."
 
 #. type: Labeled list
 #: en/git-p4.txt:600
@@ -40992,11 +36724,7 @@ msgstr "git-p4.branchUser"
 #: en/git-p4.txt:605
 #, priority:100
 msgid "One phase in branch detection involves looking at p4 branches to find new ones to import.  By default, all branches are inspected.  This option limits the search to just those owned by the single user named in the variable."
-msgstr ""
-"Uma fase na detecção do ramo envolve olhar para os ramos 'p4' para encontrar "
-"os novos que serão importados.  É predefinido que todas as ramificações "
-"sejam inspecionadas.  Essa opção limita a pesquisa apenas àqueles "
-"pertencentes ao único usuário informado na variável."
+msgstr "Uma fase na detecção do ramo envolve olhar para os ramos 'p4' para encontrar os novos que serão importados.  É predefinido que todas as ramificações sejam inspecionadas.  Essa opção limita a pesquisa apenas àqueles pertencentes ao único usuário informado na variável."
 
 #. type: Labeled list
 #: en/git-p4.txt:606
@@ -41008,11 +36736,7 @@ msgstr "git-p4.branchList"
 #: en/git-p4.txt:611
 #, priority:100
 msgid "List of branches to be imported when branch detection is enabled.  Each entry should be a pair of branch names separated by a colon (:).  This example declares that both branchA and branchB were created from main:"
-msgstr ""
-"A lista dos ramos que serão importados quando a detecção da ramificação "
-"estiver ativo.  Cada entrada deve ser um par dos nomes das ramificações "
-"separados por dois pontos (:).  Este exemplo declara que 'branchA' e "
-"'branchB' foram criados a partir de 'main':"
+msgstr "A lista dos ramos que serão importados quando a detecção da ramificação estiver ativo.  Cada entrada deve ser um par dos nomes das ramificações separados por dois pontos (:).  Este exemplo declara que 'branchA' e 'branchB' foram criados a partir de 'main':"
 
 #. type: delimited block -
 #: en/git-p4.txt:615
@@ -41034,9 +36758,7 @@ msgstr "git-p4.ignoredP4Labels"
 #: en/git-p4.txt:620
 #, priority:100
 msgid "List of p4 labels to ignore. This is built automatically as unimportable labels are discovered."
-msgstr ""
-"Lista das etiquetas p4 que serão ignoradas. Isso é criado automaticamente à "
-"medida que etiquetas não importantes forem descobertas."
+msgstr "Lista das etiquetas p4 que serão ignoradas. Isso é criado automaticamente à medida que etiquetas não importantes forem descobertas."
 
 #. type: Labeled list
 #: en/git-p4.txt:621
@@ -41060,9 +36782,7 @@ msgstr "git-p4.labelImportRegexp"
 #: en/git-p4.txt:627
 #, priority:100
 msgid "Only p4 labels matching this regular expression will be imported. The default value is '[a-zA-Z0-9_\\-.]+$'."
-msgstr ""
-"Apenas os rótulos 'p4' coincidentes com esta expressão regular serão "
-"importados. O valor predefinido é '[a-zA-Z0-9_\\-.]+$'."
+msgstr "Apenas os rótulos 'p4' coincidentes com esta expressão regular serão importados. O valor predefinido é '[a-zA-Z0-9_\\-.]+$'."
 
 #. type: Labeled list
 #: en/git-p4.txt:628
@@ -41074,11 +36794,7 @@ msgstr "git-p4.useClientSpec"
 #: en/git-p4.txt:633
 #, priority:100
 msgid "Specify that the p4 client spec should be used to identify p4 depot paths of interest.  This is equivalent to specifying the option `--use-client-spec`.  See the \"CLIENT SPEC\" section above.  This variable is a boolean, not the name of a p4 client."
-msgstr ""
-"Define que a especificação do cliente p4 deve ser utilizada para identificar "
-"os caminhos de interesse do depósito 'p4'.  Isto é o mesmo que utilizar a "
-"opção `--use-client-spec`.  Consulte a seção \"ESPECIFICAÇÃO DO CLIENTE\" "
-"acima.  Essa variável é um booleano e não o nome de um cliente 'p4'."
+msgstr "Define que a especificação do cliente p4 deve ser utilizada para identificar os caminhos de interesse do depósito 'p4'.  Isto é o mesmo que utilizar a opção `--use-client-spec`.  Consulte a seção \"ESPECIFICAÇÃO DO CLIENTE\" acima.  Essa variável é um booleano e não o nome de um cliente 'p4'."
 
 #. type: Labeled list
 #: en/git-p4.txt:634
@@ -41090,14 +36806,7 @@ msgstr "git-p4.pathEncoding"
 #: en/git-p4.txt:640
 #, priority:100
 msgid "Perforce keeps the encoding of a path as given by the originating OS.  Git expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding Perforce had used for the paths. This encoding is used to transcode the paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to encode path names."
-msgstr ""
-"O 'Perforce' mantém a codificação de um caminho conforme seja informado pelo "
-"sistema operacional da origem.  O Git espera que os caminhos sejam "
-"codificados como UTF-8. Utilize esta configuração para informar ao git-p4 "
-"qual a codificação que o Perforce utilizou para os caminhos. Essa "
-"codificação é utilizada para transcodificar os caminhos para UTF-8. Como "
-"exemplo, o \"Perforce\" no Windows geralmente utilizam \"cp1252\" para "
-"codificar os nomes dos caminhos."
+msgstr "O 'Perforce' mantém a codificação de um caminho conforme seja informado pelo sistema operacional da origem.  O Git espera que os caminhos sejam codificados como UTF-8. Utilize esta configuração para informar ao git-p4 qual a codificação que o Perforce utilizou para os caminhos. Essa codificação é utilizada para transcodificar os caminhos para UTF-8. Como exemplo, o \"Perforce\" no Windows geralmente utilizam \"cp1252\" para codificar os nomes dos caminhos."
 
 #. type: Labeled list
 #: en/git-p4.txt:641
@@ -41109,13 +36818,7 @@ msgstr "git-p4.largeFileSystem"
 #: en/git-p4.txt:647
 #, priority:100
 msgid "Specify the system that is used for large (binary) files. Please note that large file systems do not support the 'git p4 submit' command.  Only Git LFS is implemented right now (see https://git-lfs.github.com/ for more information). Download and install the Git LFS command line extension to use this option and configure it like this:"
-msgstr ""
-"Especifique o sistema utilizado para os arquivos (binários) grandes. Observe "
-"que os sistemas dos arquivos grandes não são compatíveis o comando 'git p4 "
-"submit'.  Apenas o 'Git LFS' está implementado no momento (consulte https"
-"://git-lfs.github.com/ para obter mais informações). Baixe e instale a "
-"extensão da linha de comando do 'Git LFS' para utilizar esta opção e "
-"configurá-la da seguinte maneira:"
+msgstr "Especifique o sistema utilizado para os arquivos (binários) grandes. Observe que os sistemas dos arquivos grandes não são compatíveis o comando 'git p4 submit'.  Apenas o 'Git LFS' está implementado no momento (consulte https://git-lfs.github.com/ para obter mais informações). Baixe e instale a extensão da linha de comando do 'Git LFS' para utilizar esta opção e configurá-la da seguinte maneira:"
 
 #. type: delimited block -
 #: en/git-p4.txt:650
@@ -41133,10 +36836,7 @@ msgstr "git-p4.largeFileExtensions"
 #: en/git-p4.txt:655
 #, priority:100
 msgid "All files matching a file extension in the list will be processed by the large file system. Do not prefix the extensions with '.'."
-msgstr ""
-"Todos os arquivos que coincidam com uma extensão do arquivo na lista serão "
-"processados pelo grande sistema de arquivos. Não prefixe as extensões com "
-"'.'."
+msgstr "Todos os arquivos que coincidam com uma extensão do arquivo na lista serão processados pelo grande sistema de arquivos. Não prefixe as extensões com '.'."
 
 #. type: Labeled list
 #: en/git-p4.txt:656
@@ -41148,11 +36848,7 @@ msgstr "git-p4.largeFileThreshold"
 #: en/git-p4.txt:660
 #, priority:100
 msgid "All files with an uncompressed size exceeding the threshold will be processed by the large file system. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
-msgstr ""
-"Todos os arquivos onde seu tamanho descompactado exceda o limite, os maiores "
-"arquivos serão processados pelo sistema. A predefinição retorna para que o "
-"limite seja definido em bytes. Adicione o sufixo 'k', 'm' ou 'g' para "
-"alterar a unidade."
+msgstr "Todos os arquivos onde seu tamanho descompactado exceda o limite, os maiores arquivos serão processados pelo sistema. A predefinição retorna para que o limite seja definido em bytes. Adicione o sufixo 'k', 'm' ou 'g' para alterar a unidade."
 
 #. type: Labeled list
 #: en/git-p4.txt:661
@@ -41164,11 +36860,7 @@ msgstr "git-p4.largeFileCompressedThreshold"
 #: en/git-p4.txt:666
 #, priority:100
 msgid "All files with a compressed size exceeding the threshold will be processed by the large file system. This option might slow down your clone/sync process. By default the threshold is defined in bytes. Add the suffix k, m, or g to change the unit."
-msgstr ""
-"All files with a compressed size exceeding the threshold will be processed "
-"by the large file system. This option might slow down your clone/sync "
-"process. É predefinido que o limite seja definido em bytes. Adicione o "
-"sufixo 'k', 'm' ou 'g' para alterar a unidade."
+msgstr "All files with a compressed size exceeding the threshold will be processed by the large file system. This option might slow down your clone/sync process. É predefinido que o limite seja definido em bytes. Adicione o sufixo 'k', 'm' ou 'g' para alterar a unidade."
 
 #. type: Labeled list
 #: en/git-p4.txt:667
@@ -41180,9 +36872,7 @@ msgstr "git-p4.largeFilePush"
 #: en/git-p4.txt:670
 #, priority:100
 msgid "Boolean variable which defines if large files are automatically pushed to a server."
-msgstr ""
-"A variável booleana que define se arquivos grandes são automaticamente "
-"enviados para um servidor."
+msgstr "A variável booleana que define se arquivos grandes são automaticamente enviados para um servidor."
 
 #. type: Labeled list
 #: en/git-p4.txt:671
@@ -41194,10 +36884,7 @@ msgstr "git-p4.keepEmptyCommits"
 #: en/git-p4.txt:674
 #, priority:100
 msgid "A changelist that contains only excluded files will be imported as an empty commit if this boolean option is set to true."
-msgstr ""
-"Uma lista de alterações que contenha apenas com os arquivos que foram "
-"excluídos será importada como um commit vazia, caso esta opção estiver "
-"configurada como 'true'."
+msgstr "Uma lista de alterações que contenha apenas com os arquivos que foram excluídos será importada como um commit vazia, caso esta opção estiver configurada como 'true'."
 
 #. type: Labeled list
 #: en/git-p4.txt:675
@@ -41209,25 +36896,19 @@ msgstr "git-p4.mapUser"
 #: en/git-p4.txt:678
 #, priority:100
 msgid "Map a P4 user to a name and email address in Git. Use a string with the following format to create a mapping:"
-msgstr ""
-"Mapeie um usuário 'P4' para um nome e endereço de e-mail no Git. Para criar "
-"um mapeamento, utilize uma sequência com o seguinte formato:"
+msgstr "Mapeie um usuário 'P4' para um nome e endereço de e-mail no Git. Para criar um mapeamento, utilize uma sequência com o seguinte formato:"
 
 #. type: delimited block -
 #: en/git-p4.txt:681
 #, no-wrap, priority:100
 msgid "git config --add git-p4.mapUser \"p4user = First Last <mail@address.com>\"\n"
-msgstr ""
-"git config --add git-p4.mapUser \"p4user = Primeiro Último <mail@address.com>"
-"\"\n"
+msgstr "git config --add git-p4.mapUser \"p4user = Primeiro Último <mail@address.com>\"\n"
 
 #. type: Plain text
 #: en/git-p4.txt:685
 #, priority:100
 msgid "A mapping will override any user information from P4. Mappings for multiple P4 user can be defined."
-msgstr ""
-"Um mapeamento substituirá quaisquer informações do usuário do 'P4'. Os "
-"mapeamentos para os vários usuários 'P4' podem ser definidos."
+msgstr "Um mapeamento substituirá quaisquer informações do usuário do 'P4'. Os mapeamentos para os vários usuários 'P4' podem ser definidos."
 
 #. type: Title ~
 #: en/git-p4.txt:687
@@ -41245,9 +36926,7 @@ msgstr "git-p4.detectRenames"
 #: en/git-p4.txt:691
 #, priority:100
 msgid "Detect renames.  See linkgit:git-diff[1].  This can be true, false, or a score as expected by 'git diff -M'."
-msgstr ""
-"Detecte as renomeações.  Consulte linkgit:git-diff[1].  Pode ser 'true', "
-"'false' ou uma pontuação conforme é o esperado pelo comando 'git diff -M'."
+msgstr "Detecte as renomeações.  Consulte linkgit:git-diff[1].  Pode ser 'true', 'false' ou uma pontuação conforme é o esperado pelo comando 'git diff -M'."
 
 #. type: Labeled list
 #: en/git-p4.txt:692
@@ -41259,9 +36938,7 @@ msgstr "git-p4.detectCopies"
 #: en/git-p4.txt:695
 #, priority:100
 msgid "Detect copies.  See linkgit:git-diff[1].  This can be true, false, or a score as expected by 'git diff -C'."
-msgstr ""
-"Detecta cópias.  Consulte linkgit:git-diff[1].  Pode ser 'true', 'false' ou "
-"uma pontuação conforme é o esperado pelo comando 'git diff -C'."
+msgstr "Detecta cópias.  Consulte linkgit:git-diff[1].  Pode ser 'true', 'false' ou uma pontuação conforme é o esperado pelo comando 'git diff -C'."
 
 #. type: Labeled list
 #: en/git-p4.txt:696
@@ -41285,9 +36962,7 @@ msgstr "git-p4.preserveUser"
 #: en/git-p4.txt:702
 #, priority:100
 msgid "On submit, re-author changes to reflect the Git author, regardless of who invokes 'git p4 submit'."
-msgstr ""
-"Ao enviar, recrie as alterações do usuário para refletir o autor do Git, "
-"independentemente de quem chame o comando 'git p4 submit'."
+msgstr "Ao enviar, recrie as alterações do usuário para refletir o autor do Git, independentemente de quem chame o comando 'git p4 submit'."
 
 #. type: Labeled list
 #: en/git-p4.txt:703
@@ -41299,10 +36974,7 @@ msgstr "git-p4.allowMissingP4Users"
 #: en/git-p4.txt:707
 #, priority:100
 msgid "When 'preserveUser' is true, 'git p4' normally dies if it cannot find an author in the p4 user map.  This setting submits the change regardless."
-msgstr ""
-"Quando 'preserveUser' for verdadeiro, o comando 'git p4' normalmente é "
-"encerrado caso não consiga encontrar um autor no mapa do usuário p4.  Esta "
-"configuração envia as alterações independentemente de qualquer coisa."
+msgstr "Quando 'preserveUser' for verdadeiro, o comando 'git p4' normalmente é encerrado caso não consiga encontrar um autor no mapa do usuário p4.  Esta configuração envia as alterações independentemente de qualquer coisa."
 
 #. type: Labeled list
 #: en/git-p4.txt:708
@@ -41314,10 +36986,7 @@ msgstr "git-p4.skipSubmitEdit"
 #: en/git-p4.txt:712
 #, priority:100
 msgid "The submit process invokes the editor before each p4 change is submitted.  If this setting is true, though, the editing step is skipped."
-msgstr ""
-"O processo de envio chama o editor antes de cada alteração no 'p4' que será "
-"enviado.  Caso esta configuração seja verdadeira, a etapa de edição será "
-"ignorada."
+msgstr "O processo de envio chama o editor antes de cada alteração no 'p4' que será enviado.  Caso esta configuração seja verdadeira, a etapa de edição será ignorada."
 
 #. type: Labeled list
 #: en/git-p4.txt:713
@@ -41329,10 +36998,7 @@ msgstr "git-p4.skipSubmitEditCheck"
 #: en/git-p4.txt:717
 #, priority:100
 msgid "After editing the p4 change message, 'git p4' makes sure that the description really was changed by looking at the file modification time.  This option disables that test."
-msgstr ""
-"Após editar a mensagem de alteração 'p4', o comando 'git p4' garante que a "
-"descrição realmente foi alterada observando a hora da modificação do "
-"arquivo.  Esta opção desativa este teste."
+msgstr "Após editar a mensagem de alteração 'p4', o comando 'git p4' garante que a descrição realmente foi alterada observando a hora da modificação do arquivo.  Esta opção desativa este teste."
 
 #. type: Labeled list
 #: en/git-p4.txt:718
@@ -41344,12 +37010,7 @@ msgstr "git-p4.allowSubmit"
 #: en/git-p4.txt:724
 #, priority:100
 msgid "By default, any branch can be used as the source for a 'git p4 submit' operation.  This configuration variable, if set, permits only the named branches to be used as submit sources.  Branch names must be the short names (no \"refs/heads/\"), and should be separated by commas (\",\"), with no spaces."
-msgstr ""
-"É predefinido que qualquer ramo possa ser utilizado como uma fonte para uma "
-"operação 'git p4 submit'.  Esta variável de configuração, se definida, "
-"permite que apenas os ramos informado sejam utilizados  como as fontes para "
-"envio.  Os nomes das ramificações devem ser os nomes abreviados (sem \"refs/"
-"heads/\") e devem ser separados por vírgulas (\",\") e sem espaços."
+msgstr "É predefinido que qualquer ramo possa ser utilizado como uma fonte para uma operação 'git p4 submit'.  Esta variável de configuração, se definida, permite que apenas os ramos informado sejam utilizados  como as fontes para envio.  Os nomes das ramificações devem ser os nomes abreviados (sem \"refs/heads/\") e devem ser separados por vírgulas (\",\") e sem espaços."
 
 #. type: Labeled list
 #: en/git-p4.txt:725
@@ -41361,10 +37022,7 @@ msgstr "git-p4.skipUserNameCheck"
 #: en/git-p4.txt:729
 #, priority:100
 msgid "If the user running 'git p4 submit' does not exist in the p4 user map, 'git p4' exits.  This option can be used to force submission regardless."
-msgstr ""
-"Caso o usuário executando o comando 'git p4 submit' não existir no mapa do "
-"usuário p4, o 'git p4' será encerrado.  Esta opção pode ser utilizada para "
-"impor o envio mesmo assim."
+msgstr "Caso o usuário executando o comando 'git p4 submit' não existir no mapa do usuário p4, o 'git p4' será encerrado.  Esta opção pode ser utilizada para impor o envio mesmo assim."
 
 #. type: Labeled list
 #: en/git-p4.txt:730
@@ -41376,11 +37034,7 @@ msgstr "git-p4.attemptRCSCleanup"
 #: en/git-p4.txt:735
 #, priority:100
 msgid "If enabled, 'git p4 submit' will attempt to cleanup RCS keywords ($Header$, etc). These would otherwise cause merge conflicts and prevent the submit going ahead. This option should be considered experimental at present."
-msgstr ""
-"Caso seja ativado, o 'git p4 submit' tentará limpar as palavras-chave do RCS "
-"($Header$, etc). Caso contrário, eles causariam conflitos na mesclagem e "
-"impediriam que o envio prossiga. no momento, esta opção deve ser considerada "
-"experimental."
+msgstr "Caso seja ativado, o 'git p4 submit' tentará limpar as palavras-chave do RCS ($Header$, etc). Caso contrário, eles causariam conflitos na mesclagem e impediriam que o envio prossiga. no momento, esta opção deve ser considerada experimental."
 
 #. type: Labeled list
 #: en/git-p4.txt:736
@@ -41392,8 +37046,7 @@ msgstr "git-p4.exportLabels"
 #: en/git-p4.txt:738
 #, priority:100
 msgid "Export Git tags to p4 labels, as per --export-labels."
-msgstr ""
-"Exporte as tags Git para os rótulos p4, conforme a opção `--export-labels`."
+msgstr "Exporte as tags Git para os rótulos p4, conforme a opção `--export-labels`."
 
 #. type: Labeled list
 #: en/git-p4.txt:739
@@ -41405,9 +37058,7 @@ msgstr "git-p4.labelExportRegexp"
 #: en/git-p4.txt:742
 #, priority:100
 msgid "Only p4 labels matching this regular expression will be exported. The default value is '[a-zA-Z0-9_\\-.]+$'."
-msgstr ""
-"Somente rótulos p4 correspondentes a essa expressão regular serão "
-"exportados. O valor predefinido é '[a-zA-Z0-9_\\-.]+$'."
+msgstr "Somente rótulos p4 correspondentes a essa expressão regular serão exportados. O valor predefinido é '[a-zA-Z0-9_\\-.]+$'."
 
 #. type: Labeled list
 #: en/git-p4.txt:743
@@ -41419,9 +37070,7 @@ msgstr "git-p4.conflict"
 #: en/git-p4.txt:746
 #, priority:100
 msgid "Specify submit behavior when a conflict with p4 is found, as per --conflict.  The default behavior is 'ask'."
-msgstr ""
-"Determina o comportamento de envio quando um conflito com p4 for encontrado, "
-"conforme `--conflict`.  O comportamento predefinido é 'ask'."
+msgstr "Determina o comportamento de envio quando um conflito com p4 for encontrado, conforme `--conflict`.  O comportamento predefinido é 'ask'."
 
 #. type: Labeled list
 #: en/git-p4.txt:747
@@ -41445,9 +37094,7 @@ msgstr "git-p4.disableP4Sync"
 #: en/git-p4.txt:752
 #, priority:100
 msgid "Do not sync p4/master with Perforce following a submit. Implies git-p4.disableRebase."
-msgstr ""
-"Não sincronize o 'p4/master' com o \"Perforce\" após o envio. Implies git-p4."
-"disableRebase."
+msgstr "Não sincronize o 'p4/master' com o \"Perforce\" após o envio. Implies git-p4.disableRebase."
 
 #. type: Title -
 #: en/git-p4.txt:754
@@ -41459,36 +37106,25 @@ msgstr "DETALHES DA IMPLEMENTAÇÃO"
 #: en/git-p4.txt:756
 #, priority:100
 msgid "Changesets from p4 are imported using Git fast-import."
-msgstr ""
-"Os conjuntos de alterações 'p4' são importados utilizando a importação "
-"rápida do Git."
+msgstr "Os conjuntos de alterações 'p4' são importados utilizando a importação rápida do Git."
 
 #. type: Plain text
 #: en/git-p4.txt:758
 #, priority:100
 msgid "Cloning or syncing does not require a p4 client; file contents are collected using 'p4 print'."
-msgstr ""
-"A clonagem ou a sincronização não requer um cliente 'p4'; o conteúdo do "
-"arquivo é coletado utilizando 'p4 print'."
+msgstr "A clonagem ou a sincronização não requer um cliente 'p4'; o conteúdo do arquivo é coletado utilizando 'p4 print'."
 
 #. type: Plain text
 #: en/git-p4.txt:761
 #, priority:100
 msgid "Submitting requires a p4 client, which is not in the same location as the Git repository.  Patches are applied, one at a time, to this p4 client and submitted from there."
-msgstr ""
-"O envio requer um cliente 'p4', que não esteja no mesmo local que o "
-"repositório Git.  Os patches são aplicados, um de cada vez neste cliente "
-"'p4' e enviados a partir daí."
+msgstr "O envio requer um cliente 'p4', que não esteja no mesmo local que o repositório Git.  Os patches são aplicados, um de cada vez neste cliente 'p4' e enviados a partir daí."
 
 #. type: Plain text
 #: en/git-p4.txt:764
 #, priority:100
 msgid "Each commit imported by 'git p4' has a line at the end of the log message indicating the p4 depot location and change number.  This line is used by later 'git p4 sync' operations to know which p4 changes are new."
-msgstr ""
-"Cada commit importado pelo 'git p4' possui uma linha no final da mensagem do "
-"registro log indicando a localização do depósito p4 e o número da "
-"alteração.  Esta linha é utilizada pelas operações posteriores do 'git p4 "
-"sync' para saber quais foram alterações do p4 são novas."
+msgstr "Cada commit importado pelo 'git p4' possui uma linha no final da mensagem do registro log indicando a localização do depósito p4 e o número da alteração.  Esta linha é utilizada pelas operações posteriores do 'git p4 sync' para saber quais foram alterações do p4 são novas."
 
 #. type: Title =
 #: en/git-pack-objects.txt:2
@@ -41513,8 +37149,7 @@ msgid ""
 "\t[--stdout [--filter=<filter-spec>] | base-name]\n"
 "\t[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list\n"
 msgstr ""
-"'git pack-objects' [-q | --progress | --all-progress] [--all-progress-"
-"implied]\n"
+"'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]\n"
 "\t[--no-reuse-delta] [--delta-base-offset] [--non-empty]\n"
 "\t[--local] [--incremental] [--window=<n>] [--depth=<n>]\n"
 "\t[--revs [--unpacked | --all]] [--keep-pack=<nome-do-pacote>]\n"
@@ -41525,52 +37160,31 @@ msgstr ""
 #: en/git-pack-objects.txt:25
 #, priority:100
 msgid "Reads list of objects from the standard input, and writes either one or more packed archives with the specified base-name to disk, or a packed archive to the standard output."
-msgstr ""
-"Lê a lista dos objetos da entrada padrão e grava um ou mais arquivos "
-"compactados com o nome da base informada no disco ou em um arquivo "
-"compactado na saída padrão."
+msgstr "Lê a lista dos objetos da entrada padrão e grava um ou mais arquivos compactados com o nome da base informada no disco ou em um arquivo compactado na saída padrão."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:31
 #, priority:100
 msgid "A packed archive is an efficient way to transfer a set of objects between two repositories as well as an access efficient archival format.  In a packed archive, an object is either stored as a compressed whole or as a difference from some other object.  The latter is often called a delta."
-msgstr ""
-"Um arquivo compactado é uma maneira eficiente de transferir um conjunto de "
-"objetos entre dois repositórios, bem como um formato de arquivamento de "
-"acesso eficiente.  Em um arquivo compactado, ou um objeto é armazenado como "
-"um todo de forma compactada ou como uma diferença de um outro objeto.  O "
-"último é frequentemente chamado de delta."
+msgstr "Um arquivo compactado é uma maneira eficiente de transferir um conjunto de objetos entre dois repositórios, bem como um formato de arquivamento de acesso eficiente.  Em um arquivo compactado, ou um objeto é armazenado como um todo de forma compactada ou como uma diferença de um outro objeto.  O último é frequentemente chamado de delta."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:35
 #, priority:100
 msgid "The packed archive format (.pack) is designed to be self-contained so that it can be unpacked without any further information. Therefore, each object that a delta depends upon must be present within the pack."
-msgstr ""
-"O formato do arquivo compactado (.pack) foi projetado para ser independente, "
-"para que possa ser descompactado sem nenhuma informação adicional. Portanto, "
-"cada objeto onde um delta seja dependente, deve estar presente no pacote."
+msgstr "O formato do arquivo compactado (.pack) foi projetado para ser independente, para que possa ser descompactado sem nenhuma informação adicional. Portanto, cada objeto onde um delta seja dependente, deve estar presente no pacote."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:41
 #, priority:100
 msgid "A pack index file (.idx) is generated for fast, random access to the objects in the pack. Placing both the index file (.idx) and the packed archive (.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES)  enables Git to read from the pack archive."
-msgstr ""
-"Um arquivo do índice do pacote (.idx) é gerado para ter um acesso rápido e "
-"aleatório aos objetos no pacote. Colocando ambos os arquivo do índice (.idx) "
-"e o arquivo compactado (.pack) no subdiretório do pack/ "
-"`$GIT_OBJECT_DIRECTORY` (ou qualquer um dos diretórios em "
-"`$GIT_ALTERNATE_OBJECT_DIRECTORIES`) permite que o Git leia o arquivo "
-"compactado."
+msgstr "Um arquivo do índice do pacote (.idx) é gerado para ter um acesso rápido e aleatório aos objetos no pacote. Colocando ambos os arquivo do índice (.idx) e o arquivo compactado (.pack) no subdiretório do pack/ `$GIT_OBJECT_DIRECTORY` (ou qualquer um dos diretórios em `$GIT_ALTERNATE_OBJECT_DIRECTORIES`) permite que o Git leia o arquivo compactado."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:47
 #, priority:100
 msgid "The 'git unpack-objects' command can read the packed archive and expand the objects contained in the pack into \"one-file one-object\" format; this is typically done by the smart-pull commands when a pack is created on-the-fly for efficient network transport by their peers."
-msgstr ""
-"O comando 'git unpack-objects' pode ler o arquivo compactado e expandir os "
-"objetos existentes no pacote no formato \"um-arquivo, um-objeto\"; isso "
-"geralmente é feito pelos comandos 'smart-pull' quando um pacote é criado em "
-"tempo real por um transporte de rede eficiente pelos seus pares."
+msgstr "O comando 'git unpack-objects' pode ler o arquivo compactado e expandir os objetos existentes no pacote no formato \"um-arquivo, um-objeto\"; isso geralmente é feito pelos comandos 'smart-pull' quando um pacote é criado em tempo real por um transporte de rede eficiente pelos seus pares."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:51
@@ -41582,20 +37196,13 @@ msgstr "base-name"
 #: en/git-pack-objects.txt:58
 #, priority:100
 msgid "Write into pairs of files (.pack and .idx), using <base-name> to determine the name of the created file.  When this option is used, the two files in a pair are written in <base-name>-<SHA-1>.{pack,idx} files.  <SHA-1> is a hash based on the pack content and is written to the standard output of the command."
-msgstr ""
-"Escreva em pares de arquivos (.pack e .idx), utilizando <nome-base> para "
-"determinar o nome do arquivo que foi criado.  Quando essa opção é utilizada, "
-"os dois arquivos em um par são gravados nos arquivos <nome-"
-"base>-<SHA-1>.{pack,idx}.  O <SHA-1> é um hash baseado no conteúdo do pacote "
-"e é gravado na saída padrão do comando."
+msgstr "Escreva em pares de arquivos (.pack e .idx), utilizando <nome-base> para determinar o nome do arquivo que foi criado.  Quando essa opção é utilizada, os dois arquivos em um par são gravados nos arquivos <nome-base>-<SHA-1>.{pack,idx}.  O <SHA-1> é um hash baseado no conteúdo do pacote e é gravado na saída padrão do comando."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:62
 #, priority:100
 msgid "Write the pack contents (what would have been written to .pack file) out to the standard output."
-msgstr ""
-"Escreva o conteúdo do pacote (o que teria sido gravado no arquivo .pack) na "
-"saída padrão."
+msgstr "Escreva o conteúdo do pacote (o que teria sido gravado no arquivo .pack) na saída padrão."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:63
@@ -41607,13 +37214,7 @@ msgstr "--revs"
 #: en/git-pack-objects.txt:71
 #, priority:100
 msgid "Read the revision arguments from the standard input, instead of individual object names.  The revision arguments are processed the same way as 'git rev-list' with the `--objects` flag uses its `commit` arguments to build the list of objects it outputs.  The objects on the resulting list are packed.  Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
-msgstr ""
-"Leia os argumentos da revisão da entrada padrão em vez dos nomes dos objetos "
-"individuais.  Os argumentos da revisão são processados da mesma maneira que "
-"o comando 'git rev-list' faz com o comando `--objects`, utiliza no seus "
-"argumentos `commit` para construir a lista dos objetos que ele gera.  Os "
-"objetos na lista resultante são compactados.  Além das revisões, as linhas "
-"`--not` ou `--shallow <SHA-1>` também são aceitas."
+msgstr "Leia os argumentos da revisão da entrada padrão em vez dos nomes dos objetos individuais.  Os argumentos da revisão são processados da mesma maneira que o comando 'git rev-list' faz com o comando `--objects`, utiliza no seus argumentos `commit` para construir a lista dos objetos que ele gera.  Os objetos na lista resultante são compactados.  Além das revisões, as linhas `--not` ou `--shallow <SHA-1>` também são aceitas."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:72 en/rev-list-options.txt:856
@@ -41625,28 +37226,19 @@ msgstr "--unpacked"
 #: en/git-pack-objects.txt:76
 #, priority:100
 msgid "This implies `--revs`.  When processing the list of revision arguments read from the standard input, limit the objects packed to those that are not already packed."
-msgstr ""
-"Implica no uso da opção `--revs`.  Ao processar a lista dos argumentos da "
-"revisão lidos a partir da entrada padrão, limite os objetos compactados "
-"àqueles que ainda não foram compactados."
+msgstr "Implica no uso da opção `--revs`.  Ao processar a lista dos argumentos da revisão lidos a partir da entrada padrão, limite os objetos compactados àqueles que ainda não foram compactados."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:82
 #, priority:100
 msgid "This implies `--revs`.  In addition to the list of revision arguments read from the standard input, pretend as if all refs under `refs/` are specified to be included."
-msgstr ""
-"Implica no uso da opção `--revs`.  Além da lista de argumentos da revisão "
-"lidos na entrada padrão, finja que todas as refs em `refs/` estão definidas "
-"para serem incluídas."
+msgstr "Implica no uso da opção `--revs`.  Além da lista de argumentos da revisão lidos na entrada padrão, finja que todas as refs em `refs/` estão definidas para serem incluídas."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:87
 #, priority:100
 msgid "Include unasked-for annotated tags if the object they reference was included in the resulting packfile.  This can be useful to send new tags to native Git clients."
-msgstr ""
-"Inclua as anotações das tags que não foram solicitadas caso o objeto a que "
-"se referirem tenha sido incluído no arquivo do pacote resultante.  Pode ser "
-"útil para enviar as novas tags para os clientes nativos do Git."
+msgstr "Inclua as anotações das tags que não foram solicitadas caso o objeto a que se referirem tenha sido incluído no arquivo do pacote resultante.  Pode ser útil para enviar as novas tags para os clientes nativos do Git."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:88 en/git-repack.txt:89
@@ -41658,23 +37250,13 @@ msgstr "--window=<n>"
 #: en/git-pack-objects.txt:99
 #, priority:100
 msgid "These two options affect how the objects contained in the pack are stored using delta compression.  The objects are first internally sorted by type, size and optionally names and compared against the other objects within --window to see if using delta compression saves space.  --depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object."
-msgstr ""
-"Essas duas opções afetam como os objetos existentes no pacote são "
-"armazenados utilizando a compactação delta.  Os objetos primeiro são "
-"classificados internamente pelo tipo, tamanho e opcionalmente os nomes e "
-"comparados com os outros objetos existentes da opção `--window` para ver se "
-"a utilização da compactação delta economiza espaço.  A opção --depth limita "
-"a profundidade máxima do delta; torná-lo muito profundo afeta o desempenho "
-"do lado do desempacotador, porque os dados delta precisam ser aplicados "
-"muitas vezes para chegar ao objeto necessário."
+msgstr "Essas duas opções afetam como os objetos existentes no pacote são armazenados utilizando a compactação delta.  Os objetos primeiro são classificados internamente pelo tipo, tamanho e opcionalmente os nomes e comparados com os outros objetos existentes da opção `--window` para ver se a utilização da compactação delta economiza espaço.  A opção --depth limita a profundidade máxima do delta; torná-lo muito profundo afeta o desempenho do lado do desempacotador, porque os dados delta precisam ser aplicados muitas vezes para chegar ao objeto necessário."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:102 en/git-repack.txt:101
 #, priority:100
 msgid "The default value for --window is 10 and --depth is 50. The maximum depth is 4095."
-msgstr ""
-"O valor predefinido para a opção `--window` é 10 e o `--thp` é 50. O valor "
-"da profundidade máxima é 4095."
+msgstr "O valor predefinido para a opção `--window` é 10 e o `--thp` é 50. O valor da profundidade máxima é 4095."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:103 en/git-repack.txt:105
@@ -41686,29 +37268,13 @@ msgstr "--window-memory=<n>"
 #: en/git-pack-objects.txt:113
 #, priority:100
 msgid "This option provides an additional limit on top of `--window`; the window size will dynamically scale down so as to not take up more than '<n>' bytes in memory.  This is useful in repositories with a mix of large and small objects to not run out of memory with a large window, but still be able to take advantage of the large window for the smaller objects.  The size can be suffixed with \"k\", \"m\", or \"g\".  `--window-memory=0` makes memory usage unlimited.  The default is taken from the `pack.windowMemory` configuration variable."
-msgstr ""
-"Esta opção fornece um limite adicional em cima da opção `--window`; o "
-"tamanho da janela será reduzido dinamicamente para não ocupar mais do que "
-"'<n>' bytes na memória.  É útil nos repositórios com uma mistura de objetos "
-"grandes e pequenos para não ficar sem memória com uma janela grande, mas "
-"ainda assim pode tirar proveito da janela grande para os objetos menores.  O "
-"tamanho pode ter o sufixo \"k\", \"m\" ou \"g\".  A opção `--window-memory=0`"
-" torna o uso da memória ilimitado.  A predefinição é obtido da variável de "
-"configuração `pack.windowMemory`."
+msgstr "Esta opção fornece um limite adicional em cima da opção `--window`; o tamanho da janela será reduzido dinamicamente para não ocupar mais do que '<n>' bytes na memória.  É útil nos repositórios com uma mistura de objetos grandes e pequenos para não ficar sem memória com uma janela grande, mas ainda assim pode tirar proveito da janela grande para os objetos menores.  O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\".  A opção `--window-memory=0` torna o uso da memória ilimitado.  A predefinição é obtido da variável de configuração `pack.windowMemory`."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:125
 #, priority:100
 msgid "In unusual scenarios, you may not be able to create files larger than a certain size on your filesystem, and this option can be used to tell the command to split the output packfile into multiple independent packfiles, each not larger than the given size. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  This option prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
-msgstr ""
-"Em cenários incomuns, talvez você não consiga criar arquivos maiores que um "
-"determinado tamanho no seu sistema de arquivos, esta opção pode ser "
-"utilizada para dizer ao comando para dividir o arquivo de pacotes que for "
-"gerado em vários outros arquivos de pacotes menores, cada um não maior que "
-"um tamanho determinado. O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\". O "
-"tamanho mínimo permitido é limitado a 1 MiB.  Esta opção impede a criação de "
-"um índice bitmap.  A predefinição é ilimitada, a menos que a variável de "
-"configuração `pack.packSizeLimit` esteja definida."
+msgstr "Em cenários incomuns, talvez você não consiga criar arquivos maiores que um determinado tamanho no seu sistema de arquivos, esta opção pode ser utilizada para dizer ao comando para dividir o arquivo de pacotes que for gerado em vários outros arquivos de pacotes menores, cada um não maior que um tamanho determinado. O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\". O tamanho mínimo permitido é limitado a 1 MiB.  Esta opção impede a criação de um índice bitmap.  A predefinição é ilimitada, a menos que a variável de configuração `pack.packSizeLimit` esteja definida."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:126
@@ -41720,9 +37286,7 @@ msgstr "--honor-pack-keep"
 #: en/git-pack-objects.txt:130
 #, priority:100
 msgid "This flag causes an object already in a local pack that has a .keep file to be ignored, even if it would have otherwise been packed."
-msgstr ""
-"Esta opção faz com que um objeto que já esteja em um pacote local que possua "
-"um arquivo '.keep' seja ignorado, mesmo que já tivesse sido compactado."
+msgstr "Esta opção faz com que um objeto que já esteja em um pacote local que possua um arquivo '.keep' seja ignorado, mesmo que já tivesse sido compactado."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:131 en/git-repack.txt:143
@@ -41734,28 +37298,19 @@ msgstr "--keep-pack=<nome-do-pacote>"
 #: en/git-pack-objects.txt:137
 #, priority:100
 msgid "This flag causes an object already in the given pack to be ignored, even if it would have otherwise been packed. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`). The option could be specified multiple times to keep multiple packs."
-msgstr ""
-"Esta opção faz com que um objeto que já esteja no pacote informado seja "
-"ignorado, mesmo que ele tivesse sido compactado. O `<nome-do-pacote>` é o "
-"nome do arquivo do pacote sem o diretório principal (como por exemplo, "
-"`pack-123.pack`). A opção pode ser utilizada várias vezes para manter os "
-"vários pacotes."
+msgstr "Esta opção faz com que um objeto que já esteja no pacote informado seja ignorado, mesmo que ele tivesse sido compactado. O `<nome-do-pacote>` é o nome do arquivo do pacote sem o diretório principal (como por exemplo, `pack-123.pack`). A opção pode ser utilizada várias vezes para manter os vários pacotes."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:141
 #, priority:100
 msgid "This flag causes an object already in a pack to be ignored even if it would have otherwise been packed."
-msgstr ""
-"Esta opção faz com que um objeto que já esteja em um pacote seja ignorado, "
-"mesmo que ele tenha sido compactado."
+msgstr "Esta opção faz com que um objeto que já esteja em um pacote seja ignorado, mesmo que ele tenha sido compactado."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:146
 #, priority:100
 msgid "This flag causes an object that is borrowed from an alternate object store to be ignored even if it would have otherwise been packed."
-msgstr ""
-"Esta opção faz com que um objeto emprestado de um armazenamento de objetos "
-"alternativo seja ignorado, mesmo que já tivesse sido compactado."
+msgstr "Esta opção faz com que um objeto emprestado de um armazenamento de objetos alternativo seja ignorado, mesmo que já tivesse sido compactado."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:147
@@ -41767,8 +37322,7 @@ msgstr "--non-empty"
 #: en/git-pack-objects.txt:150
 #, priority:100
 msgid "Only create a packed archive if it would contain at least one object."
-msgstr ""
-"Crie apenas um arquivo compactado caso ele contenha pelo menos um objeto."
+msgstr "Crie apenas um arquivo compactado caso ele contenha pelo menos um objeto."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:177
@@ -41780,11 +37334,7 @@ msgstr "--no-reuse-delta"
 #: en/git-pack-objects.txt:183
 #, priority:100
 msgid "When creating a packed archive in a repository that has existing packs, the command reuses existing deltas.  This sometimes results in a slightly suboptimal pack.  This flag tells the command not to reuse existing deltas but compute them from scratch."
-msgstr ""
-"Ao criar um arquivo compactado em um repositório que possua pacotes "
-"existentes, o comando reutiliza os deltas ja existentes.  Às vezes, isso "
-"resulta em um pacote ligeiramente abaixo do ideal.  Esta opção informa ao "
-"comando para não reutilizar os deltas já existentes, mas calcule-os do zero."
+msgstr "Ao criar um arquivo compactado em um repositório que possua pacotes existentes, o comando reutiliza os deltas ja existentes.  Às vezes, isso resulta em um pacote ligeiramente abaixo do ideal.  Esta opção informa ao comando para não reutilizar os deltas já existentes, mas calcule-os do zero."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:184
@@ -41796,12 +37346,7 @@ msgstr "--no-reuse-object"
 #: en/git-pack-objects.txt:190
 #, priority:100
 msgid "This flag tells the command not to reuse existing object data at all, including non deltified object, forcing recompression of everything.  This implies --no-reuse-delta. Useful only in the obscure case where wholesale enforcement of a different compression level on the packed data is desired."
-msgstr ""
-"Esta opção informa ao comando para não reutilizar os dados já existentes do "
-"objeto, incluindo os objetos não \"deltificados\", forçando a recompressão "
-"de tudo.  Implica no uso da opção `--no-reuse-delta`. Útil apenas no caso "
-"obscuro onde seja desejada a imposição de um nível de compactação seja "
-"diferente dos dados compactados."
+msgstr "Esta opção informa ao comando para não reutilizar os dados já existentes do objeto, incluindo os objetos não \"deltificados\", forçando a recompressão de tudo.  Implica no uso da opção `--no-reuse-delta`. Útil apenas no caso obscuro onde seja desejada a imposição de um nível de compactação seja diferente dos dados compactados."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:191
@@ -41813,14 +37358,7 @@ msgstr "--compression=<n>"
 #: en/git-pack-objects.txt:198
 #, priority:100
 msgid "Specifies compression level for newly-compressed data in the generated pack.  If not specified, pack compression level is determined first by pack.compression, then by core.compression, and defaults to -1, the zlib default, if neither is set.  Add --no-reuse-object if you want to force a uniform compression level on all data no matter the source."
-msgstr ""
-"Define o nível de compactação para dados que foram recentemente compactados "
-"no pacote que foi gerado.  Caso não seja utilizado, o nível de compactação "
-"do pacote será determinado primeiro pelo `pack.compression`, depois pelo "
-"`core.compression` onde a predefinição retorna para -1, a predefinição do "
-"zlib, caso nenhum estiver definido.  Adicione `--no-reuse-object` quando "
-"quiser impor um nível de compactação uniforme em todos os dados, "
-"independentemente da origem."
+msgstr "Define o nível de compactação para dados que foram recentemente compactados no pacote que foi gerado.  Caso não seja utilizado, o nível de compactação do pacote será determinado primeiro pelo `pack.compression`, depois pelo `core.compression` onde a predefinição retorna para -1, a predefinição do zlib, caso nenhum estiver definido.  Adicione `--no-reuse-object` quando quiser impor um nível de compactação uniforme em todos os dados, independentemente da origem."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:199
@@ -41832,16 +37370,7 @@ msgstr "--[no-]sparse"
 #: en/git-pack-objects.txt:209
 #, priority:100
 msgid "Toggle the \"sparse\" algorithm to determine which objects to include in the pack, when combined with the \"--revs\" option. This algorithm only walks trees that appear in paths that introduce new objects.  This can have significant performance benefits when computing a pack to send a small change. However, it is possible that extra objects are added to the pack-file if the included commits contain certain types of direct renames. If this option is not included, it defaults to the value of `pack.useSparse`, which is true unless otherwise specified."
-msgstr ""
-"Use o algoritmo \"esparso\" para determinar quais objetos incluir no pacote, "
-"quando combinado com a opção \"--revs\". Esse algoritmo apenas percorre as "
-"árvores que aparecem nos caminhos que introduzem os novos objetos.  Isso "
-"pode trazer benefícios significativos no desempenho para o cálculo do pacote "
-"para envio com uma pequena alteração. No entanto, é possível que os objetos "
-"extras sejam adicionados ao arquivo do pacote caso os commits inclusos "
-"contenham  certos tipos de renomeações diretas. Caso esta opção não esteja "
-"inclusa, retorna ao valor predefinido em `pack.useSparse`, que é verdadeiro "
-"a menos que se defina o contrário."
+msgstr "Use o algoritmo \"esparso\" para determinar quais objetos incluir no pacote, quando combinado com a opção \"--revs\". Esse algoritmo apenas percorre as árvores que aparecem nos caminhos que introduzem os novos objetos.  Isso pode trazer benefícios significativos no desempenho para o cálculo do pacote para envio com uma pequena alteração. No entanto, é possível que os objetos extras sejam adicionados ao arquivo do pacote caso os commits inclusos contenham  certos tipos de renomeações diretas. Caso esta opção não esteja inclusa, retorna ao valor predefinido em `pack.useSparse`, que é verdadeiro a menos que se defina o contrário."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:214
@@ -41865,10 +37394,7 @@ msgstr "--shallow"
 #: en/git-pack-objects.txt:224
 #, priority:100
 msgid "Optimize a pack that will be provided to a client with a shallow repository.  This option, combined with --thin, can result in a smaller pack at the cost of speed."
-msgstr ""
-"Otimize um pacote que será providenciado ao cliente com um repositório "
-"superficial.  Esta opção, combinada com `--thin`, pode resultar em um pacote "
-"menor ao custo da velocidade."
+msgstr "Otimize um pacote que será providenciado ao cliente com um repositório superficial.  Esta opção, combinada com `--thin`, pode resultar em um pacote menor ao custo da velocidade."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:225
@@ -41880,14 +37406,7 @@ msgstr "--delta-base-offset"
 #: en/git-pack-objects.txt:235
 #, priority:100
 msgid "A packed archive can express the base object of a delta as either a 20-byte object name or as an offset in the stream, but ancient versions of Git don't understand the latter.  By default, 'git pack-objects' only uses the former format for better compatibility.  This option allows the command to use the latter format for compactness.  Depending on the average delta chain length, this option typically shrinks the resulting packfile by 3-5 per-cent."
-msgstr ""
-"Um arquivo compactado pode expressar o objeto base de um delta como um nome "
-"do objeto com 20 bytes ou como uma compensação no fluxo, porém as versões "
-"mais antigas do Git não entendem este último.  É predefinido que o comando "
-"'git pack-objects' utilize apenas o formato anterior visando uma melhor "
-"compatibilidade.  Esta opção permite que o comando utilize o último formato "
-"para compactação.  Dependendo do comprimento médio da cadeia delta, esta "
-"opção normalmente reduz o pacote gerado em 3-5%."
+msgstr "Um arquivo compactado pode expressar o objeto base de um delta como um nome do objeto com 20 bytes ou como uma compensação no fluxo, porém as versões mais antigas do Git não entendem este último.  É predefinido que o comando 'git pack-objects' utilize apenas o formato anterior visando uma melhor compatibilidade.  Esta opção permite que o comando utilize o último formato para compactação.  Dependendo do comprimento médio da cadeia delta, esta opção normalmente reduz o pacote gerado em 3-5%."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:240
@@ -41971,12 +37490,7 @@ msgstr "--exclude-promisor-objects"
 #: en/git-pack-objects.txt:289
 #, priority:100
 msgid "Omit objects that are known to be in the promisor remote.  (This option has the purpose of operating only on locally created objects, so that when we repack, we still maintain a distinction between locally created objects [without .promisor] and objects from the promisor remote [with .promisor].)  This is used with partial clone."
-msgstr ""
-"Omite os objetos que se sabe estar no ramo remoto.  (Esta opção tem o "
-"objetivo de operar apenas nos objetos criados localmente, para que, quando "
-"forem reempacotados, ainda mantenhamos uma distinção entre os objetos que "
-"foram criados localmente [sem .promisor] e os objetos \"promisor\" remoto ["
-"com .promisor].) Isso é utilizado com clone parcial."
+msgstr "Omite os objetos que se sabe estar no ramo remoto.  (Esta opção tem o objetivo de operar apenas nos objetos criados localmente, para que, quando forem reempacotados, ainda mantenhamos uma distinção entre os objetos que foram criados localmente [sem .promisor] e os objetos \"promisor\" remoto [com .promisor].) Isso é utilizado com clone parcial."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:290 en/git-repack.txt:157
@@ -41988,11 +37502,7 @@ msgstr "--keep-unreachable"
 #: en/git-pack-objects.txt:295
 #, priority:100
 msgid "Objects unreachable from the refs in packs named with --unpacked= option are added to the resulting pack, in addition to the reachable objects that are not in packs marked with *.keep files. This implies `--revs`."
-msgstr ""
-"Os objetos inacessíveis das refs nos pacotes informado com a opção "
-"`--unpacked=` são adicionados ao pacote gerado, além dos objetos acessíveis "
-"que não estão nos pacotes marcados com arquivos '*.keep'. Implica no uso da "
-"opção `--revs`."
+msgstr "Os objetos inacessíveis das refs nos pacotes informado com a opção `--unpacked=` são adicionados ao pacote gerado, além dos objetos acessíveis que não estão nos pacotes marcados com arquivos '*.keep'. Implica no uso da opção `--revs`."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:296
@@ -42004,9 +37514,7 @@ msgstr "--pack-loose-unreachable"
 #: en/git-pack-objects.txt:299
 #, priority:100
 msgid "Pack unreachable loose objects (and their loose counterparts removed). This implies `--revs`."
-msgstr ""
-"Embale os objetos soltos que estejam inacessíveis (e as suas contrapartes "
-"soltas que foram removidas). Implica no uso da opção `--revs`."
+msgstr "Embale os objetos soltos que estejam inacessíveis (e as suas contrapartes soltas que foram removidas). Implica no uso da opção `--revs`."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:300
@@ -42018,9 +37526,7 @@ msgstr "--unpack-unreachable"
 #: en/git-pack-objects.txt:302
 #, priority:100
 msgid "Keep unreachable objects in loose form. This implies `--revs`."
-msgstr ""
-"Mantenha os objetos inacessíveis de forma solta. Implica no uso da opção "
-"`--revs`."
+msgstr "Mantenha os objetos inacessíveis de forma solta. Implica no uso da opção `--revs`."
 
 #. type: Labeled list
 #: en/git-pack-objects.txt:303 en/git-repack.txt:164
@@ -42032,9 +37538,7 @@ msgstr "--delta-islands"
 #: en/git-pack-objects.txt:306
 #, priority:100
 msgid "Restrict delta matches based on \"islands\". See DELTA ISLANDS below."
-msgstr ""
-"Restrinja a coincidência delta com base nas \"ilhas\". Consulte ILHAS DELTA "
-"abaixo."
+msgstr "Restrinja a coincidência delta com base nas \"ilhas\". Consulte ILHAS DELTA abaixo."
 
 #. type: Title -
 #: en/git-pack-objects.txt:309
@@ -42046,80 +37550,37 @@ msgstr "ILHAS DELTA"
 #: en/git-pack-objects.txt:321
 #, priority:100
 msgid "When possible, `pack-objects` tries to reuse existing on-disk deltas to avoid having to search for new ones on the fly. This is an important optimization for serving fetches, because it means the server can avoid inflating most objects at all and just send the bytes directly from disk. This optimization can't work when an object is stored as a delta against a base which the receiver does not have (and which we are not already sending). In that case the server \"breaks\" the delta and has to find a new one, which has a high CPU cost. Therefore it's important for performance that the set of objects in on-disk delta relationships match what a client would fetch."
-msgstr ""
-"Quando possível, o `pack-objects` tenta reutilizar os deltas existentes no "
-"disco para evitar ter que procurar por novos em tempo real. Esta é uma "
-"otimização importante a serviço das buscas (fetch), significa que o servidor "
-"pode evitar inflar a maioria dos objetos e enviar os bytes diretamente do "
-"disco. Esta otimização pode não funcionar quando um objeto é armazenado como "
-"um delta em uma base onde o destinatário não o possua (e que não estamos "
-"enviando ainda). Nesse caso, o servidor \"quebra\" o delta e precisa "
-"encontrar um novo, ao custo de um alto processamento. Portanto, é importante "
-"para o desempenho que o conjunto dos objetos delta nos relacionamentos com o "
-"disco corresponda ao que um cliente buscaria."
+msgstr "Quando possível, o `pack-objects` tenta reutilizar os deltas existentes no disco para evitar ter que procurar por novos em tempo real. Esta é uma otimização importante a serviço das buscas (fetch), significa que o servidor pode evitar inflar a maioria dos objetos e enviar os bytes diretamente do disco. Esta otimização pode não funcionar quando um objeto é armazenado como um delta em uma base onde o destinatário não o possua (e que não estamos enviando ainda). Nesse caso, o servidor \"quebra\" o delta e precisa encontrar um novo, ao custo de um alto processamento. Portanto, é importante para o desempenho que o conjunto dos objetos delta nos relacionamentos com o disco corresponda ao que um cliente buscaria."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:326
 #, priority:100
 msgid "In a normal repository, this tends to work automatically. The objects are mostly reachable from the branches and tags, and that's what clients fetch. Any deltas we find on the server are likely to be between objects the client has or will have."
-msgstr ""
-"Em um repositório normal, isso tende a funcionar de forma automática. Os "
-"objetos são acessíveis principalmente a partir dos ramos e tags e é isso que "
-"os clientes buscam. Qualquer delta que encontrarmos no servidor, "
-"provavelmente estará entre os objetos que o cliente possui ou terá."
+msgstr "Em um repositório normal, isso tende a funcionar de forma automática. Os objetos são acessíveis principalmente a partir dos ramos e tags e é isso que os clientes buscam. Qualquer delta que encontrarmos no servidor, provavelmente estará entre os objetos que o cliente possui ou terá."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:336
 #, priority:100
 msgid "But in some repository setups, you may have several related but separate groups of ref tips, with clients tending to fetch those groups independently. For example, imagine that you are hosting several \"forks\" of a repository in a single shared object store, and letting clients view them as separate repositories through `GIT_NAMESPACE` or separate repos using the alternates mechanism. A naive repack may find that the optimal delta for an object is against a base that is only found in another fork. But when a client fetches, they will not have the base object, and we'll have to find a new delta on the fly."
-msgstr ""
-"Porém em algumas configurações do repositório, é possível ter vários grupos "
-"relacionados, mas separados, das dicas de referência, com os clientes "
-"tendendo a buscar estes grupos de forma independente. Por exemplo, imagine "
-"que você esteja hospedando várias \"bifurcações\" de um repositório em um "
-"único armazenamento dos objetos compartilhados e permitindo que os clientes "
-"os visualizem como repositórios separados por meio de `GIT_NAMESPACE` ou "
-"repositórios separados, utilizando o mecanismo alternativo. Um um simples "
-"reempacotamento pode achar que o delta ideal para um objeto está contra uma "
-"base que é encontrada apenas em outra bifurcação. Porém quando um cliente "
-"realiza uma busca, ele não terá o objeto base e teremos que encontrar um "
-"novo delta em tempo real."
+msgstr "Porém em algumas configurações do repositório, é possível ter vários grupos relacionados, mas separados, das dicas de referência, com os clientes tendendo a buscar estes grupos de forma independente. Por exemplo, imagine que você esteja hospedando várias \"bifurcações\" de um repositório em um único armazenamento dos objetos compartilhados e permitindo que os clientes os visualizem como repositórios separados por meio de `GIT_NAMESPACE` ou repositórios separados, utilizando o mecanismo alternativo. Um um simples reempacotamento pode achar que o delta ideal para um objeto está contra uma base que é encontrada apenas em outra bifurcação. Porém quando um cliente realiza uma busca, ele não terá o objeto base e teremos que encontrar um novo delta em tempo real."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:342
 #, priority:100
 msgid "A similar situation may exist if you have many refs outside of `refs/heads/` and `refs/tags/` that point to related objects (e.g., `refs/pull` or `refs/changes` used by some hosting providers). By default, clients fetch only heads and tags, and deltas against objects found only in those other groups cannot be sent as-is."
-msgstr ""
-"Uma situação semelhante pode existir caso você tenha muitos refs fora de `"
-"refs/heads/` e `refs/tags/` que apontam para os objetos relacionados (por "
-"exemplo, `refs/pull` ou `refs/changes` utilizados por alguns provedores de "
-"hospedagem). É predefinido que os clientes busquem apenas os cabeçalhos e "
-"tags, os deltas nos objetos encontrados apenas nesses outros grupos não "
-"podem ser enviados como estão."
+msgstr "Uma situação semelhante pode existir caso você tenha muitos refs fora de `refs/heads/` e `refs/tags/` que apontam para os objetos relacionados (por exemplo, `refs/pull` ou `refs/changes` utilizados por alguns provedores de hospedagem). É predefinido que os clientes busquem apenas os cabeçalhos e tags, os deltas nos objetos encontrados apenas nesses outros grupos não podem ser enviados como estão."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:350
 #, priority:100
 msgid "Delta islands solve this problem by allowing you to group your refs into distinct \"islands\". Pack-objects computes which objects are reachable from which islands, and refuses to make a delta from an object `A` against a base which is not present in all of `A`'s islands. This results in slightly larger packs (because we miss some delta opportunities), but guarantees that a fetch of one island will not have to recompute deltas on the fly due to crossing island boundaries."
-msgstr ""
-"As ilhas Delta resolvem este problema, permitindo que você agrupe as suas "
-"refs em \"ilhas\" distintas. Os pacotes de objetos calcula quais os objetos "
-"estão acessíveis a partir das ilhas e recusando-se a fazer um delta de um "
-"objeto `A` contra uma base que não está presente em todas as ilhas `A`. Isso "
-"resulta em pacotes um pouco maiores (porque perdemos algumas oportunidades "
-"delta), mas garante que uma busca por uma ilha não tenha que recalcular os "
-"deltas em tempo real, devido ao cruzamento dos limites da ilha."
+msgstr "As ilhas Delta resolvem este problema, permitindo que você agrupe as suas refs em \"ilhas\" distintas. Os pacotes de objetos calcula quais os objetos estão acessíveis a partir das ilhas e recusando-se a fazer um delta de um objeto `A` contra uma base que não está presente em todas as ilhas `A`. Isso resulta em pacotes um pouco maiores (porque perdemos algumas oportunidades delta), mas garante que uma busca por uma ilha não tenha que recalcular os deltas em tempo real, devido ao cruzamento dos limites da ilha."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:356
 #, priority:100
 msgid "When repacking with delta islands the delta window tends to get clogged with candidates that are forbidden by the config. Repacking with a big --window helps (and doesn't take as long as it otherwise might because we can reject some object pairs based on islands before doing any computation on the content)."
-msgstr ""
-"Ao realizar um reempacotamento com ilhas delta, a janela delta tende a ficar "
-"entupida com os candidatos barrados pela configuração. O reempacotamento com "
-"uma grande `--window` ajuda (e não leva tanto tempo quanto poderia, porque "
-"podemos rejeitar alguns pares de objetos com base nas ilhas antes de "
-"realizar qualquer cálculo no conteúdo)."
+msgstr "Ao realizar um reempacotamento com ilhas delta, a janela delta tende a ficar entupida com os candidatos barrados pela configuração. O reempacotamento com uma grande `--window` ajuda (e não leva tanto tempo quanto poderia, porque podemos rejeitar alguns pares de objetos com base nas ilhas antes de realizar qualquer cálculo no conteúdo)."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:360
@@ -42143,36 +37604,19 @@ msgstr ""
 #: en/git-pack-objects.txt:372
 #, priority:100
 msgid "puts heads and tags into an island (whose name is the empty string; see below for more on naming). Any refs which do not match those regular expressions (e.g., `refs/pull/123`) is not in any island. Any object which is reachable only from `refs/pull/` (but not heads or tags) is therefore not a candidate to be used as a base for `refs/heads/`."
-msgstr ""
-"coloca os cabeçalhos e as tags em uma ilha (cujo nome é um texto vazio; veja "
-"abaixo para conhecer mais nomenclaturas). Qualquer refs que não coincida com "
-"estas expressões regulares (`refs/pull/123` por exemplo) não está em nenhuma "
-"ilha. Qualquer objeto acessível apenas a partir do `refs/pull/` (mas não nos "
-"cabeçalhos ou nas tags) não é portanto, um candidato a ser utilizado como "
-"base para `refs/heads/`."
+msgstr "coloca os cabeçalhos e as tags em uma ilha (cujo nome é um texto vazio; veja abaixo para conhecer mais nomenclaturas). Qualquer refs que não coincida com estas expressões regulares (`refs/pull/123` por exemplo) não está em nenhuma ilha. Qualquer objeto acessível apenas a partir do `refs/pull/` (mas não nos cabeçalhos ou nas tags) não é portanto, um candidato a ser utilizado como base para `refs/heads/`."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:380
 #, priority:100
 msgid "Refs are grouped into islands based on their \"names\", and two regexes that produce the same name are considered to be in the same island. The names are computed from the regexes by concatenating any capture groups from the regex, with a '-' dash in between. (And if there are no capture groups, then the name is the empty string, as in the above example.) This allows you to create arbitrary numbers of islands. Only up to 14 such capture groups are supported though."
-msgstr ""
-"Os árbitros são agrupados em ilhas com base nos seus \"nomes\" e duas "
-"expressões regulares que produzam o mesmo nome, são consideradas para "
-"estarem na mesma ilha. Os nomes são calculados a partir das expressões "
-"regulares concatenando quaisquer grupos de captura da expressão regular, com "
-"um traço '-' no meio. (E caso não haja grupos de captura, o nome será uma "
-"sequência de texto vazia, como no exemplo acima.) Isso permite criar números "
-"arbitrários das ilhas. Apenas até 14 desses grupos de captura são "
-"compatíveis."
+msgstr "Os árbitros são agrupados em ilhas com base nos seus \"nomes\" e duas expressões regulares que produzam o mesmo nome, são consideradas para estarem na mesma ilha. Os nomes são calculados a partir das expressões regulares concatenando quaisquer grupos de captura da expressão regular, com um traço '-' no meio. (E caso não haja grupos de captura, o nome será uma sequência de texto vazia, como no exemplo acima.) Isso permite criar números arbitrários das ilhas. Apenas até 14 desses grupos de captura são compatíveis."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:384
 #, priority:100
 msgid "For example, imagine you store the refs for each fork in `refs/virtual/ID`, where `ID` is a numeric identifier. You might then configure:"
-msgstr ""
-"Por exemplo, imagine que você armazene as refs para cada bifurcação em `refs/"
-"virtual/ID`, onde o `ID` é um identificador numérico. Você pode então "
-"configurar:"
+msgstr "Por exemplo, imagine que você armazene as refs para cada bifurcação em `refs/virtual/ID`, onde o `ID` é um identificador numérico. Você pode então configurar:"
 
 #. type: delimited block -
 #: en/git-pack-objects.txt:390
@@ -42192,20 +37636,13 @@ msgstr ""
 #: en/git-pack-objects.txt:395
 #, priority:100
 msgid "That puts the heads and tags for each fork in their own island (named \"1234\" or similar), and the pull refs for each go into their own \"1234-pull\"."
-msgstr ""
-"Coloca os cabeçalhos e as tags de cada bifurcação na sua própria ilha ("
-"chamada \"1234\" ou similar), e as refs do \"pull\" de cada um entram no seu "
-"próprio \"1234-pull\"."
+msgstr "Coloca os cabeçalhos e as tags de cada bifurcação na sua própria ilha (chamada \"1234\" ou similar), e as refs do \"pull\" de cada um entram no seu próprio \"1234-pull\"."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:399
 #, priority:100
 msgid "Note that we pick a single island for each regex to go into, using \"last one wins\" ordering (which allows repo-specific config to take precedence over user-wide config, and so forth)."
-msgstr ""
-"Observe que escolhemos uma única ilha para cada regex, utilizando a ordem "
-"\"last one wins\" ou \"o último vence\" (que permite que determinada "
-"configuração do repo tenha precedência sobre a configuração do usuário e "
-"assim por diante)."
+msgstr "Observe que escolhemos uma única ilha para cada regex, utilizando a ordem \"last one wins\" ou \"o último vence\" (que permite que determinada configuração do repo tenha precedência sobre a configuração do usuário e assim por diante)."
 
 #. type: Plain text
 #: en/git-pack-objects.txt:405
@@ -42229,44 +37666,31 @@ msgstr "git-pack-redundant - Encontre os arquivos dos pacotes redundantes"
 #: en/git-pack-redundant.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
-msgstr ""
-"'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename "
-"... >\n"
+msgstr "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:19
 #, priority:100
 msgid "This program computes which packs in your repository are redundant. The output is suitable for piping to `xargs rm` if you are in the root of the repository."
-msgstr ""
-"Este programa calcula quais os pacotes no seu repositório são redundantes. A "
-"saída é adequada para canalizar para `xargs rm` caso esteja na raiz do "
-"repositório."
+msgstr "Este programa calcula quais os pacotes no seu repositório são redundantes. A saída é adequada para canalizar para `xargs rm` caso esteja na raiz do repositório."
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:24
 #, priority:100
 msgid "'git pack-redundant' accepts a list of objects on standard input. Any objects given will be ignored when checking which packs are required. This makes the following command useful when wanting to remove packs which contain unreachable objects."
-msgstr ""
-"'git pack-redundant' aceita uma lista de objetos na entrada padrão. "
-"Quaisquer objetos informado serão ignorados durante a verificação de quais "
-"pacotes são necessários. Isso torna o comando a seguir útil quando se quer "
-"remover os pacotes que contenha objetos que estejam inacessíveis."
+msgstr "'git pack-redundant' aceita uma lista de objetos na entrada padrão. Quaisquer objetos informado serão ignorados durante a verificação de quais pacotes são necessários. Isso torna o comando a seguir útil quando se quer remover os pacotes que contenha objetos que estejam inacessíveis."
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:27
 #, priority:100
 msgid "git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all | xargs rm"
-msgstr ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all "
-"| xargs rm"
+msgstr "git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all | xargs rm"
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:34
 #, priority:100
 msgid "Processes all packs. Any filenames on the command line are ignored."
-msgstr ""
-"Processa todos os pacotes. Todos os nomes dos arquivos na linha de comando "
-"são ignorados."
+msgstr "Processa todos os pacotes. Todos os nomes dos arquivos na linha de comando são ignorados."
 
 #. type: Labeled list
 #: en/git-pack-redundant.txt:35
@@ -42278,17 +37702,13 @@ msgstr "--alt-odb"
 #: en/git-pack-redundant.txt:38
 #, priority:100
 msgid "Don't require objects present in packs from alternate object directories to be present in local packs."
-msgstr ""
-"Não exija que objetos presentes nos pacotes dos diretórios dos objetos "
-"alternativos estejam presentes nos pacotes locais."
+msgstr "Não exija que objetos presentes nos pacotes dos diretórios dos objetos alternativos estejam presentes nos pacotes locais."
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:41
 #, priority:100
 msgid "Outputs some statistics to stderr. Has a small performance penalty."
-msgstr ""
-"Produz algumas estatísticas para o stderr. Tem uma pequena penalidade de "
-"desempenho."
+msgstr "Produz algumas estatísticas para o stderr. Tem uma pequena penalidade de desempenho."
 
 #. type: Plain text
 #: en/git-pack-redundant.txt:47
@@ -42306,9 +37726,7 @@ msgstr "git-pack-refs(1)"
 #: en/git-pack-refs.txt:7
 #, priority:100
 msgid "git-pack-refs - Pack heads and tags for efficient repository access"
-msgstr ""
-"git-pack-refs - Embale os cabeçalhos e a tags do pacote para acesso "
-"eficiente ao repositório"
+msgstr "git-pack-refs - Embale os cabeçalhos e a tags do pacote para acesso eficiente ao repositório"
 
 #. type: Plain text
 #: en/git-pack-refs.txt:12
@@ -42320,75 +37738,43 @@ msgstr "'git pack-refs' [--all] [--no-prune]\n"
 #: en/git-pack-refs.txt:24
 #, priority:100
 msgid "Traditionally, tips of branches and tags (collectively known as 'refs') were stored one file per ref in a (sub)directory under `$GIT_DIR/refs` directory.  While many branch tips tend to be updated often, most tags and some branch tips are never updated.  When a repository has hundreds or thousands of tags, this one-file-per-ref format both wastes storage and hurts performance."
-msgstr ""
-"Tradicionalmente, o cume dos ramos e as tags (coletivamente conhecidas como "
-"'refs') eram armazenadas um arquivo por \"ref\" em um diretório (sub) no "
-"diretório `$GIT_DIR/refs`.  Enquanto muitos cumes dos ramos tendem a ser "
-"atualizadas com frequência, a maioria das tags e alguns cumes dos ramos "
-"nunca são atualizadas.  Quando um repositório possui centenas ou milhares de "
-"tags, este formato de um arquivo por referência desperdiça armazenamento e "
-"prejudica o desempenho."
+msgstr "Tradicionalmente, o cume dos ramos e as tags (coletivamente conhecidas como 'refs') eram armazenadas um arquivo por \"ref\" em um diretório (sub) no diretório `$GIT_DIR/refs`.  Enquanto muitos cumes dos ramos tendem a ser atualizadas com frequência, a maioria das tags e alguns cumes dos ramos nunca são atualizadas.  Quando um repositório possui centenas ou milhares de tags, este formato de um arquivo por referência desperdiça armazenamento e prejudica o desempenho."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:31
 #, priority:100
 msgid "This command is used to solve the storage and performance problem by storing the refs in a single file, `$GIT_DIR/packed-refs`.  When a ref is missing from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in this file and used if found."
-msgstr ""
-"Este comando é utilizado para resolver o problema de armazenamento e "
-"desempenho, armazenando as refs em um único arquivo, `$GIT_DIR/compact-refs`"
-".  Quando uma \"ref\" está ausente na hierarquia dos diretórios tradicionais "
-"`$GIT_DIR/refs`, ele é procurado neste arquivo e utilizado caso seja "
-"encontrado."
+msgstr "Este comando é utilizado para resolver o problema de armazenamento e desempenho, armazenando as refs em um único arquivo, `$GIT_DIR/compact-refs`.  Quando uma \"ref\" está ausente na hierarquia dos diretórios tradicionais `$GIT_DIR/refs`, ele é procurado neste arquivo e utilizado caso seja encontrado."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:34
 #, priority:100
 msgid "Subsequent updates to branches always create new files under `$GIT_DIR/refs` directory hierarchy."
-msgstr ""
-"Atualizações subsequentes nos ramos sempre criam novos arquivos na "
-"hierarquia de diretórios `$GIT_DIR/refs`."
+msgstr "Atualizações subsequentes nos ramos sempre criam novos arquivos na hierarquia de diretórios `$GIT_DIR/refs`."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:43
 #, priority:100
 msgid "A recommended practice to deal with a repository with too many refs is to pack its refs with `--all` once, and occasionally run `git pack-refs`.  Tags are by definition stationary and are not expected to change.  Branch heads will be packed with the initial `pack-refs --all`, but only the currently active branch heads will become unpacked, and the next `pack-refs` (without `--all`) will leave them unpacked."
-msgstr ""
-"Uma prática recomendada para lidar com um repositório com muitas refs é "
-"empacotar as suas refs com `--all` uma vez e ocasionalmente executar o "
-"comando `git pack-refs`.  As tags são estacionárias por definição e não "
-"devem mudar.  Os cabeçalhos da ramificação serão empacotadas com os `pack-"
-"refs --all` iniciais, mas apenas os cabeçalhos da ramificação atualmente "
-"ativas, serão descompactadas e as próximas `pack-refs` (sem a opção `--all`) "
-"as deixarão descompactadas."
+msgstr "Uma prática recomendada para lidar com um repositório com muitas refs é empacotar as suas refs com `--all` uma vez e ocasionalmente executar o comando `git pack-refs`.  As tags são estacionárias por definição e não devem mudar.  Os cabeçalhos da ramificação serão empacotadas com os `pack-refs --all` iniciais, mas apenas os cabeçalhos da ramificação atualmente ativas, serão descompactadas e as próximas `pack-refs` (sem a opção `--all`) as deixarão descompactadas."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:56
 #, priority:100
 msgid "The command by default packs all tags and refs that are already packed, and leaves other refs alone.  This is because branches are expected to be actively developed and packing their tips does not help performance.  This option causes branch tips to be packed as well.  Useful for a repository with many branches of historical interests."
-msgstr ""
-"É predefinido que o comando empacote todas as \"tags\" e refs que já estão "
-"empacotados e deixe as outras refs em paz.  Isso ocorre porque os ramos "
-"devem ser desenvolvidas ativamente e embalar as suas pontas não ajudam no "
-"desempenho.  Essa opção também faz com que os cumes dos ramos sejam "
-"compactadas.  Útil para um repositório com muitos ramos de interesses "
-"histórico."
+msgstr "É predefinido que o comando empacote todas as \"tags\" e refs que já estão empacotados e deixe as outras refs em paz.  Isso ocorre porque os ramos devem ser desenvolvidas ativamente e embalar as suas pontas não ajudam no desempenho.  Essa opção também faz com que os cumes dos ramos sejam compactadas.  Útil para um repositório com muitos ramos de interesses histórico."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:61
 #, priority:100
 msgid "The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after packing them.  This option tells it not to."
-msgstr ""
-"O comando normalmente remove as refs soltas na hierarquia `$GIT_DIR/refs` "
-"após empacotá-los.  Esta opção diz para não fazê-lo."
+msgstr "O comando normalmente remove as refs soltas na hierarquia `$GIT_DIR/refs` após empacotá-los.  Esta opção diz para não fazê-lo."
 
 #. type: Plain text
 #: en/git-pack-refs.txt:69
 #, priority:100
 msgid "Older documentation written before the packed-refs mechanism was introduced may still say things like \".git/refs/heads/<branch> file exists\" when it means \"branch <branch> exists\"."
-msgstr ""
-"A documentação mais antiga escrita antes da introdução do mecanismo \"packed-"
-"refs\" ainda pode dizer coisas como \"o arquivo .git/refs/heads/<ramo> "
-"existe\" quando significa \"o ramo <ramo> existe\"."
+msgstr "A documentação mais antiga escrita antes da introdução do mecanismo \"packed-refs\" ainda pode dizer coisas como \"o arquivo .git/refs/heads/<ramo> existe\" quando significa \"o ramo <ramo> existe\"."
 
 #. type: Title =
 #: en/git-parse-remote.txt:2
@@ -42400,9 +37786,7 @@ msgstr "git-parse-remote(1)"
 #: en/git-parse-remote.txt:7
 #, priority:100
 msgid "git-parse-remote - Routines to help parsing remote repository access parameters"
-msgstr ""
-"git-parse-remote - Rotinas para ajudar na análise dos parâmetros de acesso "
-"ao repositório remoto"
+msgstr "git-parse-remote - Rotinas para ajudar na análise dos parâmetros de acesso ao repositório remoto"
 
 #. type: Plain text
 #: en/git-parse-remote.txt:13
@@ -42414,11 +37798,7 @@ msgstr "'. \"$(git --exec-path)/git-parse-remote\"'\n"
 #: en/git-parse-remote.txt:20
 #, priority:100
 msgid "This script is included in various scripts to supply routines to parse files under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables that are related to fetching, pulling and pushing."
-msgstr ""
-"Este script está incluso em vários scripts para fornecer rotinas para "
-"realizar a análise dos arquivos no `$GIT_DIR/remotes/` e `$GIT_DIR/branches/`"
-" e nas variáveis de configuração relacionadas à busca (fetch), captura (pull)"
-" e impulsionamento (pull)."
+msgstr "Este script está incluso em vários scripts para fornecer rotinas para realizar a análise dos arquivos no `$GIT_DIR/remotes/` e `$GIT_DIR/branches/` e nas variáveis de configuração relacionadas à busca (fetch), captura (pull) e impulsionamento (pull)."
 
 #. type: Title =
 #: en/git-patch-id.txt:2
@@ -42448,30 +37828,19 @@ msgstr "Carregue um patch da entrada padrão e calcule o ID para ele."
 #: en/git-patch-id.txt:21
 #, priority:100
 msgid "A \"patch ID\" is nothing but a sum of SHA-1 of the file diffs associated with a patch, with whitespace and line numbers ignored.  As such, it's \"reasonably stable\", but at the same time also reasonably unique, i.e., two patches that have the same \"patch ID\" are almost guaranteed to be the same thing."
-msgstr ""
-"Um \"ID do patch\" nada mais é do que uma soma do SHA-1 das diferenças dos "
-"arquivos associados com um patch, com espaço e os números da linha "
-"ignorados.  Como tal, é \"razoavelmente estável\", porém ao mesmo tempo "
-"também é razoavelmente único, ou seja, dois patches que têm o mesmo \"ID de "
-"patch\" quase garantem que sejam o mesmo."
+msgstr "Um \"ID do patch\" nada mais é do que uma soma do SHA-1 das diferenças dos arquivos associados com um patch, com espaço e os números da linha ignorados.  Como tal, é \"razoavelmente estável\", porém ao mesmo tempo também é razoavelmente único, ou seja, dois patches que têm o mesmo \"ID de patch\" quase garantem que sejam o mesmo."
 
 #. type: Plain text
 #: en/git-patch-id.txt:23
 #, priority:100
 msgid "IOW, you can use this thing to look for likely duplicate commits."
-msgstr ""
-"IOW, você pode utilizar isso para procurar prováveis commits duplicados."
+msgstr "IOW, você pode utilizar isso para procurar prováveis commits duplicados."
 
 #. type: Plain text
 #: en/git-patch-id.txt:29
 #, priority:100
 msgid "When dealing with 'git diff-tree' output, it takes advantage of the fact that the patch is prefixed with the object name of the commit, and outputs two 40-byte hexadecimal strings.  The first string is the patch ID, and the second string is the commit ID.  This can be used to make a mapping from patch ID to commit ID."
-msgstr ""
-"Ao lidar com a saída 'git diff-tree', tira proveito do fato que o patch é "
-"prefixado com o nome do objeto do commit e gera duas sequências hexadecimais "
-"com 40 bytes.  O primeira cadeia de caracteres é o ID do patch e a segundo é "
-"o ID do commit.  Isso pode ser utilizado para fazer um mapeamento do ID do "
-"patch para confirmar o ID."
+msgstr "Ao lidar com a saída 'git diff-tree', tira proveito do fato que o patch é prefixado com o nome do objeto do commit e gera duas sequências hexadecimais com 40 bytes.  O primeira cadeia de caracteres é o ID do patch e a segundo é o ID do commit.  Isso pode ser utilizado para fazer um mapeamento do ID do patch para confirmar o ID."
 
 #. type: Labeled list
 #: en/git-patch-id.txt:33
@@ -42483,39 +37852,25 @@ msgstr "--stable"
 #: en/git-patch-id.txt:35
 #, priority:100
 msgid "Use a \"stable\" sum of hashes as the patch ID. With this option:"
-msgstr ""
-"Use uma soma \"stable\" (estável) de hashes como o ID do patch. Com esta "
-"opção:"
+msgstr "Use uma soma \"stable\" (estável) de hashes como o ID do patch. Com esta opção:"
 
 #. type: Plain text
 #: en/git-patch-id.txt:41
 #, priority:100
 msgid "Reordering file diffs that make up a patch does not affect the ID.  In particular, two patches produced by comparing the same two trees with two different settings for \"-O<orderfile>\" result in the same patch ID signature, thereby allowing the computed result to be used as a key to index some meta-information about the change between the two trees;"
-msgstr ""
-"Reordene as diferenças do arquivo que compõem um patch não afetam o ID.  Em "
-"particular, os dois patches gerados pela comparação das mesmas duas árvores "
-"com as duas configurações diferentes para \"-O<ordem-do-arquivo>\" resultam "
-"na mesma assinatura ID do patch, permitindo que o resultado computado seja "
-"utilizado como uma chave para indexar algumas metainformações sobre as "
-"alterações entre as duas árvores;"
+msgstr "Reordene as diferenças do arquivo que compõem um patch não afetam o ID.  Em particular, os dois patches gerados pela comparação das mesmas duas árvores com as duas configurações diferentes para \"-O<ordem-do-arquivo>\" resultam na mesma assinatura ID do patch, permitindo que o resultado computado seja utilizado como uma chave para indexar algumas metainformações sobre as alterações entre as duas árvores;"
 
 #. type: Plain text
 #: en/git-patch-id.txt:47
 #, priority:100
 msgid "Result is different from the value produced by git 1.9 and older or produced when an \"unstable\" hash (see --unstable below) is configured - even when used on a diff output taken without any use of \"-O<orderfile>\", thereby making existing databases storing such \"unstable\" or historical patch-ids unusable."
-msgstr ""
-"O resultado é diferente do valor produzido pelo git 1.9 e mais antigo ou "
-"produzido quando um hash \"instável\" (consulte `--unstable` abaixo) é "
-"configurado - mesmo quando utilizado com um diff gerado obtido sem o uso de "
-"\"-O<ordem-do-arquivo>\", tornando, assim, os bancos de dados existentes "
-"armazenando esses IDs \"instáveis\" ou os históricos com correções inúteis."
+msgstr "O resultado é diferente do valor produzido pelo git 1.9 e mais antigo ou produzido quando um hash \"instável\" (consulte `--unstable` abaixo) é configurado - mesmo quando utilizado com um diff gerado obtido sem o uso de \"-O<ordem-do-arquivo>\", tornando, assim, os bancos de dados existentes armazenando esses IDs \"instáveis\" ou os históricos com correções inúteis."
 
 #. type: Plain text
 #: en/git-patch-id.txt:49
 #, no-wrap, priority:100
 msgid "This is the default if patchid.stable is set to true.\n"
-msgstr ""
-"Esta é a predefinição caso o `patchid.stable` estiver definido como 'true'.\n"
+msgstr "Esta é a predefinição caso o `patchid.stable` estiver definido como 'true'.\n"
 
 #. type: Labeled list
 #: en/git-patch-id.txt:50
@@ -42527,12 +37882,7 @@ msgstr "--unstable"
 #: en/git-patch-id.txt:56
 #, priority:100
 msgid "Use an \"unstable\" hash as the patch ID. With this option, the result produced is compatible with the patch-id value produced by git 1.9 and older.  Users with pre-existing databases storing patch-ids produced by git 1.9 and older (who do not deal with reordered patches) may want to use this option."
-msgstr ""
-"Use um hash \"unstable\" (instável) como o ID do patch. Com esta opção, o "
-"resultado produzido é compatível com o valor da ID do patch produzido pelo "
-"git 1.9 e anterior.  Usuários com bancos de dados preexistentes que "
-"armazenam as IDs dos patches produzidos pelo git 1.9 e anteriores (que não "
-"lidam com os patches reordenados) podem querer usar esta opção."
+msgstr "Use um hash \"unstable\" (instável) como o ID do patch. Com esta opção, o resultado produzido é compatível com o valor da ID do patch produzido pelo git 1.9 e anterior.  Usuários com bancos de dados preexistentes que armazenam as IDs dos patches produzidos pelo git 1.9 e anteriores (que não lidam com os patches reordenados) podem querer usar esta opção."
 
 #. type: Plain text
 #: en/git-patch-id.txt:58
@@ -42550,9 +37900,7 @@ msgstr "git-prune-packed(1)"
 #: en/git-prune-packed.txt:7
 #, priority:100
 msgid "git-prune-packed - Remove extra objects that are already in pack files"
-msgstr ""
-"git-prune-embalado - Remove os objetos extras que já estão nos pacotes dos "
-"arquivos"
+msgstr "git-prune-embalado - Remove os objetos extras que já estão nos pacotes dos arquivos"
 
 #. type: Plain text
 #: en/git-prune-packed.txt:13
@@ -42564,10 +37912,7 @@ msgstr "'git prune-packed' [-n|--dry-run] [-q|--quiet]\n"
 #: en/git-prune-packed.txt:19
 #, priority:100
 msgid "This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently exist in a pack file as well as the independent object directories."
-msgstr ""
-"Este programa procura no `$GIT_OBJECT_DIRECTORY` todos os objetos que "
-"existem atualmente em um pacote de arquivo, bem como os diretórios dos "
-"objetos independentes."
+msgstr "Este programa procura no `$GIT_OBJECT_DIRECTORY` todos os objetos que existem atualmente em um pacote de arquivo, bem como os diretórios dos objetos independentes."
 
 #. type: Plain text
 #: en/git-prune-packed.txt:21
@@ -42579,26 +37924,19 @@ msgstr "Todos estes objetos extras são removidos."
 #: en/git-prune-packed.txt:24 en/git-repack.txt:24
 #, priority:100
 msgid "A pack is a collection of objects, individually compressed, with delta compression applied, stored in a single file, with an associated index file."
-msgstr ""
-"Um pacote é uma coleção de objetos compactados de forma individual com a "
-"compactação delta aplicada, armazenados em um único arquivo e com um arquivo "
-"do índice associado a ele."
+msgstr "Um pacote é uma coleção de objetos compactados de forma individual com a compactação delta aplicada, armazenados em um único arquivo e com um arquivo do índice associado a ele."
 
 #. type: Plain text
 #: en/git-prune-packed.txt:27 en/git-repack.txt:27
 #, priority:100
 msgid "Packs are used to reduce the load on mirror systems, backup engines, disk storage, etc."
-msgstr ""
-"Os pacotes são utilizados para reduzir a carga nos sistemas de espelho, "
-"mecanismos de backup, armazenamento em disco, etc."
+msgstr "Os pacotes são utilizados para reduzir a carga nos sistemas de espelho, mecanismos de backup, armazenamento em disco, etc."
 
 #. type: Plain text
 #: en/git-prune-packed.txt:35
 #, priority:100
 msgid "Don't actually remove any objects, only show those that would have been removed."
-msgstr ""
-"Na verdade, não remova nenhum objeto, apenas exiba aqueles que teriam sido "
-"removidos."
+msgstr "Na verdade, não remova nenhum objeto, apenas exiba aqueles que teriam sido removidos."
 
 #. type: Plain text
 #: en/git-prune-packed.txt:39
@@ -42622,8 +37960,7 @@ msgstr "git-prune(1)"
 #: en/git-prune.txt:7
 #, priority:100
 msgid "git-prune - Prune all unreachable objects from the object database"
-msgstr ""
-"git-prune - Remove todos os objetos inacessíveis do banco de dados de objetos"
+msgstr "git-prune - Remove todos os objetos inacessíveis do banco de dados de objetos"
 
 #. type: Plain text
 #: en/git-prune.txt:13
@@ -42635,22 +37972,13 @@ msgstr "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n"
 #: en/git-prune.txt:19
 #, priority:100
 msgid "In most cases, users should run 'git gc', which calls 'git prune'. See the section \"NOTES\", below."
-msgstr ""
-"Na maioria dos casos, os usuários devem executar 'git gc', que invoca o "
-"comando 'git prune'. Veja a seção \"OBSERVAÇÕES\", abaixo."
+msgstr "Na maioria dos casos, os usuários devem executar 'git gc', que invoca o comando 'git prune'. Veja a seção \"OBSERVAÇÕES\", abaixo."
 
 #. type: Plain text
 #: en/git-prune.txt:29
 #, priority:100
 msgid "This runs 'git fsck --unreachable' using all the refs available in `refs/`, optionally with additional set of objects specified on the command line, and prunes all unpacked objects unreachable from any of these head objects from the object database.  In addition, it prunes the unpacked objects that are also found in packs by running 'git prune-packed'.  It also removes entries from .git/shallow that are not reachable by any ref."
-msgstr ""
-"Executa o 'git fsck --unreachable' utilizando todas as refs disponíveis em `"
-"refs/`, opcionalmente com um conjunto adicional de objetos utilizados na "
-"linha de comando e remove todos os objetos descompactados inacessíveis de "
-"qualquer um destes objetos principais do banco de dados de objetos.  Além "
-"disso, remove os objetos descompactados que também são encontrados nos "
-"pacotes executando o comando 'git prune-packed'.  Também remove entradas do '"
-".git/shallow' que não são acessíveis por nenhuma \"ref\"."
+msgstr "Executa o 'git fsck --unreachable' utilizando todas as refs disponíveis em `refs/`, opcionalmente com um conjunto adicional de objetos utilizados na linha de comando e remove todos os objetos descompactados inacessíveis de qualquer um destes objetos principais do banco de dados de objetos.  Além disso, remove os objetos descompactados que também são encontrados nos pacotes executando o comando 'git prune-packed'.  Também remove entradas do '.git/shallow' que não são acessíveis por nenhuma \"ref\"."
 
 #. type: Plain text
 #: en/git-prune.txt:32
@@ -42677,7 +38005,7 @@ msgid "Show progress."
 msgstr "Exiba o progresso."
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr "--expire <tempo>"
@@ -42698,18 +38026,13 @@ msgstr "<head>..."
 #: en/git-prune.txt:58
 #, priority:100
 msgid "In addition to objects reachable from any of our references, keep objects reachable from listed <head>s."
-msgstr ""
-"Além dos objetos acessíveis a partir de qualquer uma das nossas referências, "
-"mantenha os objetos acessíveis a partir dos <cabeçalho>s listados."
+msgstr "Além dos objetos acessíveis a partir de qualquer uma das nossas referências, mantenha os objetos acessíveis a partir dos <cabeçalho>s listados."
 
 #. type: Plain text
 #: en/git-prune.txt:65
 #, priority:100
 msgid "To prune objects not used by your repository or another that borrows from your repository via its `.git/objects/info/alternates`:"
-msgstr ""
-"Para remover os objetos que não foram utilizados pelo seu repositório ou "
-"outro que seja emprestado do seu repositório por meio de seu `.git/objects/"
-"info/alternates`:"
+msgstr "Para remover os objetos que não foram utilizados pelo seu repositório ou outro que seja emprestado do seu repositório por meio de seu `.git/objects/info/alternates`:"
 
 #. type: delimited block -
 #: en/git-prune.txt:68
@@ -42721,18 +38044,13 @@ msgstr "$ git prune $(cd ../another && git rev-parse --all)\n"
 #: en/git-prune.txt:76
 #, priority:100
 msgid "In most cases, users will not need to call 'git prune' directly, but should instead call 'git gc', which handles pruning along with many other housekeeping tasks."
-msgstr ""
-"Na maioria dos casos, os usuários não precisarão chamar o comando 'git "
-"prune' diretamente, mas devem chamar o comando 'git gc' que lida com a "
-"remoção, juntamente com muitas outras tarefas de limpeza."
+msgstr "Na maioria dos casos, os usuários não precisarão chamar o comando 'git prune' diretamente, mas devem chamar o comando 'git gc' que lida com a remoção, juntamente com muitas outras tarefas de limpeza."
 
 #. type: Plain text
 #: en/git-prune.txt:79
 #, priority:100
 msgid "For a description of which objects are considered for pruning, see 'git fsck''s --unreachable option."
-msgstr ""
-"Para obter uma descrição de quais objetos são considerados para a remoção, "
-"consulte a opção --unreachable de 'git fsck'."
+msgstr "Para obter uma descrição de quais objetos são considerados para a remoção, consulte a opção --unreachable de 'git fsck'."
 
 #. type: Plain text
 #: en/git-prune.txt:86
@@ -42762,41 +38080,25 @@ msgstr "'git pull' [<opções>] [<repositório> [<refspec>...]]\n"
 #: en/git-pull.txt:21
 #, priority:220
 msgid "Incorporates changes from a remote repository into the current branch.  In its default mode, `git pull` is shorthand for `git fetch` followed by `git merge FETCH_HEAD`."
-msgstr ""
-"Incorpora as alterações de um repositório remoto no ramo atual.  Em seu modo "
-"predefinido, o comando `git pull` é uma abreviação do comando `git fetch` "
-"seguido por `git merge FETCH_HEAD`."
+msgstr "Incorpora as alterações de um repositório remoto no ramo atual.  Em seu modo predefinido, o comando `git pull` é uma abreviação do comando `git fetch` seguido por `git merge FETCH_HEAD`."
 
 #. type: Plain text
 #: en/git-pull.txt:26
 #, priority:220
 msgid "More precisely, 'git pull' runs 'git fetch' with the given parameters and calls 'git merge' to merge the retrieved branch heads into the current branch.  With `--rebase`, it runs 'git rebase' instead of 'git merge'."
-msgstr ""
-"Mais precisamente, o comando 'git pull' executa o 'git fetch' com os "
-"parâmetros informados e chama o 'git merge' para mesclar os cabeçalhos "
-"recuperados da ramificação no ramo atual.  Com `--rebase`, ele executa o "
-"comando 'git rebase' em vez do 'git merge'."
+msgstr "Mais precisamente, o comando 'git pull' executa o 'git fetch' com os parâmetros informados e chama o 'git merge' para mesclar os cabeçalhos recuperados da ramificação no ramo atual.  Com `--rebase`, ele executa o comando 'git rebase' em vez do 'git merge'."
 
 #. type: Plain text
 #: en/git-pull.txt:33
 #, priority:220
 msgid "<repository> should be the name of a remote repository as passed to linkgit:git-fetch[1].  <refspec> can name an arbitrary remote ref (for example, the name of a tag) or even a collection of refs with corresponding remote-tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the name of a branch in the remote repository."
-msgstr ""
-"O <repositório> deve ser o nome de um repositório remoto, conforme passado "
-"para o linkgit:git-fetch[1].  O <refspec> pode nomear de forma arbitrária "
-"uma referência remota (por exemplo, o nome de uma tag) ou até mesmo uma "
-"coleção de referências com as ramificações dos ramos monitorados remotamente "
-"(`refs/heads/{asterisk}:refs/remotes/origin/{asterisk}` por exemplo), porém "
-"geralmente é o nome de uma ramificação no repositório remoto."
+msgstr "O <repositório> deve ser o nome de um repositório remoto, conforme passado para o linkgit:git-fetch[1].  O <refspec> pode nomear de forma arbitrária uma referência remota (por exemplo, o nome de uma tag) ou até mesmo uma coleção de referências com as ramificações dos ramos monitorados remotamente (`refs/heads/{asterisk}:refs/remotes/origin/{asterisk}` por exemplo), porém geralmente é o nome de uma ramificação no repositório remoto."
 
 #. type: Plain text
 #: en/git-pull.txt:37
 #, priority:220
 msgid "Default values for <repository> and <branch> are read from the \"remote\" and \"merge\" configuration for the current branch as set by linkgit:git-branch[1] `--track`."
-msgstr ""
-"Os valores predefinidos para o <repositório> e o <ramo> eles são lidos na "
-"configuração \"remote\" e \"merge\" do ramo atual, conforme for definido "
-"pelo linkgit:git-branch[1] `--track`."
+msgstr "Os valores predefinidos para o <repositório> e o <ramo> eles são lidos na configuração \"remote\" e \"merge\" do ramo atual, conforme for definido pelo linkgit:git-branch[1] `--track`."
 
 #. type: delimited block -
 #: en/git-pull.txt:47
@@ -42818,13 +38120,7 @@ msgstr ""
 #: en/git-pull.txt:54
 #, priority:220
 msgid "Then \"`git pull`\" will fetch and replay the changes from the remote `master` branch since it diverged from the local `master` (i.e., `E`)  until its current commit (`C`) on top of `master` and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes."
-msgstr ""
-"Então, o comando \"`git pull`\" fara a captura e a reprodução das alterações "
-"do ramo remoto `master` por ter se divergido do `master` local (ou seja, `E`)"
-" até o seu commit atual (`C`) no topo do `master` e registra o resultado em "
-"um novo commit, juntamente com os nomes dos dois commits principais e uma "
-"mensagem do registro log do usuário, descrevendo quais forma as alterações "
-"que foram feitas."
+msgstr "Então, o comando \"`git pull`\" fara a captura e a reprodução das alterações do ramo remoto `master` por ter se divergido do `master` local (ou seja, `E`) até o seu commit atual (`C`) no topo do `master` e registra o resultado em um novo commit, juntamente com os nomes dos dois commits principais e uma mensagem do registro log do usuário, descrevendo quais forma as alterações que foram feitas."
 
 #. type: delimited block -
 #: en/git-pull.txt:59
@@ -42848,32 +38144,19 @@ msgstr "Para mais detalhes incluindo informações de como os conflitos são ger
 #: en/git-pull.txt:68
 #, priority:220
 msgid "In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --merge`.  *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict."
-msgstr ""
-"No Git 1.7.0 ou posterior, para cancelar uma mesclagem conflitante, utilize "
-"o comando `git reset --merge`.  *Aviso*: Nas versões mais antigas do Git, a "
-"execução do 'git pull' com as alterações dos commits não realizados é "
-"desencorajado: enquanto for possível, deixa você em uma condição onde a "
-"recuperação pode ser difícil no caso de um conflito."
+msgstr "No Git 1.7.0 ou posterior, para cancelar uma mesclagem conflitante, utilize o comando `git reset --merge`.  *Aviso*: Nas versões mais antigas do Git, a execução do 'git pull' com as alterações dos commits não realizados é desencorajado: enquanto for possível, deixa você em uma condição onde a recuperação pode ser difícil no caso de um conflito."
 
 #. type: Plain text
 #: en/git-pull.txt:73
 #, priority:220
 msgid "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically canceled and the work tree untouched.  It is generally best to get any local changes in working order before pulling or stash them away with linkgit:git-stash[1]."
-msgstr ""
-"Caso alguma das alterações remotas se sobrepuser às alterações dos commits "
-"locais que não foram realizados, a mesclagem será automaticamente cancelada "
-"e a árvore de trabalho se manterá intocada.  Geralmente é melhor obter as "
-"alterações locais na ordem de trabalho antes de retirá-las ou escondê-las "
-"com o linkgit:git-stash[1]."
+msgstr "Caso alguma das alterações remotas se sobrepuser às alterações dos commits locais que não foram realizados, a mesclagem será automaticamente cancelada e a árvore de trabalho se manterá intocada.  Geralmente é melhor obter as alterações locais na ordem de trabalho antes de retirá-las ou escondê-las com o linkgit:git-stash[1]."
 
 #. type: Plain text
 #: en/git-pull.txt:82
 #, priority:220
 msgid "This is passed to both underlying git-fetch to squelch reporting of during transfer, and underlying git-merge to squelch output during merging."
-msgstr ""
-"Isso é passado para ambos os comandos subjacentes do `git-fetch` para abafar "
-"o relatório do processo durante a transferência assim como do git-merge "
-"silenciando sua saída durante a mesclagem."
+msgstr "Isso é passado para ambos os comandos subjacentes do `git-fetch` para abafar o relatório do processo durante a transferência assim como do git-merge silenciando sua saída durante a mesclagem."
 
 #. type: Plain text
 #: en/git-pull.txt:86
@@ -42891,27 +38174,19 @@ msgstr "--[no-]recurse-submodules[=yes|on-demand|no]"
 #: en/git-pull.txt:92
 #, priority:220
 msgid "This option controls if new commits of populated submodules should be fetched, and if the working trees of active submodules should be updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and linkgit:gitmodules[5])."
-msgstr ""
-"Esta opção controla se os novos commits dos submódulos populados devem ser "
-"buscados ou não e se as árvore de trabalho dos submódulos ativos devem ser "
-"atualizados também (consulte linkgit:git-fetch[1], linkgit:git-config[1] e "
-"linkgit:gitmodules[5])."
+msgstr "Esta opção controla se os novos commits dos submódulos populados devem ser buscados ou não e se as árvore de trabalho dos submódulos ativos devem ser atualizados também (consulte linkgit:git-fetch[1], linkgit:git-config[1] e linkgit:gitmodules[5])."
 
 #. type: Plain text
 #: en/git-pull.txt:94
 #, priority:220
 msgid "If the checkout is done via rebase, local submodule commits are rebased as well."
-msgstr ""
-"Caso a averiguação seja feita através da reconstrução \"rebase\", os commits "
-"do submódulo local também serão refeitas."
+msgstr "Caso a averiguação seja feita através da reconstrução \"rebase\", os commits do submódulo local também serão refeitas."
 
 #. type: Plain text
 #: en/git-pull.txt:96
 #, priority:220
 msgid "If the update is done via merge, the submodule conflicts are resolved and checked out."
-msgstr ""
-"Caso a atualização seja feita através de uma mesclagem, os conflitos do sub-"
-"módulo serão resolvidos e retirados."
+msgstr "Caso a atualização seja feita através de uma mesclagem, os conflitos do sub-módulo serão resolvidos e retirados."
 
 #. type: Title ~
 #: en/git-pull.txt:98
@@ -42929,31 +38204,19 @@ msgstr "--rebase[=false|true|merges|preserve|interactive]"
 #: en/git-pull.txt:111
 #, priority:220
 msgid "When true, rebase the current branch on top of the upstream branch after fetching. If there is a remote-tracking branch corresponding to the upstream branch and the upstream branch was rebased since last fetched, the rebase uses that information to avoid rebasing non-local changes."
-msgstr ""
-"Quando for verdadeiro, reorganize a fundação do ramo atual no topo da "
-"ramificação upstream após a busca. Caso haja uma ramificação monitorado "
-"remotamente correspondente à ramificação upstream e a ramificação upstream "
-"foi reconstruído desde a última busca, a reconstrução da fundação utilizará "
-"estas informações para evitar reconstruir as alterações que não fora locais."
+msgstr "Quando for verdadeiro, reorganize a fundação do ramo atual no topo da ramificação upstream após a busca. Caso haja uma ramificação monitorado remotamente correspondente à ramificação upstream e a ramificação upstream foi reconstruído desde a última busca, a reconstrução da fundação utilizará estas informações para evitar reconstruir as alterações que não fora locais."
 
 #. type: Plain text
 #: en/git-pull.txt:115
 #, priority:220
 msgid "When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details)."
-msgstr ""
-"Quando definido como `merges`, a reconstrução da fundação (rebase) "
-"utilizando o comando `git rebase --rebase-merges` para que as mesclagem dos "
-"commits locais sejam incluídas na reconstrução (para mais detalhes, consulte "
-"linkgit:git-rebase[1])."
+msgstr "Quando definido como `merges`, a reconstrução da fundação (rebase) utilizando o comando `git rebase --rebase-merges` para que as mesclagem dos commits locais sejam incluídas na reconstrução (para mais detalhes, consulte linkgit:git-rebase[1])."
 
 #. type: Plain text
 #: en/git-pull.txt:119
 #, priority:220
 msgid "When set to `preserve` (deprecated in favor of `merges`), rebase with the `--preserve-merges` option passed to `git rebase` so that locally created merge commits will not be flattened."
-msgstr ""
-"Quando definido como `preserve` (já descontinuado em favor de `merges`), "
-"reconstrua passando a opção `--preserve-merges` para o comando `git rebase` "
-"para que a mesclagem dos commits criados localmente não sejam achatadas."
+msgstr "Quando definido como `preserve` (já descontinuado em favor de `merges`), reconstrua passando a opção `--preserve-merges` para o comando `git rebase` para que a mesclagem dos commits criados localmente não sejam achatadas."
 
 #. type: Plain text
 #: en/git-pull.txt:121
@@ -42965,28 +38228,19 @@ msgstr "Quando for falso, mescle a ramificação atual na ramificação upstream
 #: en/git-pull.txt:123
 #, priority:220
 msgid "When `interactive`, enable the interactive mode of rebase."
-msgstr ""
-"Quando `interactive` (interativo) , ative o modo interativo da reconstrução "
-"da fundação."
+msgstr "Quando `interactive` (interativo) , ative o modo interativo da reconstrução da fundação."
 
 #. type: Plain text
 #: en/git-pull.txt:127
 #, priority:220
 msgid "See `pull.rebase`, `branch.<name>.rebase` and `branch.autoSetupRebase` in linkgit:git-config[1] if you want to make `git pull` always use `--rebase` instead of merging."
-msgstr ""
-"Consulte `pull.rebase`, `branch.<nome>.rebase` e `branch.autoSetupRebase` no "
-"linkgit:git-config[1] caso queira fazer o `git pull`, sempre utilize o "
-"comando `--rebase` em vez de mesclar ."
+msgstr "Consulte `pull.rebase`, `branch.<nome>.rebase` e `branch.autoSetupRebase` no linkgit:git-config[1] caso queira fazer o `git pull`, sempre utilize o comando `--rebase` em vez de mesclar ."
 
 #. type: Plain text
 #: en/git-pull.txt:133
 #, priority:220
 msgid "This is a potentially _dangerous_ mode of operation.  It rewrites history, which does not bode well when you published that history already.  Do *not* use this option unless you have read linkgit:git-rebase[1] carefully."
-msgstr ""
-"Esse é um modo de operação potencialmente _perigoso_.  Ele reescreve o "
-"histórico, o que não é um bom presságio quando você já o publicou.  *Não* "
-"utilize esta opção, a menos que você leia o linkgit:git-rebase[1] com muita "
-"atenção."
+msgstr "Esse é um modo de operação potencialmente _perigoso_.  Ele reescreve o histórico, o que não é um bom presságio quando você já o publicou.  *Não* utilize esta opção, a menos que você leia o linkgit:git-rebase[1] com muita atenção."
 
 #. type: Labeled list
 #: en/git-pull.txt:134 en/git-svn.txt:261
@@ -43016,33 +38270,19 @@ msgstr "COMPORTAMENTO PREDEFINIDO"
 #: en/git-pull.txt:156
 #, priority:220
 msgid "Often people use `git pull` without giving any parameter.  Traditionally, this has been equivalent to saying `git pull origin`.  However, when configuration `branch.<name>.remote` is present while on branch `<name>`, that value is used instead of `origin`."
-msgstr ""
-"Frequentemente, as pessoas utilizam o `git pull` sem informar qualquer "
-"parâmetro.  Tradicionalmente, é o mesmo que dizer `git pull origin`.  No "
-"entanto, quando a configuração `branch.<nome>.remote` está presente enquanto "
-"no ramo `<nome>`, esse valor é utilizado em vez de `origin`."
+msgstr "Frequentemente, as pessoas utilizam o `git pull` sem informar qualquer parâmetro.  Tradicionalmente, é o mesmo que dizer `git pull origin`.  No entanto, quando a configuração `branch.<nome>.remote` está presente enquanto no ramo `<nome>`, esse valor é utilizado em vez de `origin`."
 
 #. type: Plain text
 #: en/git-pull.txt:161
 #, priority:220
 msgid "In order to determine what URL to use to fetch from, the value of the configuration `remote.<origin>.url` is consulted and if there is not any such variable, the value on the `URL:` line in `$GIT_DIR/remotes/<origin>` is used."
-msgstr ""
-"Para determinar de qual URL usar, o valor da configuração `remote.<origin>."
-"url` é consultado e caso não haja nenhuma variável, o valor na linha `URL:` "
-"em `$GIT_DIR/remotes/<origin>` é utilizado."
+msgstr "Para determinar de qual URL usar, o valor da configuração `remote.<origin>.url` é consultado e caso não haja nenhuma variável, o valor na linha `URL:` em `$GIT_DIR/remotes/<origin>` é utilizado."
 
 #. type: Plain text
 #: en/git-pull.txt:170
 #, priority:220
 msgid "In order to determine what remote branches to fetch (and optionally store in the remote-tracking branches) when the command is run without any refspec parameters on the command line, values of the configuration variable `remote.<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used.  In addition to the refspec formats described in the OPTIONS section, you can have a globbing refspec that looks like this:"
-msgstr ""
-"Para determinar quais ramificações remotas buscar (e opcionalmente armazenar "
-"nas ramificações monitoradas remotamente) quando o comando é executado sem "
-"nenhum parâmetro \"refspec\" na linha de comando, os valores da variável de "
-"configuração `remote.<origin>.fetch` são consultados e caso não exista "
-"nenhum, então `$GIT_DIR/remotes/<origin>` é consultado e as suas linhas "
-"`Pull:` são utilizadas.  Além dos formatos \"refspec\" descritos na seção "
-"OPÇÕES, você pode ter um englobamento do \"refspec\" parecido com este:"
+msgstr "Para determinar quais ramificações remotas buscar (e opcionalmente armazenar nas ramificações monitoradas remotamente) quando o comando é executado sem nenhum parâmetro \"refspec\" na linha de comando, os valores da variável de configuração `remote.<origin>.fetch` são consultados e caso não exista nenhum, então `$GIT_DIR/remotes/<origin>` é consultado e as suas linhas `Pull:` são utilizadas.  Além dos formatos \"refspec\" descritos na seção OPÇÕES, você pode ter um englobamento do \"refspec\" parecido com este:"
 
 #. type: delimited block -
 #: en/git-pull.txt:173
@@ -43054,47 +38294,31 @@ msgstr "refs/heads/*:refs/remotes/origin/*\n"
 #: en/git-pull.txt:180
 #, priority:220
 msgid "A globbing refspec must have a non-empty RHS (i.e. must store what were fetched in remote-tracking branches), and its LHS and RHS must end with `/*`.  The above specifies that all remote branches are tracked using remote-tracking branches in `refs/remotes/origin/` hierarchy under the same name."
-msgstr ""
-"Um englobamento do \"refspec\" deve ter um RHS que não não seja vazio (ou "
-"seja, deve armazenar o que foi buscado nas ramificações monitoradas "
-"remotamente) e o seu `LHS` e `RHS` devem terminar com `/*`.  A definição "
-"acima determina que todas as ramificações remotas sejam monitoradas "
-"utilizando os ramos monitorados remotamente em `refs/remotes/origin/` com o "
-"mesmo nome."
+msgstr "Um englobamento do \"refspec\" deve ter um RHS que não não seja vazio (ou seja, deve armazenar o que foi buscado nas ramificações monitoradas remotamente) e o seu `LHS` e `RHS` devem terminar com `/*`.  A definição acima determina que todas as ramificações remotas sejam monitoradas utilizando os ramos monitorados remotamente em `refs/remotes/origin/` com o mesmo nome."
 
 #. type: Plain text
 #: en/git-pull.txt:184
 #, priority:220
 msgid "The rule to determine which remote branch to merge after fetching is a bit involved, in order not to break backward compatibility."
-msgstr ""
-"A regra para determinar qual a ramificação remota deve ser mesclada após a "
-"captura é um pouco complexo, para que não prejudique a compatibilidade com "
-"as versões anteriores."
+msgstr "A regra para determinar qual a ramificação remota deve ser mesclada após a captura é um pouco complexo, para que não prejudique a compatibilidade com as versões anteriores."
 
 #. type: Plain text
 #: en/git-pull.txt:187
 #, priority:220
 msgid "If explicit refspecs were given on the command line of `git pull`, they are all merged."
-msgstr ""
-"Caso \"refspecs\" explícitos sejam informados para o comando `git pull`, "
-"todos eles são mesclados."
+msgstr "Caso \"refspecs\" explícitos sejam informados para o comando `git pull`, todos eles são mesclados."
 
 #. type: Plain text
 #: en/git-pull.txt:192
 #, priority:220
 msgid "When no refspec was given on the command line, then `git pull` uses the refspec from the configuration or `$GIT_DIR/remotes/<origin>`.  In such cases, the following rules apply:"
-msgstr ""
-"Quando nenhum \"refspec\" for informado na linha de comando, o `git pull` "
-"utiliza o \"refspec\" da configuração ou `$GIT_DIR/remotes/<origin>`.  "
-"Nestes casos, as seguintes regras se aplicam:"
+msgstr "Quando nenhum \"refspec\" for informado na linha de comando, o `git pull` utiliza o \"refspec\" da configuração ou `$GIT_DIR/remotes/<origin>`.  Nestes casos, as seguintes regras se aplicam:"
 
 #. type: Plain text
 #: en/git-pull.txt:196
 #, priority:220
 msgid "If `branch.<name>.merge` configuration for the current branch `<name>` exists, that is the name of the branch at the remote site that is merged."
-msgstr ""
-"Caso a configuração `branch.<nome>.merge` para o ramo atual `<nome>` exista, "
-"este é o nome do ramo no site remoto que é mesclado."
+msgstr "Caso a configuração `branch.<nome>.merge` para o ramo atual `<nome>` exista, este é o nome do ramo no site remoto que é mesclado."
 
 #. type: Plain text
 #: en/git-pull.txt:198
@@ -43112,9 +38336,7 @@ msgstr "Caso contrário, a ramificação remota do primeiro refspec será mescla
 #: en/git-pull.txt:208
 #, priority:220
 msgid "Update the remote-tracking branches for the repository you cloned from, then merge one of them into your current branch:"
-msgstr ""
-"Atualize as ramificações monitoradas remotamente para o repositório onde a "
-"clonagem foi feita e em seguida, mescle uma delas na sua ramificação atual:"
+msgstr "Atualize as ramificações monitoradas remotamente para o repositório onde a clonagem foi feita e em seguida, mescle uma delas na sua ramificação atual:"
 
 #. type: delimited block -
 #: en/git-pull.txt:212
@@ -43130,10 +38352,7 @@ msgstr ""
 #: en/git-pull.txt:217
 #, priority:220
 msgid "Normally the branch merged in is the HEAD of the remote repository, but the choice is determined by the branch.<name>.remote and branch.<name>.merge options; see linkgit:git-config[1] for details."
-msgstr ""
-"Normalmente o ramo mesclado fica no `HEAD` do repositório remoto, porém a "
-"escolha é determinada pelas opções `branch.<nome>.remote` e `branch.<nome>."
-"merge`; para mais detalhes consulte linkgit:git-config[1]."
+msgstr "Normalmente o ramo mesclado fica no `HEAD` do repositório remoto, porém a escolha é determinada pelas opções `branch.<nome>.remote` e `branch.<nome>.merge`; para mais detalhes consulte linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-pull.txt:219
@@ -43151,10 +38370,7 @@ msgstr "$ git pull origin next\n"
 #: en/git-pull.txt:227
 #, priority:220
 msgid "This leaves a copy of `next` temporarily in FETCH_HEAD, and updates the remote-tracking branch `origin/next`.  The same can be done by invoking fetch and merge:"
-msgstr ""
-"Isto deixa uma cópia do `next` temporariamente no `FETCH_HEAD`, porém não "
-"atualiza nenhum outro ramo `origin/next` monitorado remotamente.  O mesmo "
-"pode ser feito ao executar o `fetch` e o `merge`:"
+msgstr "Isto deixa uma cópia do `next` temporariamente no `FETCH_HEAD`, porém não atualiza nenhum outro ramo `origin/next` monitorado remotamente.  O mesmo pode ser feito ao executar o `fetch` e o `merge`:"
 
 #. type: delimited block -
 #: en/git-pull.txt:231
@@ -43170,9 +38386,7 @@ msgstr ""
 #: en/git-pull.txt:236
 #, priority:220
 msgid "If you tried a pull which resulted in complex conflicts and would want to start over, you can recover with 'git reset'."
-msgstr ""
-"Caso você tente fazer um \"pull\" que resultou em conflitos complexos e "
-"queira recomeçar, a recuperação pode ser feita com o comando 'git reset'."
+msgstr "Caso você tente fazer um \"pull\" que resultou em conflitos complexos e queira recomeçar, a recuperação pode ser feita com o comando 'git reset'."
 
 #. type: Plain text
 #: en/git-pull.txt:252
@@ -43190,8 +38404,7 @@ msgstr "git-push(1)"
 #: en/git-push.txt:7
 #, priority:220
 msgid "git-push - Update remote refs along with associated objects"
-msgstr ""
-"git-push - Atualiza as refs remotas junto com os objetos associados a ela"
+msgstr "git-push - Atualiza as refs remotas junto com os objetos associados a ela"
 
 #. type: Plain text
 #: en/git-push.txt:18
@@ -43204,10 +38417,8 @@ msgid ""
 "\t   [--force-with-lease[=<refname>[:<expect>]]]\n"
 "\t   [--no-verify] [<repository> [<refspec>...]]\n"
 msgstr ""
-"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | "
-"--dry-run] [--receive-pack=<git-receive-pack>]\n"
-"\t   [--repo=<repositório>] [-f | --force] [-d | --delete] [--prune] [-v | "
-"--verbose]\n"
+"'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]\n"
+"\t   [--repo=<repositório>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]\n"
 "\t   [-u | --set-upstream] [-o <texto> | --push-option=<texto>]\n"
 "\t   [--[no-]signed|--signed=(true|false|if-asked)]\n"
 "\t   [--force-with-lease[=<refname>[:<expect>]]]\n"
@@ -43217,28 +38428,19 @@ msgstr ""
 #: en/git-push.txt:24
 #, priority:220
 msgid "Updates remote refs using local refs, while sending objects necessary to complete the given refs."
-msgstr ""
-"Atualiza as refs remotas utilizando as refs locais, enquanto envia os "
-"objetos necessários para que seja concluída as refs informadas."
+msgstr "Atualiza as refs remotas utilizando as refs locais, enquanto envia os objetos necessários para que seja concluída as refs informadas."
 
 #. type: Plain text
 #: en/git-push.txt:28
 #, priority:220
 msgid "You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there.  See documentation for linkgit:git-receive-pack[1]."
-msgstr ""
-"Você pode fazer com que coisas que intereçam aconteçam com um repositório "
-"toda vez que você o adiciona, configurando os 'ganchos' lá.  Consulte a "
-"documentação para linkgit:git-receive-pack[1]."
+msgstr "Você pode fazer com que coisas que intereçam aconteçam com um repositório toda vez que você o adiciona, configurando os 'ganchos' lá.  Consulte a documentação para linkgit:git-receive-pack[1]."
 
 #. type: Plain text
 #: en/git-push.txt:33
 #, priority:220
 msgid "When the command line does not specify where to push with the `<repository>` argument, `branch.*.remote` configuration for the current branch is consulted to determine where to push.  If the configuration is missing, it defaults to 'origin'."
-msgstr ""
-"Quando a linha de comando não informa para onde impulsionar (push) com a "
-"opção `<repositório>`, a configuração `branch.*.remote` é consultada para o "
-"ramo atual para determinar para onde o impulsionamento deve ser feito.  Caso "
-"a configuração esteja ausente, a predefinição retorna para 'origin'."
+msgstr "Quando a linha de comando não informa para onde impulsionar (push) com a opção `<repositório>`, a configuração `branch.*.remote` é consultada para o ramo atual para determinar para onde o impulsionamento deve ser feito.  Caso a configuração esteja ausente, a predefinição retorna para 'origin'."
 
 #. type: Plain text
 #: en/git-push.txt:39
@@ -43250,12 +38452,7 @@ msgstr "Quando a linha de comando não especifica o que impulsionar (push) com a
 #: en/git-push.txt:46
 #, priority:220
 msgid "When neither the command-line nor the configuration specify what to push, the default behavior is used, which corresponds to the `simple` value for `push.default`: the current branch is pushed to the corresponding upstream branch, but as a safety measure, the push is aborted if the upstream branch does not have the same name as the local one."
-msgstr ""
-"Quando nem a linha de comando nem a configuração informam o que enviar, o "
-"comportamento predefinido é utilizado, que corresponde ao valor `simple` "
-"para `push.default`: o ramo atual é enviado ao ramo upstream correspondente, "
-"porém como uma medida segurança, o envio será cancelado caso o ramo upstream "
-"não esteja com o mesmo nome que o ramo local."
+msgstr "Quando nem a linha de comando nem a configuração informam o que enviar, o comportamento predefinido é utilizado, que corresponde ao valor `simple` para `push.default`: o ramo atual é enviado ao ramo upstream correspondente, porém como uma medida segurança, o envio será cancelado caso o ramo upstream não esteja com o mesmo nome que o ramo local."
 
 #. type: Title -
 #: en/git-push.txt:49
@@ -43267,11 +38464,7 @@ msgstr "OPÇÕES[[OPÇÕES]]"
 #: en/git-push.txt:55
 #, priority:220
 msgid "The \"remote\" repository that is destination of a push operation.  This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
-msgstr ""
-"O repositório \"remoto\" que é o destino de uma operação de envio através de "
-"uma operação \"push\".  Este parâmetro pode ser uma URL (consulte a seção "
-"<<URLS, GIT URLS>> abaixo) ou o nome de um ramo remoto (consulte a seção "
-"<<REMOTES, REMOTES>> abaixo)."
+msgstr "O repositório \"remoto\" que é o destino de uma operação de envio através de uma operação \"push\".  Este parâmetro pode ser uma URL (consulte a seção <<URLS, GIT URLS>> abaixo) ou o nome de um ramo remoto (consulte a seção <<REMOTES, REMOTES>> abaixo)."
 
 #. type: Labeled list
 #: en/git-push.txt:56
@@ -43283,11 +38476,7 @@ msgstr "<refspec>..."
 #: en/git-push.txt:61
 #, priority:220
 msgid "Specify what destination ref to update with what source object.  The format of a <refspec> parameter is an optional plus `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>."
-msgstr ""
-"Defina qual a \"ref\" do destino para atualizar com qual objeto da origem.  "
-"O formato de um parâmetro `<refspec>` é um opcional mais `+`, seguido pelo "
-"objeto da origem `<src>`, seguido de dois pontos `:`, seguido pelo destino "
-"da ref `<dst>`."
+msgstr "Defina qual a \"ref\" do destino para atualizar com qual objeto da origem.  O formato de um parâmetro `<refspec>` é um opcional mais `+`, seguido pelo objeto da origem `<src>`, seguido de dois pontos `:`, seguido pelo destino da ref `<dst>`."
 
 #. type: Plain text
 #: en/git-push.txt:65
@@ -43299,151 +38488,85 @@ msgstr "Geralmente `<src>` é o nome do ramo que você deseja impulsionar, pode
 #: en/git-push.txt:75
 #, priority:220
 msgid "The <dst> tells which ref on the remote side is updated with this push. Arbitrary expressions cannot be used here, an actual ref must be named.  If `git push [<repository>]` without any `<refspec>` argument is set to update some ref at the destination with `<src>` with `remote.<repository>.push` configuration variable, `:<dst>` part can be omitted--such a push will update a ref that `<src>` normally updates without any `<refspec>` on the command line.  Otherwise, missing `:<dst>` means to update the same ref as the `<src>`."
-msgstr ""
-"O <dst> informa qual a \"ref\" no lado remoto será atualizado com este "
-"impulsionamento \"push\". Expressões arbitrárias não podem ser utilizadas "
-"aqui, uma \"ref\" real deve ser determinada.  Caso o comando `git push "
-"[<repositório>]` sem nenhum argumento `<refspec>` estiver definido para "
-"atualizar alguma \"ref\" no destino com `<src>` com a variável de "
-"configuração `remote.<repositório>.push`, a parte do comando `:<dst>` pode "
-"ser omitida, este empulsionamento \"push\" atualizará uma \"ref\" onde "
-"`<src>` normalmente atualiza sem qualquer `<refspec>` na linha de comando.  "
-"Caso contrário, a falta de `:<dst>` significa atualizar a mesma referência "
-"que o `<src>`."
+msgstr "O <dst> informa qual a \"ref\" no lado remoto será atualizado com este impulsionamento \"push\". Expressões arbitrárias não podem ser utilizadas aqui, uma \"ref\" real deve ser determinada.  Caso o comando `git push [<repositório>]` sem nenhum argumento `<refspec>` estiver definido para atualizar alguma \"ref\" no destino com `<src>` com a variável de configuração `remote.<repositório>.push`, a parte do comando `:<dst>` pode ser omitida, este empulsionamento \"push\" atualizará uma \"ref\" onde `<src>` normalmente atualiza sem qualquer `<refspec>` na linha de comando.  Caso contrário, a falta de `:<dst>` significa atualizar a mesma referência que o `<src>`."
 
 #. type: Plain text
 #: en/git-push.txt:80
 #, priority:220
 msgid "If <dst> doesn't start with `refs/` (e.g. `refs/heads/master`) we will try to infer where in `refs/*` on the destination <repository> it belongs based on the type of <src> being pushed and whether <dst> is ambiguous."
-msgstr ""
-"Caso o <dst> não comece com `refs/` (como `refs/heads/master` por exemplo), "
-"tentaremos inferir onde em `refs/*` no <repositório> de destino, ele "
-"pertença com base no tipo da <src> sendo impulsionado e caso o <dst> seja "
-"ambíguo."
+msgstr "Caso o <dst> não comece com `refs/` (como `refs/heads/master` por exemplo), tentaremos inferir onde em `refs/*` no <repositório> de destino, ele pertença com base no tipo da <src> sendo impulsionado e caso o <dst> seja ambíguo."
 
 #. type: Plain text
 #: en/git-push.txt:84
 #, priority:220
 msgid "If <dst> unambiguously refers to a ref on the <repository> remote, then push to that ref."
-msgstr ""
-"Caso o <dst> se refira inequivocamente a uma \"ref\" no <repositório> do "
-"ramo remoto, então faça um impulsionamento \"push\" nesta ref."
+msgstr "Caso o <dst> se refira inequivocamente a uma \"ref\" no <repositório> do ramo remoto, então faça um impulsionamento \"push\" nesta ref."
 
 #. type: Plain text
 #: en/git-push.txt:87
 #, priority:220
 msgid "If <src> resolves to a ref starting with refs/heads/ or refs/tags/, then prepend that to <dst>."
-msgstr ""
-"Caso o <src> seja resolvido para uma \"ref\" começando com `refs/heads/` ou `"
-"refs/tags/`, coloque um prefixo no <dst>."
+msgstr "Caso o <src> seja resolvido para uma \"ref\" começando com `refs/heads/` ou `refs/tags/`, coloque um prefixo no <dst>."
 
 #. type: Plain text
 #: en/git-push.txt:93
 #, priority:220
 msgid "Other ambiguity resolutions might be added in the future, but for now any other cases will error out with an error indicating what we tried, and depending on the `advice.pushUnqualifiedRefname` configuration (see linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to push to."
-msgstr ""
-"Outras resoluções de ambiguidade podem ser adicionadas no futuro, mas, por "
-"enquanto, outros casos apresentarão um erro indicando o que tentamos e "
-"dependendo da configuração `advice.pushUnqualifiedRefname` (consulte linkgit"
-":git-config[1]), sugere qual 'refs/ namespace' você possa querer impulsionar."
+msgstr "Outras resoluções de ambiguidade podem ser adicionadas no futuro, mas, por enquanto, outros casos apresentarão um erro indicando o que tentamos e dependendo da configuração `advice.pushUnqualifiedRefname` (consulte linkgit:git-config[1]), sugere qual 'refs/ namespace' você possa querer impulsionar."
 
 #. type: Plain text
 #: en/git-push.txt:101
 #, priority:220
 msgid "The object referenced by <src> is used to update the <dst> reference on the remote side. Whether this is allowed depends on where in `refs/*` the <dst> reference lives as described in detail below, in those sections \"update\" means any modifications except deletes, which as noted after the next few sections are treated differently."
-msgstr ""
-"O objeto referenciado por <src> é utilizado para atualizar a referência "
-"<dst> no lado remoto. Caso isso seja permitido, vai depender de onde em `"
-"refs/*` a referência <dst> vive como descrito com mais detalhes logo abaixo, "
-"nestas seções \"update\" indica que quaisquer modificações, exceto as "
-"exclusões, que serão descritos nas próximas seções, são tratadas de forma "
-"diferente."
+msgstr "O objeto referenciado por <src> é utilizado para atualizar a referência <dst> no lado remoto. Caso isso seja permitido, vai depender de onde em `refs/*` a referência <dst> vive como descrito com mais detalhes logo abaixo, nestas seções \"update\" indica que quaisquer modificações, exceto as exclusões, que serão descritos nas próximas seções, são tratadas de forma diferente."
 
 #. type: Plain text
 #: en/git-push.txt:104
 #, priority:220
 msgid "The `refs/heads/*` namespace will only accept commit objects, and updates only if they can be fast-forwarded."
-msgstr ""
-"O espaço de nomes `refs/heads/*` aceitarão apenas os objetos commit e será "
-"atualizado apenas caso eles possam avançar de forma rápida."
+msgstr "O espaço de nomes `refs/heads/*` aceitarão apenas os objetos commit e será atualizado apenas caso eles possam avançar de forma rápida."
 
 #. type: Plain text
 #: en/git-push.txt:108
 #, priority:220
 msgid "The `refs/tags/*` namespace will accept any kind of object (as commits, trees and blobs can be tagged), and any updates to them will be rejected."
-msgstr ""
-"O espaço de nomes `refs/tags/*` aceitarão quaisquer tipos de objeto (como "
-"commits, árvores e bolhas que possam ser marcados) e quaisquer atualizações "
-"para eles serão rejeitadas."
+msgstr "O espaço de nomes `refs/tags/*` aceitarão quaisquer tipos de objeto (como commits, árvores e bolhas que possam ser marcados) e quaisquer atualizações para eles serão rejeitadas."
 
 #. type: Plain text
 #: en/git-push.txt:113
 #, priority:220
 msgid "It's possible to push any type of object to any namespace outside of `refs/{tags,heads}/*`. In the case of tags and commits, these will be treated as if they were the commits inside `refs/heads/*` for the purposes of whether the update is allowed."
-msgstr ""
-"É possível impulsionar qualquer tipo de objeto para qualquer espaço de nomes "
-"fora do `refs/{tags,heads}/*`. No caso das tags e dos commits, estes serão "
-"tratados como se fossem os commits dentro do `refs/heads/*` para os "
-"propósitos caso a atualização seja permitida."
+msgstr "É possível impulsionar qualquer tipo de objeto para qualquer espaço de nomes fora do `refs/{tags,heads}/*`. No caso das tags e dos commits, estes serão tratados como se fossem os commits dentro do `refs/heads/*` para os propósitos caso a atualização seja permitida."
 
 #. type: Plain text
 #: en/git-push.txt:122
 #, priority:220
 msgid "I.e. a fast-forward of commits and tags outside `refs/{tags,heads}/*` is allowed, even in cases where what's being fast-forwarded is not a commit, but a tag object which happens to point to a new commit which is a fast-forward of the commit the last tag (or commit) it's replacing. Replacing a tag with an entirely different tag is also allowed, if it points to the same commit, as well as pushing a peeled tag, i.e. pushing the commit that existing tag object points to, or a new tag object which an existing commit points to."
-msgstr ""
-"Um avanço rápido dos commits e das tags fora do `refs/{tags,heads}/*` por "
-"exemplo, é permitido, mesmo nos casos onde o que está sendo acelerado não é "
-"um commit e sim um objeto da tag que aponte para um novo commit onde seja um "
-"avanço rápido do commit da última tag (ou commit) que está sendo "
-"substituindo. Também é permitida a reposição de uma tag por uma outra "
-"totalmente diferente, caso ela apontar para o mesmo commit, bem como ao "
-"impulsionar uma tag já descascada, ou seja, impulsionar o commit onde o "
-"objeto existente do tag aponte ou um novo objeto da tag onde o commit "
-"existente esteja apontando."
+msgstr "Um avanço rápido dos commits e das tags fora do `refs/{tags,heads}/*` por exemplo, é permitido, mesmo nos casos onde o que está sendo acelerado não é um commit e sim um objeto da tag que aponte para um novo commit onde seja um avanço rápido do commit da última tag (ou commit) que está sendo substituindo. Também é permitida a reposição de uma tag por uma outra totalmente diferente, caso ela apontar para o mesmo commit, bem como ao impulsionar uma tag já descascada, ou seja, impulsionar o commit onde o objeto existente do tag aponte ou um novo objeto da tag onde o commit existente esteja apontando."
 
 #. type: Plain text
 #: en/git-push.txt:126
 #, priority:220
 msgid "Tree and blob objects outside of `refs/{tags,heads}/*` will be treated the same way as if they were inside `refs/tags/*`, any update of them will be rejected."
-msgstr ""
-"Os objetos da árvore e da bolha fora do `refs{tags,heads}/*` serão tratados "
-"da mesma maneira como se estivessem dentro do `refs/tags/*`, qualquer outra "
-"atualização deles será rejeitada."
+msgstr "Os objetos da árvore e da bolha fora do `refs{tags,heads}/*` serão tratados da mesma maneira como se estivessem dentro do `refs/tags/*`, qualquer outra atualização deles será rejeitada."
 
 #. type: Plain text
 #: en/git-push.txt:135
 #, priority:220
 msgid "All of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object. Hooks and configuration can also override or amend these rules, see e.g. `receive.denyNonFastForwards` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
-msgstr ""
-"Todas as regras descritas acima sobre o que não é permitido como uma "
-"atualização, podem ser substituídas adicionando um sinal opcional `+` "
-"inicial em um \"refspec\" (ou utilizando a opção da linha de comando "
-"`--force`). A única exceção a isso é que nenhuma quantidade de imposição "
-"fará com que o espaço de nomes `refs/heads/*` aceite um objeto que não seja "
-"um commit. Os ganchos e configurações também podem substituir ou alterar "
-"estas regras, consulte, por exemplo, `receive.denyNonFastForwards` no linkgit"
-":git-config[1] e `pre-receive` e `update` no linkgit:githooks[5]."
+msgstr "Todas as regras descritas acima sobre o que não é permitido como uma atualização, podem ser substituídas adicionando um sinal opcional `+` inicial em um \"refspec\" (ou utilizando a opção da linha de comando `--force`). A única exceção a isso é que nenhuma quantidade de imposição fará com que o espaço de nomes `refs/heads/*` aceite um objeto que não seja um commit. Os ganchos e configurações também podem substituir ou alterar estas regras, consulte, por exemplo, `receive.denyNonFastForwards` no linkgit:git-config[1] e `pre-receive` e `update` no linkgit:githooks[5]."
 
 #. type: Plain text
 #: en/git-push.txt:141
 #, priority:220
 msgid "Pushing an empty <src> allows you to delete the <dst> ref from the remote repository. Deletions are always accepted without a leading `+` in the refspec (or `--force`), except when forbidden by configuration or hooks. See `receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and `update` in linkgit:githooks[5]."
-msgstr ""
-"Fazer um impulsionamento \"push\" de um <src> vazio permite excluir o <dst> "
-"\"ref\" do repositório remoto. As exclusões sempre são aceitas sem um sinal "
-"`+` inicial no \"refspec\" (ou com a opção `--force`), exceto quando for "
-"proibido pela configuração ou pelos ganchos. Consulte `receive.denyDeletes` "
-"no linkgit:git-config[1] e `pre-receive` e `update` no linkgit:githooks[5]."
+msgstr "Fazer um impulsionamento \"push\" de um <src> vazio permite excluir o <dst> \"ref\" do repositório remoto. As exclusões sempre são aceitas sem um sinal `+` inicial no \"refspec\" (ou com a opção `--force`), exceto quando for proibido pela configuração ou pelos ganchos. Consulte `receive.denyDeletes` no linkgit:git-config[1] e `pre-receive` e `update` no linkgit:githooks[5]."
 
 #. type: Plain text
 #: en/git-push.txt:146
 #, priority:220
 msgid "The special refspec `:` (or `+:` to allow non-fast-forward updates)  directs Git to push \"matching\" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name already exists on the remote side."
-msgstr ""
-"O \"refspec\" especial `:` (ou `+:` para permitir as atualizações sem avanço "
-"rápido) instrui o Git para enviar as ramificações \"coincidentes\": para "
-"cada ramificação que exista no lado local, o lado remoto é atualizado caso "
-"uma ramificação do o mesmo nome já exista."
+msgstr "O \"refspec\" especial `:` (ou `+:` para permitir as atualizações sem avanço rápido) instrui o Git para enviar as ramificações \"coincidentes\": para cada ramificação que exista no lado local, o lado remoto é atualizado caso uma ramificação do o mesmo nome já exista."
 
 #. type: Plain text
 #: en/git-push.txt:148
@@ -43455,60 +38578,37 @@ msgstr "A `tag <tag>` significa o mesmo que `refs/tags/<tag>:refs/tags/<tag>`."
 #: en/git-push.txt:152
 #, priority:220
 msgid "Push all branches (i.e. refs under `refs/heads/`); cannot be used with other <refspec>."
-msgstr ""
-"impulsione todos os ramos (ou seja, refs em `refs/heads/`); não pode ser "
-"utilizado com outro <refspec>."
+msgstr "impulsione todos os ramos (ou seja, refs em `refs/heads/`); não pode ser utilizado com outro <refspec>."
 
 #. type: Plain text
 #: en/git-push.txt:160
 #, priority:220
 msgid "Remove remote branches that don't have a local counterpart. For example a remote branch `tmp` will be removed if a local branch with the same name doesn't exist any more. This also respects refspecs, e.g.  `git push --prune remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` will be removed if `refs/heads/foo` doesn't exist."
-msgstr ""
-"Remova as ramificações remotas que não possuam uma contraparte local. Uma "
-"ramificação remota `tmp` será removida caso uma ramificação local com o "
-"mesmo nome não existir mais por exemplo. Isso também respeita os \"refespecs"
-"\", por exemplo O comando `git push --prune remote refs/heads/*:refs/tmp/*` "
-"garantiria que o `refs/tmp/foo` remoto seja removido caso o `refs/heads/foo` "
-"não exista."
+msgstr "Remova as ramificações remotas que não possuam uma contraparte local. Uma ramificação remota `tmp` será removida caso uma ramificação local com o mesmo nome não existir mais por exemplo. Isso também respeita os \"refespecs\", por exemplo O comando `git push --prune remote refs/heads/*:refs/tmp/*` garantiria que o `refs/tmp/foo` remoto seja removido caso o `refs/heads/foo` não exista."
 
 #. type: Plain text
 #: en/git-push.txt:171
 #, priority:220
 msgid "Instead of naming each ref to push, specifies that all refs under `refs/` (which includes but is not limited to `refs/heads/`, `refs/remotes/`, and `refs/tags/`)  be mirrored to the remote repository.  Newly created local refs will be pushed to the remote end, locally updated refs will be force updated on the remote end, and deleted refs will be removed from the remote end.  This is the default if the configuration option `remote.<remote>.mirror` is set."
-msgstr ""
-"Em vez de nomear cada \"ref\" para fazer o impulsionamento, determine que "
-"todos os refs no `refs/` (que incluem, mas não se limitam a `refs/heads/`, `"
-"refs/remotes/` e `refs/tags/`) sejam espelhados para o repositório remoto.  "
-"As refs locais que foram recém-criadas serão enviadas para a extremidade "
-"remota, as refs que foram atualizadas localmente terão a sua atualização "
-"imposta no lado remoto e as refs que foram excluídas serão removidas "
-"remotamente.  Esta é a predefinição caso a opção de configuração "
-"`remote.<remoto>.mirror` esteja definido."
+msgstr "Em vez de nomear cada \"ref\" para fazer o impulsionamento, determine que todos os refs no `refs/` (que incluem, mas não se limitam a `refs/heads/`, `refs/remotes/` e `refs/tags/`) sejam espelhados para o repositório remoto.  As refs locais que foram recém-criadas serão enviadas para a extremidade remota, as refs que foram atualizadas localmente terão a sua atualização imposta no lado remoto e as refs que foram excluídas serão removidas remotamente.  Esta é a predefinição caso a opção de configuração `remote.<remoto>.mirror` esteja definido."
 
 #. type: Plain text
 #: en/git-push.txt:180
 #, priority:220
 msgid "Produce machine-readable output.  The output status line for each ref will be tab-separated and sent to stdout instead of stderr.  The full symbolic names of the refs will be given."
-msgstr ""
-"Gere uma saída legível para uma máquina.  A linha da condição geral para "
-"cada \"ref\" será separada por tabulação e encaminhada para o stdout em vez "
-"de stderr.  Os nomes simbólicos completos das refs serão informados."
+msgstr "Gere uma saída legível para uma máquina.  A linha da condição geral para cada \"ref\" será separada por tabulação e encaminhada para o stdout em vez de stderr.  Os nomes simbólicos completos das refs serão informados."
 
 #. type: Plain text
 #: en/git-push.txt:185
 #, priority:220
 msgid "All listed refs are deleted from the remote repository. This is the same as prefixing all refs with a colon."
-msgstr ""
-"Todas as refs listadas são excluídas do repositório remoto. É o mesmo que "
-"prefixar todos as refs com dois pontos."
+msgstr "Todas as refs listadas são excluídas do repositório remoto. É o mesmo que prefixar todos as refs com dois pontos."
 
 #. type: Plain text
 #: en/git-push.txt:190
 #, priority:220
 msgid "All refs under `refs/tags` are pushed, in addition to refspecs explicitly listed on the command line."
-msgstr ""
-"Todas as refs no `refs/tags` são impulsionadas, além das \"refspecs\" que "
-"forem explicitamente listados na linha de comando."
+msgstr "Todas as refs no `refs/tags` são impulsionadas, além das \"refspecs\" que forem explicitamente listados na linha de comando."
 
 #. type: Labeled list
 #: en/git-push.txt:191
@@ -43520,13 +38620,7 @@ msgstr "--follow-tags"
 #: en/git-push.txt:198
 #, priority:220
 msgid "Push all the refs that would be pushed without this option, and also push annotated tags in `refs/tags` that are missing from the remote but are pointing at commit-ish that are reachable from the refs being pushed.  This can also be specified with configuration variable `push.followTags`.  For more information, see `push.followTags` in linkgit:git-config[1]."
-msgstr ""
-"Impulsione todas as refs que seriam enviadas sem esta opção e também as tags "
-"anotadas no `refs/tags` que estão ausentes no ramo remoto, mas estão "
-"apontando para o \"commit-ish\" acessível a partir das referências sendo "
-"impulsionadas.  Também pode ser definido com a variável de configuração `push"
-".followTags`.  Para mais informações, consulte `push.followTags` no linkgit"
-":git-config[1]."
+msgstr "Impulsione todas as refs que seriam enviadas sem esta opção e também as tags anotadas no `refs/tags` que estão ausentes no ramo remoto, mas estão apontando para o \"commit-ish\" acessível a partir das referências sendo impulsionadas.  Também pode ser definido com a variável de configuração `push.followTags`.  Para mais informações, consulte `push.followTags` no linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-push.txt:199 en/git-send-pack.txt:73
@@ -43556,11 +38650,7 @@ msgstr "--[no-]atomic"
 #: en/git-push.txt:214
 #, priority:220
 msgid "Use an atomic transaction on the remote side if available.  Either all refs are updated, or on error, no refs are updated.  If the server does not support atomic pushes the push will fail."
-msgstr ""
-"Utilize uma transação atômica no lado remoto, caso esteja disponível.  Ou "
-"todas as refs são atualizadas ou, por erro, nenhuma será.  Caso o servidor "
-"não seja compatível com impulsionamento atômico, o impulsionamento \"push\" "
-"irá falhar."
+msgstr "Utilize uma transação atômica no lado remoto, caso esteja disponível.  Ou todas as refs são atualizadas ou, por erro, nenhuma será.  Caso o servidor não seja compatível com impulsionamento atômico, o impulsionamento \"push\" irá falhar."
 
 #. type: Labeled list
 #: en/git-push.txt:216
@@ -43590,10 +38680,7 @@ msgstr "--exec=<git-recebe-pacote>"
 #: en/git-push.txt:233 en/git-send-pack.txt:33
 #, priority:220
 msgid "Path to the 'git-receive-pack' program on the remote end.  Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH."
-msgstr ""
-"O caminho para o programa 'git-receive-pack' na extremidade remota.  Às "
-"vezes é útil ao enviar para um repositório remoto através do ssh e você não "
-"possui o programa no diretório no `$PATH` predefinido."
+msgstr "O caminho para o programa 'git-receive-pack' na extremidade remota.  Às vezes é útil ao enviar para um repositório remoto através do ssh e você não possui o programa no diretório no `$PATH` predefinido."
 
 #. type: Labeled list
 #: en/git-push.txt:234
@@ -43617,83 +38704,49 @@ msgstr "--force-with-lease=<refname>:<expect>"
 #: en/git-push.txt:239
 #, priority:220
 msgid "Usually, \"git push\" refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it."
-msgstr ""
-"Normalmente, o comando \"git push\" se recusa a atualizar uma \"ref\" remota "
-"que não seja um ancestral da \"ref\" local utilizada para substituí-la."
+msgstr "Normalmente, o comando \"git push\" se recusa a atualizar uma \"ref\" remota que não seja um ancestral da \"ref\" local utilizada para substituí-la."
 
 #. type: Plain text
 #: en/git-push.txt:242
 #, priority:220
 msgid "This option overrides this restriction if the current value of the remote ref is the expected value.  \"git push\" fails otherwise."
-msgstr ""
-"Esta opção substitui esta restrição caso o valor atual da \"ref\" remota "
-"seja o valor esperado.  Caso contrário o \"git push\" vai falhar."
+msgstr "Esta opção substitui esta restrição caso o valor atual da \"ref\" remota seja o valor esperado.  Caso contrário o \"git push\" vai falhar."
 
 #. type: Plain text
 #: en/git-push.txt:249
 #, priority:220
 msgid "Imagine that you have to rebase what you have already published.  You will have to bypass the \"must fast-forward\" rule in order to replace the history you originally published with the rebased history.  If somebody else built on top of your original history while you are rebasing, the tip of the branch at the remote may advance with her commit, and blindly pushing with `--force` will lose her work."
-msgstr ""
-"Imagine que você precise refazer o que já foi publicado.  Você precisará "
-"ignorar a regra \"deve avançar rapidamente\" para substituir o histórico "
-"publicado originalmente através  histórico que foi reformulado.  Caso alguém "
-"construa no topo do seu histórico original enquanto você está fazendo um "
-"\"rebase\", o topo do ramo no ramo remoto pode avançar com o commit dela e "
-"impulsionar cegamente com o `--force` fará com que ela perca o trabalho dela."
+msgstr "Imagine que você precise refazer o que já foi publicado.  Você precisará ignorar a regra \"deve avançar rapidamente\" para substituir o histórico publicado originalmente através  histórico que foi reformulado.  Caso alguém construa no topo do seu histórico original enquanto você está fazendo um \"rebase\", o topo do ramo no ramo remoto pode avançar com o commit dela e impulsionar cegamente com o `--force` fará com que ela perca o trabalho dela."
 
 #. type: Plain text
 #: en/git-push.txt:256
 #, priority:220
 msgid "This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref still points at the commit you specified, you can be sure that no other people did anything to the ref. It is like taking a \"lease\" on the ref without explicitly locking it, and the remote ref is updated only if the \"lease\" is still valid."
-msgstr ""
-"Esta opção permite que você diga que vai esperar que o histórico que está "
-"sendo atualizando seja o que você reconstruiu com o \"rebase\" e vai querer "
-"substituir. Casi uma \"ref\" remota ainda aponte para um commit específico, "
-"você pode ter certeza que outras pessoas não fizeram nada com a \"ref\". É "
-"como fazer uma \"concessão\" na ref sem bloqueá-la diretamente, a \"ref\" "
-"remota será atualizada apenas caso a \"concessão\" ainda seja válida."
+msgstr "Esta opção permite que você diga que vai esperar que o histórico que está sendo atualizando seja o que você reconstruiu com o \"rebase\" e vai querer substituir. Casi uma \"ref\" remota ainda aponte para um commit específico, você pode ter certeza que outras pessoas não fizeram nada com a \"ref\". É como fazer uma \"concessão\" na ref sem bloqueá-la diretamente, a \"ref\" remota será atualizada apenas caso a \"concessão\" ainda seja válida."
 
 #. type: Plain text
 #: en/git-push.txt:261
 #, priority:220
 msgid "`--force-with-lease` alone, without specifying the details, will protect all remote refs that are going to be updated by requiring their current value to be the same as the remote-tracking branch we have for them."
-msgstr ""
-"Somente a opção `--force-with-lease`, sem qualquer outra definição, "
-"protegerá todos as refs remotas que serão atualizadas, exigindo que o seu "
-"valor atual seja o mesmo que o ramo monitorado remotamente que temos para "
-"eles."
+msgstr "Somente a opção `--force-with-lease`, sem qualquer outra definição, protegerá todos as refs remotas que serão atualizadas, exigindo que o seu valor atual seja o mesmo que o ramo monitorado remotamente que temos para eles."
 
 #. type: Plain text
 #: en/git-push.txt:266
 #, priority:220
 msgid "`--force-with-lease=<refname>`, without specifying the expected value, will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the remote-tracking branch we have for it."
-msgstr ""
-"A opção `--force-with-lease=<refname>`, sem qualquer outro valor esperado, "
-"protegerá a \"ref\" que foi informado (sozinho), caso seja atualizado, "
-"exigindo que o seu valor atual seja o mesmo que o ramo monitorado "
-"remotamente que temos para isso."
+msgstr "A opção `--force-with-lease=<refname>`, sem qualquer outro valor esperado, protegerá a \"ref\" que foi informado (sozinho), caso seja atualizado, exigindo que o seu valor atual seja o mesmo que o ramo monitorado remotamente que temos para isso."
 
 #. type: Plain text
 #: en/git-push.txt:274
 #, priority:220
 msgid "`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), if it is going to be updated, by requiring its current value to be the same as the specified value `<expect>` (which is allowed to be different from the remote-tracking branch we have for the refname, or we do not even have to have such a remote-tracking branch when this form is used).  If `<expect>` is the empty string, then the named ref must not already exist."
-msgstr ""
-"`--force-with-lease=<refname>:<expect>` protegerá o ref informado (sozinho), "
-"caso seja atualizado, exigindo que o seu valor atual seja o mesmo que o "
-"valor definido `<expect >` (que pode ser diferente do ramo monitorado "
-"remotamente que temos para o refname ou nem precisamos ter esse ramo "
-"monitorado de forma remota quando este formulário é utilizado).  Caso "
-"`<expect>` esteja vazio, então a ref informada já não deve existir."
+msgstr "`--force-with-lease=<refname>:<expect>` protegerá o ref informado (sozinho), caso seja atualizado, exigindo que o seu valor atual seja o mesmo que o valor definido `<expect >` (que pode ser diferente do ramo monitorado remotamente que temos para o refname ou nem precisamos ter esse ramo monitorado de forma remota quando este formulário é utilizado).  Caso `<expect>` esteja vazio, então a ref informada já não deve existir."
 
 #. type: Plain text
 #: en/git-push.txt:279
 #, priority:220
 msgid "Note that all forms other than `--force-with-lease=<refname>:<expect>` that specifies the expected current value of the ref explicitly are still experimental and their semantics may change as we gain experience with this feature."
-msgstr ""
-"Observe que todas as formas diferentes da opção `--force-with-"
-"lease=<refname>:<expect>` que define o valor atual esperado para a \"ref\" "
-"de forma explicita, ainda são experimentais e sua semântica pode mudar à "
-"medida que adquiramos mais experiência com este recurso."
+msgstr "Observe que todas as formas diferentes da opção `--force-with-lease=<refname>:<expect>` que define o valor atual esperado para a \"ref\" de forma explicita, ainda são experimentais e sua semântica pode mudar à medida que adquiramos mais experiência com este recurso."
 
 #. type: Plain text
 #: en/git-push.txt:282
@@ -43705,34 +38758,19 @@ msgstr "A opção `--no-force-with-lease` cancelará todos os `--force-with-leas
 #: en/git-push.txt:288
 #, priority:220
 msgid "A general note on safety: supplying this option without an expected value, i.e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts very badly with anything that implicitly runs `git fetch` on the remote to be pushed to in the background, e.g. `git fetch origin` on your repository in a cronjob."
-msgstr ""
-"Uma observação geral sobre a segurança: utilizar esta opção sem um valor "
-"esperado, por exemplo, `--force-with-lease` ou `--force-with-lease=<refname>`"
-" interage muito mal com qualquer coisa que execute de forma implícita o "
-"comando `git fetch` do ramo remoto que será encaminhado para um processo de "
-"segundo plano, como o comando `git fetch origin` no seu repositório para um "
-"trabalho agendado \"cronjob\" por exemplo."
+msgstr "Uma observação geral sobre a segurança: utilizar esta opção sem um valor esperado, por exemplo, `--force-with-lease` ou `--force-with-lease=<refname>` interage muito mal com qualquer coisa que execute de forma implícita o comando `git fetch` do ramo remoto que será encaminhado para um processo de segundo plano, como o comando `git fetch origin` no seu repositório para um trabalho agendado \"cronjob\" por exemplo."
 
 #. type: Plain text
 #: en/git-push.txt:295
 #, priority:220
 msgid "The protection it offers over `--force` is ensuring that subsequent changes your work wasn't based on aren't clobbered, but this is trivially defeated if some background process is updating refs in the background. We don't have anything except the remote tracking info to go by as a heuristic for refs you're expected to have seen & are willing to clobber."
-msgstr ""
-"A proteção oferecida contra a opção `--force` é garantir que as subsequentes "
-"alterações onde a base do seu trabalho não sejam prejudicadas, porém isso "
-"será derrotado trivialmente caso algum processo em segundo plano estiver "
-"atualizando as refs em segundo plano. Não temos nada além das informações de "
-"monitoramento remoto, como uma heurística para as refs que você deve ter "
-"visto e está disposto a adotar."
+msgstr "A proteção oferecida contra a opção `--force` é garantir que as subsequentes alterações onde a base do seu trabalho não sejam prejudicadas, porém isso será derrotado trivialmente caso algum processo em segundo plano estiver atualizando as refs em segundo plano. Não temos nada além das informações de monitoramento remoto, como uma heurística para as refs que você deve ter visto e está disposto a adotar."
 
 #. type: Plain text
 #: en/git-push.txt:299
 #, priority:220
 msgid "If your editor or some other system is running `git fetch` in the background for you a way to mitigate this is to simply set up another remote:"
-msgstr ""
-"Caso o seu editor ou um outro sistema esteja executando o comando `git fetch`"
-" no segundo plano para você, uma maneira de atenuar isso é simplesmente "
-"configurar um outro ramo remoto:"
+msgstr "Caso o seu editor ou um outro sistema esteja executando o comando `git fetch` no segundo plano para você, uma maneira de atenuar isso é simplesmente configurar um outro ramo remoto:"
 
 #. type: Plain text
 #: en/git-push.txt:302
@@ -43748,10 +38786,7 @@ msgstr ""
 #: en/git-push.txt:305
 #, priority:220
 msgid "Now when the background process runs `git fetch origin` the references on `origin-push` won't be updated, and thus commands like:"
-msgstr ""
-"Agora, quando o processo em segundo plano executar o comando `git fetch "
-"origin`, as referências no `origin-push` não serão atualizadas e portanto, "
-"comandos como:"
+msgstr "Agora, quando o processo em segundo plano executar o comando `git fetch origin`, as referências no `origin-push` não serão atualizadas e portanto, comandos como:"
 
 #. type: Plain text
 #: en/git-push.txt:307
@@ -43763,11 +38798,7 @@ msgstr "\tgit push --force-with-lease origin-push\n"
 #: en/git-push.txt:312
 #, priority:220
 msgid "Will fail unless you manually run `git fetch origin-push`. This method is of course entirely defeated by something that runs `git fetch --all`, in that case you'd need to either disable it or do something more tedious like:"
-msgstr ""
-"Irá falhar a menos que você execute manualmente o comando `git fetch origin-"
-"push`. É claro que esse método será totalmente derrotado por algo que "
-"execute o comando `git fetch --all`, neste caso, você precisa desativá-lo ou "
-"fazer algo mais tedioso como:"
+msgstr "Irá falhar a menos que você execute manualmente o comando `git fetch origin-push`. É claro que esse método será totalmente derrotado por algo que execute o comando `git fetch --all`, neste caso, você precisa desativá-lo ou fazer algo mais tedioso como:"
 
 #. type: Plain text
 #: en/git-push.txt:317
@@ -43787,46 +38818,25 @@ msgstr ""
 #: en/git-push.txt:323
 #, priority:220
 msgid "I.e. create a `base` tag for versions of the upstream code that you've seen and are willing to overwrite, then rewrite history, and finally force push changes to `master` if the remote version is still at `base`, regardless of what your local `remotes/origin/master` has been updated to in the background."
-msgstr ""
-"Crie uma tag `base` para as versões do código upstream que você viu e está "
-"disposto a sobrescrever por exemplo, depois reescreva o histórico e "
-"finalmente, imponha um impulsionamento \"push\" com as alterações para "
-"`master` caso a versão remota ainda esteja na `base`, independentemente se "
-"os seus ramos `remotes/origin/master` locais foram atualizados em segundo "
-"plano ou não."
+msgstr "Crie uma tag `base` para as versões do código upstream que você viu e está disposto a sobrescrever por exemplo, depois reescreva o histórico e finalmente, imponha um impulsionamento \"push\" com as alterações para `master` caso a versão remota ainda esteja na `base`, independentemente se os seus ramos `remotes/origin/master` locais foram atualizados em segundo plano ou não."
 
 #. type: Plain text
 #: en/git-push.txt:331
 #, priority:220
 msgid "Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it.  Also, when `--force-with-lease` option is used, the command refuses to update a remote ref whose current value does not match what is expected."
-msgstr ""
-"Normalmente, o comando se recusa a atualizar uma \"ref\" remota que não seja "
-"um ancestral da \"ref\" local utilizada para substituí-la.  Além disso, "
-"quando a opção `--force-with-lease` é utilizada, o comando se recusa a "
-"atualizar uma \"ref\" remota cujo valor atual não corresponda ao esperado."
+msgstr "Normalmente, o comando se recusa a atualizar uma \"ref\" remota que não seja um ancestral da \"ref\" local utilizada para substituí-la.  Além disso, quando a opção `--force-with-lease` é utilizada, o comando se recusa a atualizar uma \"ref\" remota cujo valor atual não corresponda ao esperado."
 
 #. type: Plain text
 #: en/git-push.txt:334
 #, priority:220
 msgid "This flag disables these checks, and can cause the remote repository to lose commits; use it with care."
-msgstr ""
-"Esta opção desativa estas verificações e pode causar a perda do commit no "
-"repositório remoto; utilize com cuidado."
+msgstr "Esta opção desativa estas verificações e pode causar a perda do commit no repositório remoto; utilize com cuidado."
 
 #. type: Plain text
 #: en/git-push.txt:343
 #, ignore-ellipsis, priority:220
 msgid "Note that `--force` applies to all the refs that are pushed, hence using it with `push.default` set to `matching` or with multiple push destinations configured with `remote.*.push` may overwrite refs other than the current branch (including local refs that are strictly behind their remote counterpart).  To force a push to only one branch, use a `+` in front of the refspec to push (e.g `git push origin +master` to force a push to the `master` branch). See the `<refspec>...` section above for details."
-msgstr ""
-"Observe que a opção `--force` se aplica a todos os refs que são "
-"impulsionados, portanto, utilizá-lo com `push.default` definido como "
-"`matching` ou com os vários impulsionamentos nos destinos configurados com "
-"`remote.*.push`,  pode substituir as outras refs que não sejam o ramo atual ("
-"incluindo as refs locais que estão estritamente por trás de sua contraparte "
-"remota).  Para impor um impulsionamento \"push\" em apenas um ramo, utilize "
-"um `+` na frente do \"refspec\" que será impulsionado (como `git push origin "
-"+master` para impor um impulsionamento \"push\" no ramo `master` por exemplo)"
-". Consulte a seção `<refspec>...` acima para obter mais detalhes."
+msgstr "Observe que a opção `--force` se aplica a todos os refs que são impulsionados, portanto, utilizá-lo com `push.default` definido como `matching` ou com os vários impulsionamentos nos destinos configurados com `remote.*.push`,  pode substituir as outras refs que não sejam o ramo atual (incluindo as refs locais que estão estritamente por trás de sua contraparte remota).  Para impor um impulsionamento \"push\" em apenas um ramo, utilize um `+` na frente do \"refspec\" que será impulsionado (como `git push origin +master` para impor um impulsionamento \"push\" no ramo `master` por exemplo). Consulte a seção `<refspec>...` acima para obter mais detalhes."
 
 #. type: Labeled list
 #: en/git-push.txt:344
@@ -43838,19 +38848,13 @@ msgstr "--repo=<repositório>"
 #: en/git-push.txt:347
 #, priority:220
 msgid "This option is equivalent to the <repository> argument. If both are specified, the command-line argument takes precedence."
-msgstr ""
-"Esta opção é equivalente ao argumento <repositório>. Caso ambos sejam "
-"utilizados, o argumento da linha de comandos terá a prioridade."
+msgstr "Esta opção é equivalente ao argumento <repositório>. Caso ambos sejam utilizados, o argumento da linha de comandos terá a prioridade."
 
 #. type: Plain text
 #: en/git-push.txt:354
 #, priority:220
 msgid "For every branch that is up to date or successfully pushed, add upstream (tracking) reference, used by argument-less linkgit:git-pull[1] and other commands. For more information, see `branch.<name>.merge` in linkgit:git-config[1]."
-msgstr ""
-"Para cada ramo atualizado ou impulsionada com êxito, adicione uma referência "
-"\"upstream\" (monitorado), utilizada sem argumento pelo linkgit:git-pull[1] "
-"e os outros comandos. Para mais informações, consulte `branch.<nome>.merge` "
-"no linkgit:git-config[1]."
+msgstr "Para cada ramo atualizado ou impulsionada com êxito, adicione uma referência \"upstream\" (monitorado), utilizada sem argumento pelo linkgit:git-pull[1] e os outros comandos. Para mais informações, consulte `branch.<nome>.merge` no linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-push.txt:355
@@ -43862,20 +38866,13 @@ msgstr "--[no-]thin"
 #: en/git-push.txt:360
 #, priority:220
 msgid "These options are passed to linkgit:git-send-pack[1]. A thin transfer significantly reduces the amount of sent data when the sender and receiver share many of the same objects in common. The default is `--thin`."
-msgstr ""
-"Estas opções são passadas para o linkgit:git-send-pack[1]. Uma pequena "
-"transferência \"thin\" reduz significativamente a quantidade dos dados "
-"enviados quando o remetente e o destinatário compartilham muito dos mesmos "
-"objetos em comum. A predefinição é `--thin`."
+msgstr "Estas opções são passadas para o linkgit:git-send-pack[1]. Uma pequena transferência \"thin\" reduz significativamente a quantidade dos dados enviados quando o remetente e o destinatário compartilham muito dos mesmos objetos em comum. A predefinição é `--thin`."
 
 #. type: Plain text
 #: en/git-push.txt:366
 #, priority:220
 msgid "Suppress all output, including the listing of updated refs, unless an error occurs. Progress is not reported to the standard error stream."
-msgstr ""
-"Suprima tudo o que for gerado, incluindo a listagem das atualizações das "
-"refs, a menos que um erro aconteça. O progresso não é relatado para o fluxo "
-"de erro predefinido."
+msgstr "Suprima tudo o que for gerado, incluindo a listagem das atualizações das refs, a menos que um erro aconteça. O progresso não é relatado para o fluxo de erro predefinido."
 
 #. type: Labeled list
 #: en/git-push.txt:378
@@ -43887,23 +38884,7 @@ msgstr "--recurse-submodules=check|on-demand|only|no"
 #: en/git-push.txt:392
 #, priority:220
 msgid "May be used to make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch.  If 'check' is used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used all submodules that changed in the revisions to be pushed will be pushed. If on-demand was not able to push all necessary revisions it will also be aborted and exit with non-zero status. If 'only' is used all submodules will be recursively pushed while the superproject is left unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to override the push.recurseSubmodules configuration variable when no submodule recursion is required."
-msgstr ""
-"Pode ser utilizado para garantir que todos os submódulo dos commits "
-"utilizadas pelas revisões que serão enviadas estejam disponíveis em uma "
-"ramificação monitorada remotamente.  Caso 'check' seja utilizado, o Git "
-"verificará se todos os commit do submódulo que foram alterados nas revisões "
-"que serão enviadas estão disponíveis em pelo menos um ramo remoto do "
-"submódulo. Caso algum commit esteja ausente, o push será abortado e "
-"encerrará com uma condição diferente de zero. Caso 'on demand' seja "
-"utilizado, todos os submódulos que foram alterados nas revisões que serão "
-"impulsionadas, serão impulsionadas. Caso 'on demand' não puder enviar todas "
-"as revisões necessárias, ela também será abortada e sairá com uma condição "
-"diferente de zero. Caso 'only' seja utilizado, todos os submódulos serão "
-"impulsionados de forma recursiva enquanto o superprojeto não seja deixado "
-"sem impulsionamento. Um valor de 'no' ou utilizando a opção `--no-recurse-"
-"submodules` pode ser utilizado para substituir a variável de configuração "
-"`push.recurseSubmodules` quando nenhuma recursão do sub-módulo for "
-"necessária."
+msgstr "Pode ser utilizado para garantir que todos os submódulo dos commits utilizadas pelas revisões que serão enviadas estejam disponíveis em uma ramificação monitorada remotamente.  Caso 'check' seja utilizado, o Git verificará se todos os commit do submódulo que foram alterados nas revisões que serão enviadas estão disponíveis em pelo menos um ramo remoto do submódulo. Caso algum commit esteja ausente, o push será abortado e encerrará com uma condição diferente de zero. Caso 'on demand' seja utilizado, todos os submódulos que foram alterados nas revisões que serão impulsionadas, serão impulsionadas. Caso 'on demand' não puder enviar todas as revisões necessárias, ela também será abortada e sairá com uma condição diferente de zero. Caso 'only' seja utilizado, todos os submódulos serão impulsionados de forma recursiva enquanto o superprojeto não seja deixado sem impulsionamento. Um valor de 'no' ou utilizando a opção `--no-recurse-submodules` pode ser utilizado para substituir a variável de configuração `push.recurseSubmodules` quando nenhuma recursão do sub-módulo for necessária."
 
 #. type: Labeled list
 #: en/git-push.txt:393
@@ -43915,19 +38896,13 @@ msgstr "--[no-]verify"
 #: en/git-push.txt:397
 #, priority:220
 msgid "Toggle the pre-push hook (see linkgit:githooks[5]).  The default is --verify, giving the hook a chance to prevent the push.  With --no-verify, the hook is bypassed completely."
-msgstr ""
-"Alterna o gancho \"pre-push\" (consulte linkgit:githooks[5]).  A opção "
-"`--verify` é a predefinição, dando ao gancho a chance de impedir o "
-"impulsionamento.  Com a opção --no-verify, o gancho é completamente ignorado."
+msgstr "Alterna o gancho \"pre-push\" (consulte linkgit:githooks[5]).  A opção `--verify` é a predefinição, dando ao gancho a chance de impedir o impulsionamento.  Com a opção --no-verify, o gancho é completamente ignorado."
 
 #. type: Plain text
 #: en/git-push.txt:414
 #, priority:220
 msgid "The output of \"git push\" depends on the transport method used; this section describes the output when pushing over the Git protocol (either locally or via ssh)."
-msgstr ""
-"O que é gerado através do \"git push\" depende do método de transporte "
-"utilizado; Esta seção descreve a saída gerada durante o impulsionamento "
-"através do protocolo Git (localmente ou através do ssh)."
+msgstr "O que é gerado através do \"git push\" depende do método de transporte utilizado; Esta seção descreve a saída gerada durante o impulsionamento através do protocolo Git (localmente ou através do ssh)."
 
 #. type: Plain text
 #: en/git-push.txt:417
@@ -43945,9 +38920,7 @@ msgstr " <flag> <resumo> <from> -> <to> (<reason>)\n"
 #: en/git-push.txt:423
 #, priority:220
 msgid "If --porcelain is used, then each line of the output is of the form:"
-msgstr ""
-"Caso a opção `--porcelain` seja utilizado, cada linha da saída terá o "
-"formato:"
+msgstr "Caso a opção `--porcelain` seja utilizado, cada linha da saída terá o formato:"
 
 #. type: delimited block -
 #: en/git-push.txt:426
@@ -43959,9 +38932,7 @@ msgstr " <flag> \\t <from>:<to> \\t <summary> (<reason>)\n"
 #: en/git-push.txt:430
 #, priority:220
 msgid "The status of up-to-date refs is shown only if --porcelain or --verbose option is used."
-msgstr ""
-"A condição das referências atualizadas é exibido apenas caso a opção "
-"`--porcelain` ou `--verbose` seja utilizada."
+msgstr "A condição das referências atualizadas é exibido apenas caso a opção `--porcelain` ou `--verbose` seja utilizada."
 
 #. type: Plain text
 #: en/git-push.txt:434
@@ -43985,28 +38956,19 @@ msgstr "para uma nova \"ref\" enviada com sucesso;"
 #: en/git-push.txt:438
 #, priority:220
 msgid "for a ref that was rejected or failed to push; and"
-msgstr ""
-"para uma \"ref\"que foi rejeitado ou não conseguiu realizar o "
-"impulsionamento \"push\"; e"
+msgstr "para uma \"ref\"que foi rejeitado ou não conseguiu realizar o impulsionamento \"push\"; e"
 
 #. type: Plain text
 #: en/git-push.txt:439
 #, priority:220
 msgid "for a ref that was up to date and did not need pushing."
-msgstr ""
-"para uma \"ref\" que estava atualizada e não precisava do impulsionamento "
-"\"push\"."
+msgstr "para uma \"ref\" que estava atualizada e não precisava do impulsionamento \"push\"."
 
 #. type: Plain text
 #: en/git-push.txt:445
 #, ignore-ellipsis, priority:220
 msgid "For a successfully pushed ref, the summary shows the old and new values of the ref in a form suitable for using as an argument to `git log` (this is `<old>..<new>` in most cases, and `<old>...<new>` for forced non-fast-forward updates)."
-msgstr ""
-"Para uma \"ref\" impulsionada com sucesso, o resumo mostra os valores "
-"antigos e os novos da \"ref\" em um formato adequado para a utilização como "
-"argumento para o comando `git log` (isso é `<antigo>..<novo>` na maioria dos "
-"casos, e `<antigo>...<novo>` para as atualizações impostas pelo avanço "
-"rápido)."
+msgstr "Para uma \"ref\" impulsionada com sucesso, o resumo mostra os valores antigos e os novos da \"ref\" em um formato adequado para a utilização como argumento para o comando `git log` (isso é `<antigo>..<novo>` na maioria dos casos, e `<antigo>...<novo>` para as atualizações impostas pelo avanço rápido)."
 
 #. type: Plain text
 #: en/git-push.txt:447
@@ -44024,9 +38986,7 @@ msgstr "rejeitado"
 #: en/git-push.txt:452
 #, priority:220
 msgid "Git did not try to send the ref at all, typically because it is not a fast-forward and you did not force the update."
-msgstr ""
-"O Git não tenta encaminhar a \"ref\" de forma alguma, geralmente porque não "
-"é um avanço rápido e você não impôs a atualização."
+msgstr "O Git não tenta encaminhar a \"ref\" de forma alguma, geralmente porque não é um avanço rápido e você não impôs a atualização."
 
 #. type: Labeled list
 #: en/git-push.txt:453
@@ -44050,10 +39010,7 @@ msgstr "falha remota"
 #: en/git-push.txt:466
 #, priority:220
 msgid "The remote end did not report the successful update of the ref, perhaps because of a temporary error on the remote side, a break in the network connection, or other transient error."
-msgstr ""
-"O lado remoto não relatou a atualização bem-sucedida da \"ref\", talvez por "
-"causa de um erro temporário, uma interrupção na conexão da rede ou um outro "
-"erro transitório."
+msgstr "O lado remoto não relatou a atualização bem-sucedida da \"ref\", talvez por causa de um erro temporário, uma interrupção na conexão da rede ou um outro erro transitório."
 
 #. type: Plain text
 #: en/git-push.txt:472
@@ -44071,10 +39028,7 @@ msgstr "O nome ref remoto sendo atualizado, menos o seu prefixo `refs/<tipo>/`."
 #: en/git-push.txt:481
 #, priority:220
 msgid "A human-readable explanation. In the case of successfully pushed refs, no explanation is needed. For a failed ref, the reason for failure is described."
-msgstr ""
-"Uma explicação legível para pessoas. No caso dos refs que forem enviados com "
-"sucesso, nenhuma explicação é necessária. Para um \"ref\" que falhou, o "
-"motivo do fracasso então é descrito."
+msgstr "Uma explicação legível para pessoas. No caso dos refs que forem enviados com sucesso, nenhuma explicação é necessária. Para um \"ref\" que falhou, o motivo do fracasso então é descrito."
 
 #. type: Title -
 #: en/git-push.txt:483
@@ -44086,31 +39040,19 @@ msgstr "NOTA SOBRE AVANÇOS RÁPIDOS"
 #: en/git-push.txt:488
 #, priority:220
 msgid "When an update changes a branch (or more in general, a ref) that used to point at commit A to point at another commit B, it is called a fast-forward update if and only if B is a descendant of A."
-msgstr ""
-"Quando uma atualização altera um ramo (ou geralmente uma \"ref\") que "
-"costumava apontar para o commit 'A' que aponta para outro commit 'B', é "
-"chamado de atualização de avanço rápido apenas e somente se 'B' for "
-"descendente de 'A'."
+msgstr "Quando uma atualização altera um ramo (ou geralmente uma \"ref\") que costumava apontar para o commit 'A' que aponta para outro commit 'B', é chamado de atualização de avanço rápido apenas e somente se 'B' for descendente de 'A'."
 
 #. type: Plain text
 #: en/git-push.txt:492
 #, priority:220
 msgid "In a fast-forward update from A to B, the set of commits that the original commit A built on top of is a subset of the commits the new commit B builds on top of.  Hence, it does not lose any history."
-msgstr ""
-"Em uma atualização de avanço rápido de A para B, o conjunto dos commits que "
-"o commit original A que construiu sobre ela é um subconjunto dos commits que "
-"o novo commit B constrói sobre ela.  Portanto, não perde nenhum histórico."
+msgstr "Em uma atualização de avanço rápido de A para B, o conjunto dos commits que o commit original A que construiu sobre ela é um subconjunto dos commits que o novo commit B constrói sobre ela.  Portanto, não perde nenhum histórico."
 
 #. type: Plain text
 #: en/git-push.txt:497
 #, priority:220
 msgid "In contrast, a non-fast-forward update will lose history.  For example, suppose you and somebody else started at the same commit X, and you built a history leading to commit B while the other person built a history leading to commit A.  The history looks like this:"
-msgstr ""
-"Por outro lado, uma atualização sem avanço rápido perderá o histórico.  Por "
-"exemplo, suponha que você e uma outra pessoa tenham iniciado o mesmo commit "
-"'X' e você construiu um histórico que leva ao commit 'B', enquanto a outra "
-"pessoa construiu um histórico que leva ao commit 'A'.  O histórico ficaria "
-"assim:"
+msgstr "Por outro lado, uma atualização sem avanço rápido perderá o histórico.  Por exemplo, suponha que você e uma outra pessoa tenham iniciado o mesmo commit 'X' e você construiu um histórico que leva ao commit 'B', enquanto a outra pessoa construiu um histórico que leva ao commit 'A'.  O histórico ficaria assim:"
 
 #. type: delimited block -
 #: en/git-push.txt:503
@@ -44128,55 +39070,37 @@ msgstr ""
 #: en/git-push.txt:509
 #, priority:220
 msgid "Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X."
-msgstr ""
-"Além disso, suponha que a outra pessoa já tenha enviado as alterações que "
-"levam \"A\" de volta ao repositório original, a partir do qual vocês dois "
-"obtiveram o commit \"X\" original."
+msgstr "Além disso, suponha que a outra pessoa já tenha enviado as alterações que levam \"A\" de volta ao repositório original, a partir do qual vocês dois obtiveram o commit \"X\" original."
 
 #. type: Plain text
 #: en/git-push.txt:512
 #, priority:220
 msgid "The push done by the other person updated the branch that used to point at commit X to point at commit A.  It is a fast-forward."
-msgstr ""
-"O impulsionamento feito pela outra pessoa atualizou o ramo que costumava "
-"apontar no commit 'X' para apontar no commit 'A'. É um avanço rápido."
+msgstr "O impulsionamento feito pela outra pessoa atualizou o ramo que costumava apontar no commit 'X' para apontar no commit 'A'. É um avanço rápido."
 
 #. type: Plain text
 #: en/git-push.txt:517
 #, priority:220
 msgid "But if you try to push, you will attempt to update the branch (that now points at A) with commit B.  This does _not_ fast-forward.  If you did so, the changes introduced by commit A will be lost, because everybody will now start building on top of B."
-msgstr ""
-"Porém caso você tente impulsionar, você tentará atualizar o ramo (que agora "
-"aponta para 'A') com o commit 'B'. Isso _não_ fa o avanço rapido.  Se você "
-"fez isso, as alterações introduzidas pelo commit 'A' serão perdidas, porque "
-"todo mundo começará a construir em cima do 'B'."
+msgstr "Porém caso você tente impulsionar, você tentará atualizar o ramo (que agora aponta para 'A') com o commit 'B'. Isso _não_ fa o avanço rapido.  Se você fez isso, as alterações introduzidas pelo commit 'A' serão perdidas, porque todo mundo começará a construir em cima do 'B'."
 
 #. type: Plain text
 #: en/git-push.txt:520
 #, priority:220
 msgid "The command by default does not allow an update that is not a fast-forward to prevent such loss of history."
-msgstr ""
-"É predefinido que o comando não permita uma atualização que não seja um "
-"avanço rápido para impedir esta perda do histórico."
+msgstr "É predefinido que o comando não permita uma atualização que não seja um avanço rápido para impedir esta perda do histórico."
 
 #. type: Plain text
 #: en/git-push.txt:525
 #, priority:220
 msgid "If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back."
-msgstr ""
-"Caso não queira perder o seu trabalho (histórico 'X' para 'B') ou o trabalho "
-"da outra pessoa (histórico de 'X' para 'A'), é necessário primeiro buscar o "
-"histórico no repositório, criar um histórico que contenha as alterações "
-"feitas por ambas as partes e que impulsione o resultado de volta."
+msgstr "Caso não queira perder o seu trabalho (histórico 'X' para 'B') ou o trabalho da outra pessoa (histórico de 'X' para 'A'), é necessário primeiro buscar o histórico no repositório, criar um histórico que contenha as alterações feitas por ambas as partes e que impulsione o resultado de volta."
 
 #. type: Plain text
 #: en/git-push.txt:529
 #, priority:220
 msgid "You can perform \"git pull\", resolve potential conflicts, and \"git push\" the result.  A \"git pull\" will create a merge commit C between commits A and B."
-msgstr ""
-"É possível executar o comando \"git pull\", para resolver os possíveis "
-"conflitos e comando \"git push\" o resultado.  Um comando \"git pull\" "
-"criará um commit da mesclagem 'C' entre os commits 'A' e 'B'."
+msgstr "É possível executar o comando \"git pull\", para resolver os possíveis conflitos e comando \"git push\" o resultado.  Um comando \"git pull\" criará um commit da mesclagem 'C' entre os commits 'A' e 'B'."
 
 #. type: delimited block -
 #: en/git-push.txt:535
@@ -44194,19 +39118,13 @@ msgstr ""
 #: en/git-push.txt:540
 #, priority:220
 msgid "Updating A with the resulting merge commit will fast-forward and your push will be accepted."
-msgstr ""
-"A atualização de \"A\" com a consolidação resultante da mesclagem, avançará "
-"rapidamente e o seu envio será aceito."
+msgstr "A atualização de \"A\" com a consolidação resultante da mesclagem, avançará rapidamente e o seu envio será aceito."
 
 #. type: Plain text
 #: en/git-push.txt:545
 #, priority:220
 msgid "Alternatively, you can rebase your change between X and B on top of A, with \"git pull --rebase\", and push the result back.  The rebase will create a new commit D that builds the change between X and B on top of A."
-msgstr ""
-"Como alternativa, você pode reconstruir a sua alteração entre 'X' e o 'B' no "
-"topo de 'A', com o comando \"git pull --rebase\", e fazer o impulsionamento "
-"do resultado de volta.  Uma reconstrução da fundação \"rebase\" criará um "
-"novo commit 'D' que gera a alteração entre 'X' e 'B' em cima de 'A'."
+msgstr "Como alternativa, você pode reconstruir a sua alteração entre 'X' e o 'B' no topo de 'A', com o comando \"git pull --rebase\", e fazer o impulsionamento do resultado de volta.  Uma reconstrução da fundação \"rebase\" criará um novo commit 'D' que gera a alteração entre 'X' e 'B' em cima de 'A'."
 
 #. type: delimited block -
 #: en/git-push.txt:551
@@ -44224,26 +39142,13 @@ msgstr ""
 #: en/git-push.txt:556
 #, priority:220
 msgid "Again, updating A with this commit will fast-forward and your push will be accepted."
-msgstr ""
-"Novamente, a atualização de 'A' com este commit avançará rapidamente e o seu "
-"envio será aceito."
+msgstr "Novamente, a atualização de 'A' com este commit avançará rapidamente e o seu envio será aceito."
 
 #. type: Plain text
 #: en/git-push.txt:567
 #, priority:220
 msgid "There is another common situation where you may encounter non-fast-forward rejection when you try to push, and it is possible even when you are pushing into a repository nobody else pushes into. After you push commit A yourself (in the first picture in this section), replace it with \"git commit --amend\" to produce commit B, and you try to push it out, because forgot that you have pushed A out already. In such a case, and only if you are certain that nobody in the meantime fetched your earlier commit A (and started building on top of it), you can run \"git push --force\" to overwrite it. In other words, \"git push --force\" is a method reserved for a case where you do mean to lose history."
-msgstr ""
-"Há uma outra situação comum onde é possível encontrar uma rejeição sem "
-"avanço rápido ao tentar enviar através do \"push\", e é possível mesmo "
-"quando você está impulsionando para um repositório que ninguém mais faz "
-"impulsionamentos. Depois de enviar o commit 'A' (na primeira foto desta "
-"seção), substitua-o pelo comando \"git commit --amend\" para produzir o "
-"commit 'B' e tente realizar o \"push\", porque foi esquecido que já foi "
-"feito um push para 'A'. Neste caso e somente caso tenha certeza que ninguém "
-"fez a busca pelo seu commit 'A' anterior (e começou a construir em cima ele)"
-", execute o comando \"git push --force\" para substituí-lo. Em outras "
-"palavras, o comando \"git push --force\" é um método reservado para o caso "
-"onde você queira perder o histórico."
+msgstr "Há uma outra situação comum onde é possível encontrar uma rejeição sem avanço rápido ao tentar enviar através do \"push\", e é possível mesmo quando você está impulsionando para um repositório que ninguém mais faz impulsionamentos. Depois de enviar o commit 'A' (na primeira foto desta seção), substitua-o pelo comando \"git commit --amend\" para produzir o commit 'B' e tente realizar o \"push\", porque foi esquecido que já foi feito um push para 'A'. Neste caso e somente caso tenha certeza que ninguém fez a busca pelo seu commit 'A' anterior (e começou a construir em cima ele), execute o comando \"git push --force\" para substituí-lo. Em outras palavras, o comando \"git push --force\" é um método reservado para o caso onde você queira perder o histórico."
 
 #. type: Labeled list
 #: en/git-push.txt:572
@@ -44255,10 +39160,7 @@ msgstr "`git push`"
 #: en/git-push.txt:576
 #, priority:220
 msgid "Works like `git push <remote>`, where <remote> is the current branch's remote (or `origin`, if no remote is configured for the current branch)."
-msgstr ""
-"Funciona como `git push <remoto>`, onde <remoto> é o ramo remoto da "
-"ramificação atual (ou `origin` (origem), caso nenhum ramo remoto estiver "
-"configurado para a ramificação atual)."
+msgstr "Funciona como `git push <remoto>`, onde <remoto> é o ramo remoto da ramificação atual (ou `origin` (origem), caso nenhum ramo remoto estiver configurado para a ramificação atual)."
 
 #. type: Labeled list
 #: en/git-push.txt:577
@@ -44270,30 +39172,19 @@ msgstr "`git push origin`"
 #: en/git-push.txt:582
 #, priority:220
 msgid "Without additional configuration, pushes the current branch to the configured upstream (`remote.origin.merge` configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise."
-msgstr ""
-"Sem uma configuração adicional, envia a ramificação atual para a upstream "
-"configurada (a variável de configuração `remote.origin.merge`) caso ela "
-"tenha o mesmo nome que o ramo atual e os erros ocorrerem sem qualquer outro "
-"impulsionamento."
+msgstr "Sem uma configuração adicional, envia a ramificação atual para a upstream configurada (a variável de configuração `remote.origin.merge`) caso ela tenha o mesmo nome que o ramo atual e os erros ocorrerem sem qualquer outro impulsionamento."
 
 #. type: Plain text
 #: en/git-push.txt:586
 #, priority:220
 msgid "The default behavior of this command when no <refspec> is given can be configured by setting the `push` option of the remote, or the `push.default` configuration variable."
-msgstr ""
-"O comportamento predefinido deste comando quando nenhum <refspec> for "
-"informado, pode ser configurado definindo a opção `push` do ramo remoto ou a "
-"variável de configuração `push.default`."
+msgstr "O comportamento predefinido deste comando quando nenhum <refspec> for informado, pode ser configurado definindo a opção `push` do ramo remoto ou a variável de configuração `push.default`."
 
 #. type: Plain text
 #: en/git-push.txt:591
 #, priority:220
 msgid "For example, to default to pushing only the current branch to `origin` use `git config remote.origin.push HEAD`.  Any valid <refspec> (like the ones in the examples below) can be configured as the default for `git push origin`."
-msgstr ""
-"Por exemplo, para utilizar como predefinido apenas no ramo atual para "
-"`origin`, utilize `git config remote.origin.push HEAD`.  Qualquer <refspec> "
-"válido (como os exemplos abaixo) pode ser configurado como a predefinição "
-"para `git push origin`."
+msgstr "Por exemplo, para utilizar como predefinido apenas no ramo atual para `origin`, utilize `git config remote.origin.push HEAD`.  Qualquer <refspec> válido (como os exemplos abaixo) pode ser configurado como a predefinição para `git push origin`."
 
 #. type: Labeled list
 #: en/git-push.txt:592
@@ -44305,10 +39196,7 @@ msgstr "`git push origin :`"
 #: en/git-push.txt:596
 #, priority:220
 msgid "Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,OPTIONS>> section above for a description of \"matching\" branches."
-msgstr ""
-"Impulsiona (push) as ramificações \"que coincidam\" para `origin`. Consulte "
-"o <refspec> na seção <<OPTIONS,OPTIONS>> acima para obter uma descrição dos "
-"ramos \"coincidentes\"."
+msgstr "Impulsiona (push) as ramificações \"que coincidam\" para `origin`. Consulte o <refspec> na seção <<OPTIONS,OPTIONS>> acima para obter uma descrição dos ramos \"coincidentes\"."
 
 #. type: Labeled list
 #: en/git-push.txt:597
@@ -44320,11 +39208,7 @@ msgstr "`git push origin master`"
 #: en/git-push.txt:603
 #, priority:220
 msgid "Find a ref that matches `master` in the source repository (most likely, it would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/master`) in `origin` repository with it.  If `master` did not exist remotely, it would be created."
-msgstr ""
-"Encontre uma \"ref\" que coincida com o `master` no repositório da origem ("
-"provavelmente encontrará `refs/heads/master`) e atualize a mesma \"ref\" (`"
-"refs/heads/master` por exemplo) no repositório `origin` com ela .  Caso o "
-"`master` não existisse remotamente, ele seria criado."
+msgstr "Encontre uma \"ref\" que coincida com o `master` no repositório da origem (provavelmente encontrará `refs/heads/master`) e atualize a mesma \"ref\" (`refs/heads/master` por exemplo) no repositório `origin` com ela .  Caso o `master` não existisse remotamente, ele seria criado."
 
 #. type: Labeled list
 #: en/git-push.txt:604
@@ -44336,9 +39220,7 @@ msgstr "`git push origin HEAD`"
 #: en/git-push.txt:607
 #, priority:220
 msgid "A handy way to push the current branch to the same name on the remote."
-msgstr ""
-"Uma maneira prática de enviar a ramificação atual com o mesmo nome no ramo "
-"remoto."
+msgstr "Uma maneira prática de enviar a ramificação atual com o mesmo nome no ramo remoto."
 
 #. type: Labeled list
 #: en/git-push.txt:608
@@ -44350,42 +39232,25 @@ msgstr "`git push mothership master:satellite/master dev:satellite/dev`"
 #: en/git-push.txt:613
 #, priority:220
 msgid "Use the source ref that matches `master` (e.g. `refs/heads/master`)  to update the ref that matches `satellite/master` (most probably `refs/remotes/satellite/master`) in the `mothership` repository; do the same for `dev` and `satellite/dev`."
-msgstr ""
-"Utilize a fonte \"ref\" que coincida com `master` (`refs/heads/ master` por "
-"exemplo) para atualizar a \"ref\" que coincida com `satellite/master` ("
-"provavelmente `refs/remotes/satellite/master`) no repositório `mothership`; "
-"faça o mesmo para `dev` e `satellite/dev`."
+msgstr "Utilize a fonte \"ref\" que coincida com `master` (`refs/heads/ master` por exemplo) para atualizar a \"ref\" que coincida com `satellite/master` (provavelmente `refs/remotes/satellite/master`) no repositório `mothership`; faça o mesmo para `dev` e `satellite/dev`."
 
 #. type: Plain text
 #: en/git-push.txt:616
 #, ignore-ellipsis, priority:220
 msgid "See the section describing `<refspec>...` above for a discussion of the matching semantics."
-msgstr ""
-"Consulte a seção que descreve `<refspec> ...` acima para uma discussão sobre "
-"a combinação semântica."
+msgstr "Consulte a seção que descreve `<refspec> ...` acima para uma discussão sobre a combinação semântica."
 
 #. type: Plain text
 #: en/git-push.txt:623
 #, priority:220
 msgid "This is to emulate `git fetch` run on the `mothership` using `git push` that is run in the opposite direction in order to integrate the work done on `satellite`, and is often necessary when you can only make connection in one way (i.e. satellite can ssh into mothership but mothership cannot initiate connection to satellite because the latter is behind a firewall or does not run sshd)."
-msgstr ""
-"Isto serve para emular o comando `git fetch` executado na `mothership` "
-"utilizando o `git push` que é executado na direção oposta para integrar o "
-"trabalho realizado no `satellite` e geralmente é necessário quando só é "
-"possível fazer a conexão em um sentido (ou seja, o satélite pode fazer uma "
-"conexão ssh com a nave mãe \"mothership\" mas a nave mãe não pode iniciar a "
-"conexão com o satélite porque este está atrás de um firewall ou não está "
-"executando o sshd (servidor ssh))."
+msgstr "Isto serve para emular o comando `git fetch` executado na `mothership` utilizando o `git push` que é executado na direção oposta para integrar o trabalho realizado no `satellite` e geralmente é necessário quando só é possível fazer a conexão em um sentido (ou seja, o satélite pode fazer uma conexão ssh com a nave mãe \"mothership\" mas a nave mãe não pode iniciar a conexão com o satélite porque este está atrás de um firewall ou não está executando o sshd (servidor ssh))."
 
 #. type: Plain text
 #: en/git-push.txt:628
 #, priority:220
 msgid "After running this `git push` on the `satellite` machine, you would ssh into the `mothership` and run `git merge` there to complete the emulation of `git pull` that were run on `mothership` to pull changes made on `satellite`."
-msgstr ""
-"Depois de executar o comando `git push` na máquina do `satellite`, você "
-"entraria na `mothership` e executaria o comando `git merge` lá para concluir "
-"a emulação do comando `git pull` executada na `mothership` para obter as "
-"alterações feitas no \"satellite\"."
+msgstr "Depois de executar o comando `git push` na máquina do `satellite`, você entraria na `mothership` e executaria o comando `git merge` lá para concluir a emulação do comando `git pull` executada na `mothership` para obter as alterações feitas no \"satellite\"."
 
 #. type: Labeled list
 #: en/git-push.txt:629
@@ -44397,10 +39262,7 @@ msgstr "`git push origin HEAD: master`"
 #: en/git-push.txt:633
 #, priority:220
 msgid "Push the current branch to the remote ref matching `master` in the `origin` repository. This form is convenient to push the current branch without thinking about its local name."
-msgstr ""
-"Envie o ramo atual para a referência remota que coincida com `master` no "
-"repositório `origin`. Este formulário é conveniente para impulsionar o ramo "
-"atual sem pensar no nome local."
+msgstr "Envie o ramo atual para a referência remota que coincida com `master` no repositório `origin`. Este formulário é conveniente para impulsionar o ramo atual sem pensar no nome local."
 
 #. type: Labeled list
 #: en/git-push.txt:634
@@ -44412,11 +39274,7 @@ msgstr "`git push origin master:refs/heads/experimental`"
 #: en/git-push.txt:640
 #, priority:220
 msgid "Create the branch `experimental` in the `origin` repository by copying the current `master` branch.  This form is only needed to create a new branch or tag in the remote repository when the local name and the remote name are different; otherwise, the ref name on its own will work."
-msgstr ""
-"Crie o ramo `experimental` no repositório `origin` copiando o ramo `master` "
-"atual.  Este formulário é necessário apenas para criar um novo ramo ou a tag "
-"no repositório remoto quando o nome local e o nome remoto forem diferentes; "
-"caso contrário, o nome da \"ref\" por si só funcionará."
+msgstr "Crie o ramo `experimental` no repositório `origin` copiando o ramo `master` atual.  Este formulário é necessário apenas para criar um novo ramo ou a tag no repositório remoto quando o nome local e o nome remoto forem diferentes; caso contrário, o nome da \"ref\" por si só funcionará."
 
 #. type: Labeled list
 #: en/git-push.txt:641
@@ -44428,9 +39286,7 @@ msgstr "`git push origin :experimental`"
 #: en/git-push.txt:644
 #, priority:220
 msgid "Find a ref that matches `experimental` in the `origin` repository (e.g. `refs/heads/experimental`), and delete it."
-msgstr ""
-"Encontre uma \"ref\" que coincida com `experimental` no repositório `origin` "
-"(`refs/heads/experimental` por exemplo) e exclua-a."
+msgstr "Encontre uma \"ref\" que coincida com `experimental` no repositório `origin` (`refs/heads/experimental` por exemplo) e exclua-a."
 
 #. type: Labeled list
 #: en/git-push.txt:645
@@ -44442,11 +39298,7 @@ msgstr "`git push origin +dev:master`"
 #: en/git-push.txt:650
 #, priority:220
 msgid "Update the origin repository's master branch with the dev branch, allowing non-fast-forward updates.  *This can leave unreferenced commits dangling in the origin repository.* Consider the following situation, where a fast-forward is not possible:"
-msgstr ""
-"Atualize o ramo principal na origem do repositório com o ramo 'dev', "
-"permitindo atualizações sem o avanço rápido.  *Isso pode deixar os commits "
-"sem referência pendentes no repositório de origem.* Considere a seguinte "
-"situação, onde um avanço rápido não seja possível:"
+msgstr "Atualize o ramo principal na origem do repositório com o ramo 'dev', permitindo atualizações sem o avanço rápido.  *Isso pode deixar os commits sem referência pendentes no repositório de origem.* Considere a seguinte situação, onde um avanço rápido não seja possível:"
 
 #. type: delimited block -
 #: en/git-push.txt:655
@@ -44482,10 +39334,7 @@ msgstr ""
 #: en/git-push.txt:668
 #, priority:220
 msgid "Commits A and B would no longer belong to a branch with a symbolic name, and so would be unreachable.  As such, these commits would be removed by a `git gc` command on the origin repository."
-msgstr ""
-"Os commits 'A' e 'B' não pertenceriam mais a um ramo com um nome simbólico, "
-"portanto, seriam inacessíveis.  Como tal, estes commits seriam removidos por "
-"um comando `git gc` no repositório de origem."
+msgstr "Os commits 'A' e 'B' não pertenceriam mais a um ramo com um nome simbólico, portanto, seriam inacessíveis.  Como tal, estes commits seriam removidos por um comando `git gc` no repositório de origem."
 
 #. type: Title =
 #: en/git-quiltimport.txt:2
@@ -44513,36 +39362,25 @@ msgstr ""
 #: en/git-quiltimport.txt:21
 #, priority:100
 msgid "Applies a quilt patchset onto the current Git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset."
-msgstr ""
-"Aplica um conjunto de patches no ramo Git atual, preservando os limites, a "
-"ordem e as suas descrições."
+msgstr "Aplica um conjunto de patches no ramo Git atual, preservando os limites, a ordem e as suas descrições."
 
 #. type: Plain text
 #: en/git-quiltimport.txt:27
 #, priority:100
 msgid "For each patch the code attempts to extract the author from the patch description.  If that fails it falls back to the author specified with --author.  If the --author flag was not given the patch description is displayed and the user is asked to interactively enter the author of the patch."
-msgstr ""
-"Para cada patch, o código tenta extrair o autor da descrição do patch.  Caso "
-"falhe, ele retornará ao autor definido com --author.  Se o a opção `--author`"
-" não seja informado, a descrição do patch é exibida e o usuário é solicitado "
-"a inserir interativamente o autor do patch."
+msgstr "Para cada patch, o código tenta extrair o autor da descrição do patch.  Caso falhe, ele retornará ao autor definido com --author.  Se o a opção `--author` não seja informado, a descrição do patch é exibida e o usuário é solicitado a inserir interativamente o autor do patch."
 
 #. type: Plain text
 #: en/git-quiltimport.txt:30
 #, priority:100
 msgid "If a subject is not found in the patch description the patch name is preserved as the 1 line subject in the Git description."
-msgstr ""
-"Caso um assunto não seja encontrado na descrição do patch, o nome do patch "
-"será preservado como o assunto com 1 linha na descrição do Git."
+msgstr "Caso um assunto não seja encontrado na descrição do patch, o nome do patch será preservado como o assunto com 1 linha na descrição do Git."
 
 #. type: Plain text
 #: en/git-quiltimport.txt:40
 #, priority:100
 msgid "Walk through the patches in the series and warn if we cannot find all of the necessary information to commit a patch.  At the time of this writing only missing author information is warned about."
-msgstr ""
-"Percorra os patches da série e avise caso não consigamos encontrar todas as "
-"informações necessárias para fazer o commit de um patch.  No momento da "
-"redação deste artigo, apenas as informações ausentes do autor são alertadas."
+msgstr "Percorra os patches da série e avise caso não consigamos encontrar todas as informações necessárias para fazer o commit de um patch.  No momento da redação deste artigo, apenas as informações ausentes do autor são alertadas."
 
 #. type: Labeled list
 #: en/git-quiltimport.txt:41
@@ -44554,9 +39392,7 @@ msgstr "--author Nome do Autor <E-Mail do Autor>"
 #: en/git-quiltimport.txt:44
 #, priority:100
 msgid "The author name and email address to use when no author information can be found in the patch description."
-msgstr ""
-"O nome do autor e o endereço de e-mail que serão utilizados quando nenhuma "
-"informação do autor puder ser encontrada na descrição do patch."
+msgstr "O nome do autor e o endereço de e-mail que serão utilizados quando nenhuma informação do autor puder ser encontrada na descrição do patch."
 
 #. type: Labeled list
 #: en/git-quiltimport.txt:45
@@ -44574,9 +39410,7 @@ msgstr "O diretório para encontrar a colcha de retalhos dos patches."
 #: en/git-quiltimport.txt:51
 #, priority:100
 msgid "The default for the patch directory is patches or the value of the `$QUILT_PATCHES` environment variable."
-msgstr ""
-"A predefinição para o diretório de patches é \"patches\" ou o valor da "
-"variável de ambiente `$QUILT_PATCHES`."
+msgstr "A predefinição para o diretório de patches é \"patches\" ou o valor da variável de ambiente `$QUILT_PATCHES`."
 
 #. type: Labeled list
 #: en/git-quiltimport.txt:52
@@ -44594,9 +39428,7 @@ msgstr "O arquivo da série colcha de retalhos \"quilt\"."
 #: en/git-quiltimport.txt:58
 #, priority:100
 msgid "The default for the series file is <patches>/series or the value of the `$QUILT_SERIES` environment variable."
-msgstr ""
-"O padrão para o arquivo da série são <patches>/series ou o valor da variável "
-"de ambiente `$QUILT_SERIES`."
+msgstr "O padrão para o arquivo da série são <patches>/series ou o valor da variável de ambiente `$QUILT_SERIES`."
 
 #. type: Title =
 #: en/git-read-tree.txt:2
@@ -44619,8 +39451,7 @@ msgid ""
 "\t\t[--index-output=<file>] [--no-sparse-checkout]\n"
 "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
 msgstr ""
-"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | "
-"--prefix=<prefixo>]\n"
+"'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefixo>]\n"
 "\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n"
 "\t\t[--index-output=<arquivo>] [--no-sparse-checkout]\n"
 "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n"
@@ -44629,39 +39460,25 @@ msgstr ""
 #: en/git-read-tree.txt:23
 #, priority:100
 msgid "Reads the tree information given by <tree-ish> into the index, but does not actually *update* any of the files it \"caches\". (see: linkgit:git-checkout-index[1])"
-msgstr ""
-"Lê as informações da árvore informada através de `<tree-ish>` no índice, mas "
-"na verdade não *atualize* nenhum dos arquivos que ele \"armazena em cache\". "
-"(consulte: linkgit:git-checkout-index[1])"
+msgstr "Lê as informações da árvore informada através de `<tree-ish>` no índice, mas na verdade não *atualize* nenhum dos arquivos que ele \"armazena em cache\". (consulte: linkgit:git-checkout-index[1])"
 
 #. type: Plain text
 #: en/git-read-tree.txt:28
 #, priority:100
 msgid "Optionally, it can merge a tree into the index, perform a fast-forward (i.e. 2-way) merge, or a 3-way merge, with the `-m` flag.  When used with `-m`, the `-u` flag causes it to also update the files in the work tree with the result of the merge."
-msgstr ""
-"Opcionalmente, ele pode mesclar uma árvore no índice, executar uma mesclagem "
-"de avanço rápido (isto é, bidirecional) ou uma mesclagem de três vias, com a "
-"opção `-m`.  Quando utilizado com a opção `-m`, a opção `-u` faz com que ele "
-"também atualize os arquivos na árvore de trabalho com o resultado do que foi "
-"mesclado."
+msgstr "Opcionalmente, ele pode mesclar uma árvore no índice, executar uma mesclagem de avanço rápido (isto é, bidirecional) ou uma mesclagem de três vias, com a opção `-m`.  Quando utilizado com a opção `-m`, a opção `-u` faz com que ele também atualize os arquivos na árvore de trabalho com o resultado do que foi mesclado."
 
 #. type: Plain text
 #: en/git-read-tree.txt:31
 #, priority:100
 msgid "Trivial merges are done by 'git read-tree' itself.  Only conflicting paths will be in unmerged state when 'git read-tree' returns."
-msgstr ""
-"Mesclagens triviais são feitas através do próprio comando 'git read-tree'.  "
-"Somente os caminhos conflitantes estarão com a sua condição inalterada "
-"quando o comando 'git read-tree' retornar."
+msgstr "Mesclagens triviais são feitas através do próprio comando 'git read-tree'.  Somente os caminhos conflitantes estarão com a sua condição inalterada quando o comando 'git read-tree' retornar."
 
 #. type: Plain text
 #: en/git-read-tree.txt:39
 #, priority:100
 msgid "Perform a merge, not just a read.  The command will refuse to run if your index file has unmerged entries, indicating that you have not finished previous merge you started."
-msgstr ""
-"Faça uma mesclagem e não apenas uma leitura.  O comando se recusará a "
-"executar caso o arquivo do índice tiver entradas que não foram mescladas, "
-"indicando que você não concluiu a mesclagem anterior iniciada anteriormente."
+msgstr "Faça uma mesclagem e não apenas uma leitura.  O comando se recusará a executar caso o arquivo do índice tiver entradas que não foram mescladas, indicando que você não concluiu a mesclagem anterior iniciada anteriormente."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:40
@@ -44673,38 +39490,25 @@ msgstr "--reset"
 #: en/git-read-tree.txt:44
 #, priority:100
 msgid "Same as -m, except that unmerged entries are discarded instead of failing. When used with `-u`, updates leading to loss of working tree changes will not abort the operation."
-msgstr ""
-"O mesmo que `-m`, exceto que as entradas não imersas são descartadas em vez "
-"de falharem. Quando utilizadas com a opção `-u`, as atualizações que levam à "
-"perda das alterações na árvore de trabalho não interrompem a operação."
+msgstr "O mesmo que `-m`, exceto que as entradas não imersas são descartadas em vez de falharem. Quando utilizadas com a opção `-u`, as atualizações que levam à perda das alterações na árvore de trabalho não interrompem a operação."
 
 #. type: Plain text
 #: en/git-read-tree.txt:48
 #, priority:100
 msgid "After a successful merge, update the files in the work tree with the result of the merge."
-msgstr ""
-"Após uma mesclagem bem-sucedida, atualize os arquivos na árvore de trabalho "
-"com o resultado da mesclagem."
+msgstr "Após uma mesclagem bem-sucedida, atualize os arquivos na árvore de trabalho com o resultado da mesclagem."
 
 #. type: Plain text
 #: en/git-read-tree.txt:57
 #, priority:100
 msgid "Usually a merge requires the index file as well as the files in the working tree to be up to date with the current head commit, in order not to lose local changes.  This flag disables the check with the working tree and is meant to be used when creating a merge of trees that are not directly related to the current working tree status into a temporary index file."
-msgstr ""
-"Geralmente, uma mesclagem exige que o arquivo do índice e os arquivos da "
-"árvore de trabalho estejam atualizados com o commit principal atualizado, "
-"para que não se perca as alterações locais.  Esta opção desativa a "
-"verificação com a árvore de trabalho e deve ser utilizado ao criar uma "
-"mesclagem das árvores que não estão diretamente relacionadas a condição "
-"atual da árvore de trabalho em um arquivo do índice temporário."
+msgstr "Geralmente, uma mesclagem exige que o arquivo do índice e os arquivos da árvore de trabalho estejam atualizados com o commit principal atualizado, para que não se perca as alterações locais.  Esta opção desativa a verificação com a árvore de trabalho e deve ser utilizado ao criar uma mesclagem das árvores que não estão diretamente relacionadas a condição atual da árvore de trabalho em um arquivo do índice temporário."
 
 #. type: Plain text
 #: en/git-read-tree.txt:62
 #, priority:100
 msgid "Check if the command would error out, without updating the index or the files in the working tree for real."
-msgstr ""
-"Verifique se o comando gera algum erro, sem atualizar de verdade, o índice "
-"ou os arquivos na árvore de trabalho."
+msgstr "Verifique se o comando gera algum erro, sem atualizar de verdade, o índice ou os arquivos na árvore de trabalho."
 
 #. type: Plain text
 #: en/git-read-tree.txt:65
@@ -44722,46 +39526,31 @@ msgstr "--trivial"
 #: en/git-read-tree.txt:71
 #, priority:100
 msgid "Restrict three-way merge by 'git read-tree' to happen only if there is no file-level merging required, instead of resolving merge for trivial cases and leaving conflicting files unresolved in the index."
-msgstr ""
-"Restrinja a mesclagem de três vias através do comando 'git read-tree' para "
-"que aconteça apenas caso não seja necessário a mesclagem no nível do "
-"arquivo, em vez de resolver a mesclagem para casos triviais e deixar os "
-"arquivos conflitantes não resolvidos no índice."
+msgstr "Restrinja a mesclagem de três vias através do comando 'git read-tree' para que aconteça apenas caso não seja necessário a mesclagem no nível do arquivo, em vez de resolver a mesclagem para casos triviais e deixar os arquivos conflitantes não resolvidos no índice."
 
 #. type: Plain text
 #: en/git-read-tree.txt:78
 #, priority:100
 msgid "Usually a three-way merge by 'git read-tree' resolves the merge for really trivial cases and leaves other cases unresolved in the index, so that porcelains can implement different merge policies.  This flag makes the command resolve a few more cases internally:"
-msgstr ""
-"Normalmente, uma mesclagem de três vias deita através do comando 'git read-"
-"tree' resolve a mesclagem para os casos realmente triviais e deixa os outros "
-"casos que não foram resolvidos no índice, para que as porcelanas possam "
-"implementar diferentes políticas de mesclagem.  Esta opção faz com que o "
-"comando resolva mais alguns casos internamente:"
+msgstr "Normalmente, uma mesclagem de três vias deita através do comando 'git read-tree' resolve a mesclagem para os casos realmente triviais e deixa os outros casos que não foram resolvidos no índice, para que as porcelanas possam implementar diferentes políticas de mesclagem.  Esta opção faz com que o comando resolva mais alguns casos internamente:"
 
 #. type: Plain text
 #: en/git-read-tree.txt:81
 #, priority:100
 msgid "when one side removes a path and the other side leaves the path unmodified.  The resolution is to remove that path."
-msgstr ""
-"quando um lado remove um caminho e o outro lado não o altera.  A solução é "
-"remover este caminho."
+msgstr "quando um lado remove um caminho e o outro lado não o altera.  A solução é remover este caminho."
 
 #. type: Plain text
 #: en/git-read-tree.txt:82
 #, priority:100
 msgid "when both sides remove a path.  The resolution is to remove that path."
-msgstr ""
-"quando ambos os lados removerem um caminho.  A solução é remover este "
-"caminho."
+msgstr "quando ambos os lados removerem um caminho.  A solução é remover este caminho."
 
 #. type: Plain text
 #: en/git-read-tree.txt:84
 #, priority:100
 msgid "when both sides add a path identically.  The resolution is to add that path."
-msgstr ""
-"quando os dois lados adicionarem um caminho idêntico.  A resolução é "
-"adicionar este caminho."
+msgstr "quando os dois lados adicionarem um caminho idêntico.  A resolução é adicionar este caminho."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:85 en/git-svn.txt:75
@@ -44773,10 +39562,7 @@ msgstr "--prefix=<prefixo>"
 #: en/git-read-tree.txt:90
 #, priority:100
 msgid "Keep the current index contents, and read the contents of the named tree-ish under the directory at `<prefix>`.  The command will refuse to overwrite entries that already existed in the original index file."
-msgstr ""
-"Mantenha o conteúdo do índice atual e leia o conteúdo do 'tree-ish' "
-"informado no diretório `<prefixo>`.  O comando se recusará a substituir as "
-"entradas que já existiam no arquivo do índice original."
+msgstr "Mantenha o conteúdo do índice atual e leia o conteúdo do 'tree-ish' informado no diretório `<prefixo>`.  O comando se recusará a substituir as entradas que já existiam no arquivo do índice original."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:91
@@ -44788,19 +39574,7 @@ msgstr "--exclude-per-directory=<gitignore>"
 #: en/git-read-tree.txt:105
 #, priority:100
 msgid "When running the command with `-u` and `-m` options, the merge result may need to overwrite paths that are not tracked in the current branch.  The command usually refuses to proceed with the merge to avoid losing such a path.  However this safety valve sometimes gets in the way.  For example, it often happens that the other branch added a file that used to be a generated file in your branch, and the safety valve triggers when you try to switch to that branch after you ran `make` but before running `make clean` to remove the generated file.  This option tells the command to read per-directory exclude file (usually '.gitignore') and allows such an untracked but explicitly ignored file to be overwritten."
-msgstr ""
-"Ao executar o comando com as opções `-u` e `-m`, o resultado da mesclagem "
-"pode precisar substituir os caminhos que não são monitorados na ramificação "
-"atual.  O comando geralmente se recusa a prosseguir com a mesclagem para "
-"evitar a perda deste caminho.  No entanto, essa válvula de segurança às "
-"vezes atrapalha.  Muitas vezes acontece do outro ramo ter adicionado um "
-"arquivo que costumava ser um arquivo que foi gerado na sua ramificação e a "
-"válvula de segurança é acionada quando você tenta alternar para esta "
-"ramificação depois de executar o comando `make`, porém antes de executar `"
-"make clean` para remover todos os arquivo gerados pelo processo `make`.  "
-"Essa opção informa ao comando para ler o arquivo de exclusão por diretório ("
-"geralmente '.gitignore') e permite que um arquivo que não seja monitorado, "
-"porém ignorado de forma explicita seja substituído."
+msgstr "Ao executar o comando com as opções `-u` e `-m`, o resultado da mesclagem pode precisar substituir os caminhos que não são monitorados na ramificação atual.  O comando geralmente se recusa a prosseguir com a mesclagem para evitar a perda deste caminho.  No entanto, essa válvula de segurança às vezes atrapalha.  Muitas vezes acontece do outro ramo ter adicionado um arquivo que costumava ser um arquivo que foi gerado na sua ramificação e a válvula de segurança é acionada quando você tenta alternar para esta ramificação depois de executar o comando `make`, porém antes de executar `make clean` para remover todos os arquivo gerados pelo processo `make`.  Essa opção informa ao comando para ler o arquivo de exclusão por diretório (geralmente '.gitignore') e permite que um arquivo que não seja monitorado, porém ignorado de forma explicita seja substituído."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:106
@@ -44812,15 +39586,7 @@ msgstr "--index-output=<arquivo>"
 #: en/git-read-tree.txt:117
 #, priority:100
 msgid "Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting index in the named file.  While the command is operating, the original index file is locked with the same mechanism as usual.  The file must allow to be rename(2)ed into from a temporary file that is created next to the usual index file; typically this means it needs to be on the same filesystem as the index file itself, and you need write permission to the directories the index file and index output file are located in."
-msgstr ""
-"Em vez de escrever os resultados em `$GIT_INDEX_FILE`, escreva o índice "
-"resultante no arquivo informado.  Enquanto o comando está em operação, o "
-"arquivo do índice original é bloqueado com o mesmo mecanismo de sempre.  O "
-"arquivo deve permitir que seja rename(2)ed (renomeado) de um arquivo "
-"temporário criado ao lado do arquivo do índice tradicional; normalmente, "
-"significa que ele precisa estar no mesmo sistema de arquivos que o próprio "
-"arquivo do índice e é necessário ter permissão de gravação nos diretórios "
-"onde o arquivo de índice e o arquivo gerado do índice estejam localizados."
+msgstr "Em vez de escrever os resultados em `$GIT_INDEX_FILE`, escreva o índice resultante no arquivo informado.  Enquanto o comando está em operação, o arquivo do índice original é bloqueado com o mesmo mecanismo de sempre.  O arquivo deve permitir que seja rename(2)ed (renomeado) de um arquivo temporário criado ao lado do arquivo do índice tradicional; normalmente, significa que ele precisa estar no mesmo sistema de arquivos que o próprio arquivo do índice e é necessário ter permissão de gravação nos diretórios onde o arquivo de índice e o arquivo gerado do índice estejam localizados."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:118 en/git-reset.txt:91
@@ -44844,9 +39610,7 @@ msgstr "--no-sparse-checkout"
 #: en/git-read-tree.txt:127
 #, priority:100
 msgid "Disable sparse checkout support even if `core.sparseCheckout` is true."
-msgstr ""
-"Desative a compatibilidade com a verificação esparsa, mesmo que o `core."
-"sparseCheckout` seja verdadeiro."
+msgstr "Desative a compatibilidade com a verificação esparsa, mesmo que o `core.sparseCheckout` seja verdadeiro."
 
 #. type: Labeled list
 #: en/git-read-tree.txt:128
@@ -44882,11 +39646,7 @@ msgstr "MESCLANDO"
 #: en/git-read-tree.txt:146
 #, priority:100
 msgid "If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a 3-way merge if 3 or more trees are provided."
-msgstr ""
-"Se `-m` seja utilizado, o comando 'git read-tree' pode executar 3 tipos de "
-"mesclagem, uma única mesclagem na árvore caso apenas uma árvore seja "
-"informada, uma mesclagem de avanço rápido nas 2 árvores ou uma mesclagem de "
-"3 vias caso 3 ou mais árvores sejam informadas."
+msgstr "Se `-m` seja utilizado, o comando 'git read-tree' pode executar 3 tipos de mesclagem, uma única mesclagem na árvore caso apenas uma árvore seja informada, uma mesclagem de avanço rápido nas 2 árvores ou uma mesclagem de 3 vias caso 3 ou mais árvores sejam informadas."
 
 #. type: Title ~
 #: en/git-read-tree.txt:149
@@ -44898,30 +39658,19 @@ msgstr "Mesclagem Única da Árvore"
 #: en/git-read-tree.txt:155
 #, priority:100
 msgid "If only 1 tree is specified, 'git read-tree' operates as if the user did not specify `-m`, except that if the original index has an entry for a given pathname, and the contents of the path match with the tree being read, the stat info from the index is used. (In other words, the index's stat()s take precedence over the merged tree's)."
-msgstr ""
-"Caso apenas 1 árvore seja informada, 'git read-tree' funcionará como se o "
-"usuário não a tivesse informado `-m`, exceto quando o índice original tiver "
-"uma entrada para um determinado nome do caminho e o conteúdo do caminho "
-"corresponder à árvore sendo lida, as estatísticas das informações do índice "
-"são utilizadas. (Em outras palavras, os 'stat()' do índice têm precedência "
-"sobre os da árvore mesclada)."
+msgstr "Caso apenas 1 árvore seja informada, 'git read-tree' funcionará como se o usuário não a tivesse informado `-m`, exceto quando o índice original tiver uma entrada para um determinado nome do caminho e o conteúdo do caminho corresponder à árvore sendo lida, as estatísticas das informações do índice são utilizadas. (Em outras palavras, os 'stat()' do índice têm precedência sobre os da árvore mesclada)."
 
 #. type: Plain text
 #: en/git-read-tree.txt:159
 #, priority:100
 msgid "That means that if you do a `git read-tree -m <newtree>` followed by a `git checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff that really changed."
-msgstr ""
-"Significa que se você fizer um `git read-tree -m <newtree>` seguido de um `"
-"git checkout-index -f -u -a`, o comando 'git checkout-index' verificará "
-"apenas o que realmente mudou."
+msgstr "Significa que se você fizer um `git read-tree -m <newtree>` seguido de um `git checkout-index -f -u -a`, o comando 'git checkout-index' verificará apenas o que realmente mudou."
 
 #. type: Plain text
 #: en/git-read-tree.txt:162
 #, priority:100
 msgid "This is used to avoid unnecessary false hits when 'git diff-files' is run after 'git read-tree'."
-msgstr ""
-"É utilizado para evitar acertos falsos desnecessários quando 'git diff-"
-"files' é executado após 'git read-tree'."
+msgstr "É utilizado para evitar acertos falsos desnecessários quando 'git diff-files' é executado após 'git read-tree'."
 
 #. type: Title ~
 #: en/git-read-tree.txt:165
@@ -44933,19 +39682,13 @@ msgstr "Mesclagem de duas, três árvores"
 #: en/git-read-tree.txt:171
 #, priority:100
 msgid "Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head commit of the current repository, and $M is the head of a foreign tree, which is simply ahead of $H (i.e. we are in a fast-forward situation)."
-msgstr ""
-"Normalmente, isso é invocado como `git read-tree -m $H $M`, onde '$H' é o "
-"commit principal do repositório atual e o '$M' é o cabeçalho de uma árvore "
-"estrangeira, que está simplesmente à frente de '$H' ( ou seja, estamos em "
-"uma situação de avanço rápido)."
+msgstr "Normalmente, isso é invocado como `git read-tree -m $H $M`, onde '$H' é o commit principal do repositório atual e o '$M' é o cabeçalho de uma árvore estrangeira, que está simplesmente à frente de '$H' ( ou seja, estamos em uma situação de avanço rápido)."
 
 #. type: Plain text
 #: en/git-read-tree.txt:174
 #, priority:100
 msgid "When two trees are specified, the user is telling 'git read-tree' the following:"
-msgstr ""
-"Quando duas árvores são definidas, o usuário informa ao 'git read-tree' o "
-"seguinte:"
+msgstr "Quando duas árvores são definidas, o usuário informa ao 'git read-tree' o seguinte:"
 
 #. type: Plain text
 #: en/git-read-tree.txt:176
@@ -44969,12 +39712,7 @@ msgstr "O usuário deseja avançar rapidamente para '$M'."
 #: en/git-read-tree.txt:185
 #, priority:100
 msgid "In this case, the `git read-tree -m $H $M` command makes sure that no local change is lost as the result of this \"merge\".  Here are the \"carry forward\" rules, where \"I\" denotes the index, \"clean\" means that index and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in the specified commit:"
-msgstr ""
-"Nesse caso, o comando `git read-tree -m $H $M` garante que nenhuma mudança "
-"local seja perdida como resultado desta \"mesclagem\".  Aqui estão as regras "
-"\"carry forward\", onde \"I\" denota o índice, \"clean\" significa que o "
-"índice e a árvore de trabalho coincidem e \"existe\"/\"nothing\" se refere à "
-"presença de um caminho no commit informado:"
+msgstr "Nesse caso, o comando `git read-tree -m $H $M` garante que nenhuma mudança local seja perdida como resultado desta \"mesclagem\".  Aqui estão as regras \"carry forward\", onde \"I\" denota o índice, \"clean\" significa que o índice e a árvore de trabalho coincidem e \"existe\"/\"nothing\" se refere à presença de um caminho no commit informado:"
 
 #. type: delimited block .
 #: en/git-read-tree.txt:196
@@ -44995,8 +39733,7 @@ msgstr ""
 "     0  nada                nada     nada     (não acontece)\n"
 "     1  nada                nada     existe   usa M\n"
 "     2  nada                existe   nada     remove o caminho do índice\n"
-"     3  nada                existe   existe,  usa M caso \"averiguação "
-"inicial\",\n"
+"     3  nada                existe   existe,  usa M caso \"averiguação inicial\",\n"
 "\t\t\t\t     H == M   caso contrário, mantenha o índice\n"
 "\t\t\t\t     existe,  falha\n"
 "\t\t\t\t     H != M\n"
@@ -45038,8 +39775,7 @@ msgid ""
 "     12 yes   no    N/A     exists   nothing  fail\n"
 "     13 no    no    N/A     exists   nothing  fail\n"
 msgstr ""
-"     10 sim   sim   N/A     existe   nada     remove o caminho a partir do "
-"índice\n"
+"     10 sim   sim   N/A     existe   nada     remove o caminho a partir do índice\n"
 "     11 não   sim   N/A     existe   nada     falha\n"
 "     12 sim   não   N/A     existe   nada     falha\n"
 "     13 não   não   N/A     existe   nada     falha\n"
@@ -45084,40 +39820,19 @@ msgstr ""
 #: en/git-read-tree.txt:231
 #, priority:100
 msgid "In all \"keep index\" cases, the index entry stays as in the original index file.  If the entry is not up to date, 'git read-tree' keeps the copy in the work tree intact when operating under the -u flag."
-msgstr ""
-"Em todos os casos \"manter índice\", a a entrada do índice permanece como no "
-"arquivo do índice original.  Caso a entrada não esteja atualizada, o comando "
-"'git read-tree' mantém intacta a cópia na árvore de trabalho ao operar sob a "
-"opção `-u`."
+msgstr "Em todos os casos \"manter índice\", a a entrada do índice permanece como no arquivo do índice original.  Caso a entrada não esteja atualizada, o comando 'git read-tree' mantém intacta a cópia na árvore de trabalho ao operar sob a opção `-u`."
 
 #. type: Plain text
 #: en/git-read-tree.txt:242
 #, priority:100
 msgid "When this form of 'git read-tree' returns successfully, you can see which of the \"local changes\" that you made were carried forward by running `git diff-index --cached $M`.  Note that this does not necessarily match what `git diff-index --cached $H` would have produced before such a two tree merge.  This is because of cases 18 and 19 --- if you already had the changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git diff-index --cached $H` would have told you about the change before this merge, but it would not show in `git diff-index --cached $M` output after the two-tree merge."
-msgstr ""
-"Quando esta forma do comando 'git read-tree' retorna com sucesso, é possível "
-"ver quais das \"alterações locais\" feitas foram executadas com o comando `"
-"git diff-index --cached $M`.  Observe que isso não corresponde "
-"necessariamente ao que o comando `git diff-index --cached $H` teria "
-"produzido antes de uma fusão de duas árvores.  Isto ocorre devido aos casos "
-"18 e 19 --- caso já tenha as alterações em '$M' (talvez você tenha recebido "
-"por e-mail em um formulário para um patch por exemplo), o comando `git diff-"
-"index --cached $H` teria retornado uma mudança antes desta mesclagem, porém "
-"não teria sido exibida na saída do comando `git diff-index --cached $M` após "
-"a mesclagem das duas árvores."
+msgstr "Quando esta forma do comando 'git read-tree' retorna com sucesso, é possível ver quais das \"alterações locais\" feitas foram executadas com o comando `git diff-index --cached $M`.  Observe que isso não corresponde necessariamente ao que o comando `git diff-index --cached $H` teria produzido antes de uma fusão de duas árvores.  Isto ocorre devido aos casos 18 e 19 --- caso já tenha as alterações em '$M' (talvez você tenha recebido por e-mail em um formulário para um patch por exemplo), o comando `git diff-index --cached $H` teria retornado uma mudança antes desta mesclagem, porém não teria sido exibida na saída do comando `git diff-index --cached $M` após a mesclagem das duas árvores."
 
 #. type: Plain text
 #: en/git-read-tree.txt:249
 #, priority:100
 msgid "Case 3 is slightly tricky and needs explanation.  The result from this rule logically should be to remove the path if the user staged the removal of the path and then switching to a new branch.  That however will prevent the initial checkout from happening, so the rule is modified to use M (new tree) only when the content of the index is empty.  Otherwise the removal of the path is kept as long as $H and $M are the same."
-msgstr ""
-"O caso 3 é um pouco complicado e precisa de explicação.  O resultado desta "
-"regra, logicamente deve ser remover o caminho caso o usuário tenha realizado "
-"a remoção do caminho e depois mude para uma nova ramificação.  Isso, no "
-"entanto, impedirá que a averiguação inicial aconteça, portanto, a regra é "
-"modificada para utilizar 'M' (nova árvore) somente quando o conteúdo do "
-"índice estiver vazio.  Caso contrário, a remoção do caminho será mantida "
-"desde que '$H' e '$'M' sejam os mesmos."
+msgstr "O caso 3 é um pouco complicado e precisa de explicação.  O resultado desta regra, logicamente deve ser remover o caminho caso o usuário tenha realizado a remoção do caminho e depois mude para uma nova ramificação.  Isso, no entanto, impedirá que a averiguação inicial aconteça, portanto, a regra é modificada para utilizar 'M' (nova árvore) somente quando o conteúdo do índice estiver vazio.  Caso contrário, a remoção do caminho será mantida desde que '$H' e '$'M' sejam os mesmos."
 
 #. type: Title ~
 #: en/git-read-tree.txt:251
@@ -45129,17 +39844,13 @@ msgstr "Mesclagem de 3 vias"
 #: en/git-read-tree.txt:254
 #, priority:100
 msgid "Each \"index\" entry has two bits worth of \"stage\" state. stage 0 is the normal one, and is the only one you'd see in any kind of normal use."
-msgstr ""
-"Cada entrada no \"índice\" possui dois bits na condição \"stage\". o estágio "
-"0 é o normal e é o único que você veria em qualquer tipo de uso normal."
+msgstr "Cada entrada no \"índice\" possui dois bits na condição \"stage\". o estágio 0 é o normal e é o único que você veria em qualquer tipo de uso normal."
 
 #. type: Plain text
 #: en/git-read-tree.txt:257
 #, priority:100
 msgid "However, when you do 'git read-tree' with three trees, the \"stage\" starts out at 1."
-msgstr ""
-"No entanto, quando você executar o comando 'git read-tree' com três árvores, "
-"o \"estágio\" começa em 1."
+msgstr "No entanto, quando você executar o comando 'git read-tree' com três árvores, o \"estágio\" começa em 1."
 
 #. type: Plain text
 #: en/git-read-tree.txt:259
@@ -45157,167 +39868,103 @@ msgstr "$ git read-tree -m <tree1> <tree2> <tree3>\n"
 #: en/git-read-tree.txt:270
 #, priority:100
 msgid "and you will end up with an index with all of the <tree1> entries in \"stage1\", all of the <tree2> entries in \"stage2\" and all of the <tree3> entries in \"stage3\".  When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>."
-msgstr ""
-"e você terminará com um índice com todas as entradas <tree1> em \"stage1\", "
-"todas as entradas <tree2> em \"stage2\" e todas as entradas <tree3> no "
-"\"stage3\".  Ao fazer uma mesclagem de um outro ramo no ramo atual, "
-"utilizamos a árvore ancestral comum como <tree1>, o cabeçalho da ramificação "
-"atual como <tree2> e o outro cabeçalho do ramo como <tree3>."
+msgstr "e você terminará com um índice com todas as entradas <tree1> em \"stage1\", todas as entradas <tree2> em \"stage2\" e todas as entradas <tree3> no \"stage3\".  Ao fazer uma mesclagem de um outro ramo no ramo atual, utilizamos a árvore ancestral comum como <tree1>, o cabeçalho da ramificação atual como <tree2> e o outro cabeçalho do ramo como <tree3>."
 
 #. type: Plain text
 #: en/git-read-tree.txt:274
 #, priority:100
 msgid "Furthermore, 'git read-tree' has special-case logic that says: if you see a file that matches in all respects in the following states, it \"collapses\" back to \"stage0\":"
-msgstr ""
-"Além disso, o comando 'git read-tree' possui uma lógica para caso especial "
-"que diz: caso você veja um arquivo que coincida em todos os aspectos nos "
-"seguintes condições, ele irá \"retornar\" novamente para \"stage0\":"
+msgstr "Além disso, o comando 'git read-tree' possui uma lógica para caso especial que diz: caso você veja um arquivo que coincida em todos os aspectos nos seguintes condições, ele irá \"retornar\" novamente para \"stage0\":"
 
 #. type: Plain text
 #: en/git-read-tree.txt:278
 #, priority:100
 msgid "stage 2 and 3 are the same; take one or the other (it makes no difference - the same work has been done on our branch in stage 2 and their branch in stage 3)"
-msgstr ""
-"Os estágios 2 e 3 são os mesmos; pegue um ou outro (não faz diferença, o "
-"mesmo trabalho foi feito em nosso ramo no estágio 2 e em seu ramo da fase 3)"
+msgstr "Os estágios 2 e 3 são os mesmos; pegue um ou outro (não faz diferença, o mesmo trabalho foi feito em nosso ramo no estágio 2 e em seu ramo da fase 3)"
 
 #. type: Plain text
 #: en/git-read-tree.txt:283
 #, priority:100
 msgid "stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our branch in stage 2 did not do anything since the ancestor in stage 1 while their branch in stage 3 worked on it)"
-msgstr ""
-"o estágio 1 e o estágio 2 são iguais, o estágio 3 é diferente; pegue o "
-"estágio 3 (o nosso ramo no estágio 2 não fez nada desde no seu ancestral do "
-"estágio 1, enquanto o ramo no estágio 3 trabalhou nele)"
+msgstr "o estágio 1 e o estágio 2 são iguais, o estágio 3 é diferente; pegue o estágio 3 (o nosso ramo no estágio 2 não fez nada desde no seu ancestral do estágio 1, enquanto o ramo no estágio 3 trabalhou nele)"
 
 #. type: Plain text
 #: en/git-read-tree.txt:286
 #, priority:100
 msgid "stage 1 and stage 3 are the same and stage 2 is different take stage 2 (we did something while they did nothing)"
-msgstr ""
-"os estágios 1 e 3 são iguais e o estágio 2 é diferente, tomamos o estágio 2 ("
-"fizemos algo enquanto eles não fizeram nada)"
+msgstr "os estágios 1 e 3 são iguais e o estágio 2 é diferente, tomamos o estágio 2 (fizemos algo enquanto eles não fizeram nada)"
 
 #. type: Plain text
 #: en/git-read-tree.txt:290
 #, priority:100
 msgid "The 'git write-tree' command refuses to write a nonsensical tree, and it will complain about unmerged entries if it sees a single entry that is not stage 0."
-msgstr ""
-"O comando 'git write-tree' se recusa a escrever em uma árvore sem sentido e "
-"irá reclamar das entradas que não foram mescladas caso veja uma única "
-"entrada que não seja o estágio 0."
+msgstr "O comando 'git write-tree' se recusa a escrever em uma árvore sem sentido e irá reclamar das entradas que não foram mescladas caso veja uma única entrada que não seja o estágio 0."
 
 #. type: Plain text
 #: en/git-read-tree.txt:296
 #, priority:100
 msgid "OK, this all sounds like a collection of totally nonsensical rules, but it's actually exactly what you want in order to do a fast merge. The different stages represent the \"result tree\" (stage 0, aka \"merged\"), the original tree (stage 1, aka \"orig\"), and the two trees you are trying to merge (stage 2 and 3 respectively)."
-msgstr ""
-"OK, tudo isso soa como uma coleção de regras totalmente sem sentido, mas na "
-"verdade é exatamente o que você quer para fazer uma fusão rápida. Os "
-"diferentes estágios representam a \"árvore de resultados\" (estágio 0, "
-"também informado como \"mesclado\"), a árvore original (estágio 1, também "
-"informado como \"orig\") e as duas árvores que você está tentando mesclar ("
-"estágio 2 e 3, respectivamente)."
+msgstr "OK, tudo isso soa como uma coleção de regras totalmente sem sentido, mas na verdade é exatamente o que você quer para fazer uma fusão rápida. Os diferentes estágios representam a \"árvore de resultados\" (estágio 0, também informado como \"mesclado\"), a árvore original (estágio 1, também informado como \"orig\") e as duas árvores que você está tentando mesclar (estágio 2 e 3, respectivamente)."
 
 #. type: Plain text
 #: en/git-read-tree.txt:301
 #, priority:100
 msgid "The order of stages 1, 2 and 3 (hence the order of three <tree-ish> command-line arguments) are significant when you start a 3-way merge with an index file that is already populated.  Here is an outline of how the algorithm works:"
-msgstr ""
-"A ordem dos estágios 1, 2 e 3 (portanto a ordem dos três argumentos da linha "
-"de comando <tree-ish>) tem importância quando você inicia uma mesclagem de "
-"três vias com um arquivo do índice que já esteja preenchido.  Aqui está um "
-"resumo de como o algoritmo funciona:"
+msgstr "A ordem dos estágios 1, 2 e 3 (portanto a ordem dos três argumentos da linha de comando <tree-ish>) tem importância quando você inicia uma mesclagem de três vias com um arquivo do índice que já esteja preenchido.  Aqui está um resumo de como o algoritmo funciona:"
 
 #. type: Plain text
 #: en/git-read-tree.txt:304
 #, priority:100
 msgid "if a file exists in identical format in all three trees, it will automatically collapse to \"merged\" state by 'git read-tree'."
-msgstr ""
-"se um arquivo existir no formato idêntico em todas as três árvores, ele "
-"retornará automaticamente para a condição de \"mesclado\" através do comando "
-"'git read-tree'."
+msgstr "se um arquivo existir no formato idêntico em todas as três árvores, ele retornará automaticamente para a condição de \"mesclado\" através do comando 'git read-tree'."
 
 #. type: Plain text
 #: en/git-read-tree.txt:309
 #, priority:100
 msgid "a file that has _any_ difference what-so-ever in the three trees will stay as separate entries in the index. It's up to \"porcelain policy\" to determine how to remove the non-0 stages, and insert a merged version."
-msgstr ""
-"um arquivo que tenha qualquer diferença entre as três árvores permanecerá "
-"como lançamentos separados no índice. Cabe à \"política da porcelana\" "
-"determinar como remover os diferentes estágios não zerados e inserir uma "
-"versão mesclada."
+msgstr "um arquivo que tenha qualquer diferença entre as três árvores permanecerá como lançamentos separados no índice. Cabe à \"política da porcelana\" determinar como remover os diferentes estágios não zerados e inserir uma versão mesclada."
 
 #. type: Plain text
 #: en/git-read-tree.txt:314
 #, priority:100
 msgid "the index file saves and restores with all this information, so you can merge things incrementally, but as long as it has entries in stages 1/2/3 (i.e., \"unmerged entries\") you can't write the result. So now the merge algorithm ends up being really simple:"
-msgstr ""
-"o arquivo do índice salva e restaura com todas estas informações, para que "
-"você possa mesclar as coisas de maneira incremental, mas contanto que tenha "
-"as entradas nos estágios 1/2/3 (ou seja, \"os lançamentos que não foram "
-"mesclados\"), não será possível gravar o resultado. Então agora o algoritmo "
-"da mesclagem acaba sendo realmente simples:"
+msgstr "o arquivo do índice salva e restaura com todas estas informações, para que você possa mesclar as coisas de maneira incremental, mas contanto que tenha as entradas nos estágios 1/2/3 (ou seja, \"os lançamentos que não foram mesclados\"), não será possível gravar o resultado. Então agora o algoritmo da mesclagem acaba sendo realmente simples:"
 
 #. type: Plain text
 #: en/git-read-tree.txt:317
 #, priority:100
 msgid "you walk the index in order, and ignore all entries of stage 0, since they've already been done."
-msgstr ""
-"você percorre o índice em ordem e ignora todas as entradas do estágio 0, "
-"pois elas já foram feitas."
+msgstr "você percorre o índice em ordem e ignora todas as entradas do estágio 0, pois elas já foram feitas."
 
 #. type: Plain text
 #: en/git-read-tree.txt:321
 #, priority:100
 msgid "if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know it's been removed from both trees (it only existed in the original tree), and you remove that entry."
-msgstr ""
-"caso encontre um \"estágio1\", que não coincida com o \"estágio2\" ou "
-"\"estágio3\", você sabe que ele foi removido das duas árvores (existia "
-"apenas na árvore original) e você remove essa entrada."
+msgstr "caso encontre um \"estágio1\", que não coincida com o \"estágio2\" ou \"estágio3\", você sabe que ele foi removido das duas árvores (existia apenas na árvore original) e você remove essa entrada."
 
 #. type: Plain text
 #: en/git-read-tree.txt:326
 #, priority:100
 msgid "if you find a matching \"stage2\" and \"stage3\" tree, you remove one of them, and turn the other into a \"stage0\" entry. Remove any matching \"stage1\" entry if it exists too.  .. all the normal trivial rules .."
-msgstr ""
-"caso encontre uma árvore que coincida com \"stage2\" e \"stage3\", remova um "
-"deles e transforme o outro em um lançamento no \"stage0\". Remova qualquer "
-"entrada que coincida com o \"stage1\", caso ela também exista.  .. todas as "
-"regras triviais normais .."
+msgstr "caso encontre uma árvore que coincida com \"stage2\" e \"stage3\", remova um deles e transforme o outro em um lançamento no \"stage0\". Remova qualquer entrada que coincida com o \"stage1\", caso ela também exista.  .. todas as regras triviais normais .."
 
 #. type: Plain text
 #: en/git-read-tree.txt:331
 #, priority:100
 msgid "You would normally use 'git merge-index' with supplied 'git merge-one-file' to do this last step.  The script updates the files in the working tree as it merges each path and at the end of a successful merge."
-msgstr ""
-"Normalmente seria utilizado o comando 'git merge-index' com o comando 'git "
-"merge-one-file' informado para executar esta última etapa.  O script "
-"atualiza os arquivos na árvore de trabalho à medida que mescla cada caminho "
-"e no final de uma mesclagem bem-sucedida."
+msgstr "Normalmente seria utilizado o comando 'git merge-index' com o comando 'git merge-one-file' informado para executar esta última etapa.  O script atualiza os arquivos na árvore de trabalho à medida que mescla cada caminho e no final de uma mesclagem bem-sucedida."
 
 #. type: Plain text
 #: en/git-read-tree.txt:339
 #, priority:100
 msgid "When you start a 3-way merge with an index file that is already populated, it is assumed that it represents the state of the files in your work tree, and you can even have files with changes unrecorded in the index file.  It is further assumed that this state is \"derived\" from the stage 2 tree.  The 3-way merge refuses to run if it finds an entry in the original index file that does not match stage 2."
-msgstr ""
-"Quando você inicia uma mesclagem de três vias com um índice do arquivo já "
-"preenchido, supõe-se que ele represente o a condição geral dos arquivos na "
-"sua árvore de trabalho e você pode até ter arquivos com alterações não "
-"registradas no índice do arquivo.  Supõe-se ainda que esta condição geral "
-"seja \"derivado\" da árvore do estágio 2.  A mesclagem de três vias se "
-"recusa a executar caso encontre uma entrada no arquivo do índice original "
-"que não coincida com o estágio 2."
+msgstr "Quando você inicia uma mesclagem de três vias com um índice do arquivo já preenchido, supõe-se que ele represente o a condição geral dos arquivos na sua árvore de trabalho e você pode até ter arquivos com alterações não registradas no índice do arquivo.  Supõe-se ainda que esta condição geral seja \"derivado\" da árvore do estágio 2.  A mesclagem de três vias se recusa a executar caso encontre uma entrada no arquivo do índice original que não coincida com o estágio 2."
 
 #. type: Plain text
 #: en/git-read-tree.txt:344
 #, priority:100
 msgid "This is done to prevent you from losing your work-in-progress changes, and mixing your random changes in an unrelated merge commit.  To illustrate, suppose you start from what has been committed last to your repository:"
-msgstr ""
-"Isso é feito para impedir que você perca as alterações do trabalho ainda em "
-"andamento e misture as alterações aleatórias em uma consolidação de uma "
-"mesclagem não relacionada.  Para ilustrar, suponha que você comece de um "
-"commit que foi feito por último no seu repositório:"
+msgstr "Isso é feito para impedir que você perca as alterações do trabalho ainda em andamento e misture as alterações aleatórias em uma consolidação de uma mesclagem não relacionada.  Para ilustrar, suponha que você comece de um commit que foi feito por último no seu repositório:"
 
 #. type: delimited block -
 #: en/git-read-tree.txt:348
@@ -45333,10 +39980,7 @@ msgstr ""
 #: en/git-read-tree.txt:353
 #, priority:100
 msgid "You do random edits, without running 'git update-index'.  And then you notice that the tip of your \"upstream\" tree has advanced since you pulled from him:"
-msgstr ""
-"Você faz edições aleatórias, sem executar o 'git update-index'.  E então "
-"percebe que o cume da sua árvore \"upstream\" avançou desde que você fez o "
-"\"pull\" dele:"
+msgstr "Você faz edições aleatórias, sem executar o 'git update-index'.  E então percebe que o cume da sua árvore \"upstream\" avançou desde que você fez o \"pull\" dele:"
 
 #. type: delimited block -
 #: en/git-read-tree.txt:357
@@ -45352,11 +39996,7 @@ msgstr ""
 #: en/git-read-tree.txt:363
 #, priority:100
 msgid "Your work tree is still based on your HEAD ($JC), but you have some edits since.  Three-way merge makes sure that you have not added or modified index entries since $JC, and if you haven't, then does the right thing.  So with the following sequence:"
-msgstr ""
-"A sua árvore de trabalho ainda tem como base no seu HEAD ($ JC), mas você "
-"tem algumas edições desde então.  A mesclagem de três vias garante que você "
-"não tenha adicionado ou modificado as entradas no índice desde $JC e, se não "
-"tiver, faz a coisa certa.  Então, com a seguinte sequência:"
+msgstr "A sua árvore de trabalho ainda tem como base no seu HEAD ($ JC), mas você tem algumas edições desde então.  A mesclagem de três vias garante que você não tenha adicionado ou modificado as entradas no índice desde $JC e, se não tiver, faz a coisa certa.  Então, com a seguinte sequência:"
 
 #. type: delimited block -
 #: en/git-read-tree.txt:369
@@ -45376,33 +40016,19 @@ msgstr ""
 #: en/git-read-tree.txt:374
 #, priority:100
 msgid "what you would commit is a pure merge between $JC and $LT without your work-in-progress changes, and your work tree would be updated to the result of the merge."
-msgstr ""
-"o commit que seria feito é uma mesclagem direta entre $JC e $LT sem as "
-"alterações em andamento e a sua árvore de trabalho seria atualizada para o "
-"resultado desta mesclagem."
+msgstr "o commit que seria feito é uma mesclagem direta entre $JC e $LT sem as alterações em andamento e a sua árvore de trabalho seria atualizada para o resultado desta mesclagem."
 
 #. type: Plain text
 #: en/git-read-tree.txt:378
 #, priority:100
 msgid "However, if you have local changes in the working tree that would be overwritten by this merge, 'git read-tree' will refuse to run to prevent your changes from being lost."
-msgstr ""
-"No entanto, caso tenha alterações locais na árvore de trabalho que seriam "
-"substituídas através desta mesclagem, o comando 'git read-tree' se recusará "
-"a executar evitando que as suas alterações sejam perdidas."
+msgstr "No entanto, caso tenha alterações locais na árvore de trabalho que seriam substituídas através desta mesclagem, o comando 'git read-tree' se recusará a executar evitando que as suas alterações sejam perdidas."
 
 #. type: Plain text
 #: en/git-read-tree.txt:388
 #, priority:100
 msgid "In other words, there is no need to worry about what exists only in the working tree.  When you have local changes in a part of the project that is not involved in the merge, your changes do not interfere with the merge, and are kept intact.  When they *do* interfere, the merge does not even start ('git read-tree' complains loudly and fails without modifying anything).  In such a case, you can simply continue doing what you were in the middle of doing, and when your working tree is ready (i.e. you have finished your work-in-progress), attempt the merge again."
-msgstr ""
-"Em outras palavras, não há a necessidade de se preocupar com o que apenas "
-"exista na árvore de trabalho.  Quando houver alterações locais em uma parte "
-"do projeto que não está envolvida com a mesclagem, as suas alterações não "
-"interferem na mesclagem e são mantidas intactas.  Quando há *interferência*, "
-"a mesclagem nem é iniciada (o comando 'git read-tree' faz o alerta e encerra "
-"sem alterar nada).  Nesse caso, é possível continuar simplesmente fazendo o "
-"que estava fazendo no meio e quando a sua árvore de trabalho estiver pronta ("
-"ou seja, você concluiu o seu trabalho em andamento), tente mesclar novamente."
+msgstr "Em outras palavras, não há a necessidade de se preocupar com o que apenas exista na árvore de trabalho.  Quando houver alterações locais em uma parte do projeto que não está envolvida com a mesclagem, as suas alterações não interferem na mesclagem e são mantidas intactas.  Quando há *interferência*, a mesclagem nem é iniciada (o comando 'git read-tree' faz o alerta e encerra sem alterar nada).  Nesse caso, é possível continuar simplesmente fazendo o que estava fazendo no meio e quando a sua árvore de trabalho estiver pronta (ou seja, você concluiu o seu trabalho em andamento), tente mesclar novamente."
 
 #. type: Title -
 #: en/git-read-tree.txt:391
@@ -45414,46 +40040,25 @@ msgstr "AVERIGUAÇÃO ESPARSA"
 #: en/git-read-tree.txt:396
 #, priority:100
 msgid "\"Sparse checkout\" allows populating the working directory sparsely.  It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell Git whether a file in the working directory is worth looking at."
-msgstr ""
-"A averiguação esparsa permite preencher minimamente o diretório de "
-"trabalho.  Utiliza o bit \"skip-worktree\" (consulte linkgit:git-update-"
-"index[1]) para informar ao Git se vale a pena examinar um arquivo no "
-"diretório de trabalho."
+msgstr "A averiguação esparsa permite preencher minimamente o diretório de trabalho.  Utiliza o bit \"skip-worktree\" (consulte linkgit:git-update-index[1]) para informar ao Git se vale a pena examinar um arquivo no diretório de trabalho."
 
 #. type: Plain text
 #: en/git-read-tree.txt:405
 #, ignore-ellipsis, priority:100
 msgid "'git read-tree' and other merge-based commands ('git merge', 'git checkout'...) can help maintaining the skip-worktree bitmap and working directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-worktree reference bitmap. When 'git read-tree' needs to update the working directory, it resets the skip-worktree bit in the index based on this file, which uses the same syntax as .gitignore files.  If an entry matches a pattern in this file, skip-worktree will not be set on that entry. Otherwise, skip-worktree will be set."
-msgstr ""
-"O coamndo 'git read-tree' e outros comandos com base na mesclagem ('git "
-"merge', 'git checkout' ...) podem ajudar a manter o bitmap 'skip-worktree' e "
-"a atualização do diretório de trabalho. O `$GIT_DIR/info/sparse-checkout` é "
-"utilizado para definir o bitmap da referência 'skip-worktree'. Quando o 'git "
-"read-tree' precisa atualizar o diretório de trabalho, ele redefine o bit "
-"'skip-worktree' no índice com a base neste arquivo, que utiliza a mesma "
-"sintaxe dos arquivos '.gitignore'.  Caso uma entrada coincida a um padrão "
-"neste arquivo, o 'skip-worktree' não será definido para este lançamento. "
-"Caso contrário, o 'skip-worktree' será definido."
+msgstr "O coamndo 'git read-tree' e outros comandos com base na mesclagem ('git merge', 'git checkout' ...) podem ajudar a manter o bitmap 'skip-worktree' e a atualização do diretório de trabalho. O `$GIT_DIR/info/sparse-checkout` é utilizado para definir o bitmap da referência 'skip-worktree'. Quando o 'git read-tree' precisa atualizar o diretório de trabalho, ele redefine o bit 'skip-worktree' no índice com a base neste arquivo, que utiliza a mesma sintaxe dos arquivos '.gitignore'.  Caso uma entrada coincida a um padrão neste arquivo, o 'skip-worktree' não será definido para este lançamento. Caso contrário, o 'skip-worktree' será definido."
 
 #. type: Plain text
 #: en/git-read-tree.txt:409
 #, priority:100
 msgid "Then it compares the new skip-worktree value with the previous one. If skip-worktree turns from set to unset, it will add the corresponding file back. If it turns from unset to set, that file will be removed."
-msgstr ""
-"Em seguida, ele compara o novo valor 'skip-worktree' com o anterior. Caso o "
-"'skip-worktree' mude de definido para não definido, ele adicionará o arquivo "
-"correspondente novamente. Caso passe de não definido para definido, esse "
-"arquivo será removido."
+msgstr "Em seguida, ele compara o novo valor 'skip-worktree' com o anterior. Caso o 'skip-worktree' mude de definido para não definido, ele adicionará o arquivo correspondente novamente. Caso passe de não definido para definido, esse arquivo será removido."
 
 #. type: Plain text
 #: en/git-read-tree.txt:413
 #, priority:100
 msgid "While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files are in, you can also specify what files are _not_ in, using negate patterns. For example, to remove the file `unwanted`:"
-msgstr ""
-"Enquanto o `$GIT_DIR/info/sparse-checkout` é normalmente utilizado para "
-"definir quais arquivos estão nele, também é possível definir quais arquivos "
-"_não_ estão, utilizando padrões de negação. Como por exemplo, para remover o "
-"arquivo `indesejado`:"
+msgstr "Enquanto o `$GIT_DIR/info/sparse-checkout` é normalmente utilizado para definir quais arquivos estão nele, também é possível definir quais arquivos _não_ estão, utilizando padrões de negação. Como por exemplo, para remover o arquivo `indesejado`:"
 
 #. type: delimited block -
 #: en/git-read-tree.txt:417
@@ -45469,13 +40074,7 @@ msgstr ""
 #: en/git-read-tree.txt:425
 #, priority:100
 msgid "Another tricky thing is fully repopulating the working directory when you no longer want sparse checkout. You cannot just disable \"sparse checkout\" because skip-worktree bits are still in the index and your working directory is still sparsely populated. You should re-populate the working directory with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
-msgstr ""
-"Outra coisa complicada é repovoar totalmente o diretório ativo quando você "
-"não quiser mais uma verificação esparsa. Você não pode simplesmente "
-"desativar a \"verificação esparsa\" porque os bits 'skip-worktree' ainda "
-"estão no índice e o seu diretório de trabalho ainda for escassamente "
-"preenchido. Você deve preencher novamente o diretório de trabalho com o "
-"conteúdo do arquivo `$GIT_DIR/info/sparse-checkout` da seguinte maneira:"
+msgstr "Outra coisa complicada é repovoar totalmente o diretório ativo quando você não quiser mais uma verificação esparsa. Você não pode simplesmente desativar a \"verificação esparsa\" porque os bits 'skip-worktree' ainda estão no índice e o seu diretório de trabalho ainda for escassamente preenchido. Você deve preencher novamente o diretório de trabalho com o conteúdo do arquivo `$GIT_DIR/info/sparse-checkout` da seguinte maneira:"
 
 #. type: delimited block -
 #: en/git-read-tree.txt:428
@@ -45487,11 +40086,7 @@ msgstr "/*\n"
 #: en/git-read-tree.txt:434
 #, priority:100
 msgid "Then you can disable sparse checkout. Sparse checkout support in 'git read-tree' and similar commands is disabled by default. You need to turn `core.sparseCheckout` on in order to have sparse checkout support."
-msgstr ""
-"Em seguida você pode desativar a averiguação esparsa. A predefinição da "
-"compatibilidade à averiguação esparsa no 'git read-tree' e comandos "
-"similares é desativada. Você precisa ativar o `core.sparseCheckout` para ter "
-"uma compatibilidade escassa da averiguação."
+msgstr "Em seguida você pode desativar a averiguação esparsa. A predefinição da compatibilidade à averiguação esparsa no 'git read-tree' e comandos similares é desativada. Você precisa ativar o `core.sparseCheckout` para ter uma compatibilidade escassa da averiguação."
 
 #. type: Plain text
 #: en/git-read-tree.txt:440
@@ -45523,84 +40118,51 @@ msgid ""
 msgstr ""
 "'git rebase' [-i | --interactive] [<opções>] [--exec <cmd>]\n"
 "\t[--onto <nova-base> | --keep-base] [<upstream> [<ramo>]]\n"
-"'git rebase' [-i | --interactive] [<opções>] [--exec <cmd>] [--onto <nova-"
-"base>]\n"
+"'git rebase' [-i | --interactive] [<opções>] [--exec <cmd>] [--onto <nova-base>]\n"
 "\t--root [<ramo>]\n"
-"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-"
-"current-patch)\n"
+"'git rebase' (--continue | --skip | --abort | --quit | --edit-todo | --show-current-patch)\n"
 
 #. type: Plain text
 #: en/git-rebase.txt:22
 #, priority:100
 msgid "If <branch> is specified, 'git rebase' will perform an automatic `git switch <branch>` before doing anything else.  Otherwise it remains on the current branch."
-msgstr ""
-"Caso o <ramo> seja utilizado, o comando 'git rebase' executará um `git "
-"switch <ramo>` automaticamente antes de fazer qualquer outra coisa.  Caso "
-"contrário, ele permanecerá no ramo atual."
+msgstr "Caso o <ramo> seja utilizado, o comando 'git rebase' executará um `git switch <ramo>` automaticamente antes de fazer qualquer outra coisa.  Caso contrário, ele permanecerá no ramo atual."
 
 #. type: Plain text
 #: en/git-rebase.txt:28
 #, priority:100
 msgid "If <upstream> is not specified, the upstream configured in branch.<name>.remote and branch.<name>.merge options will be used (see linkgit:git-config[1] for details) and the `--fork-point` option is assumed.  If you are currently not on any branch or if the current branch does not have a configured upstream, the rebase will abort."
-msgstr ""
-"Caso o `<upstream>` não seja definido, as opções \"upstream\" configuradas "
-"em `branch.<nome>.remote` e no `branch.<nome>.merge` serão utilizadas (para "
-"mais detalhes consulte linkgit:git-config[1]), assim como será assumida a "
-"opção `--fork-point`.  Caso você não esteja atualmente em nenhuma "
-"ramificação ou se a ramificação atual não tiver um \"upstream\" configurado, "
-"o \"rebase\" será cancelado."
+msgstr "Caso o `<upstream>` não seja definido, as opções \"upstream\" configuradas em `branch.<nome>.remote` e no `branch.<nome>.merge` serão utilizadas (para mais detalhes consulte linkgit:git-config[1]), assim como será assumida a opção `--fork-point`.  Caso você não esteja atualmente em nenhuma ramificação ou se a ramificação atual não tiver um \"upstream\" configurado, o \"rebase\" será cancelado."
 
 #. type: Plain text
 #: en/git-rebase.txt:35
 #, priority:100
 msgid "All changes made by commits in the current branch but that are not in <upstream> are saved to a temporary area.  This is the same set of commits that would be shown by `git log <upstream>..HEAD`; or by `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--fork-point` below); or by `git log HEAD`, if the `--root` option is specified."
-msgstr ""
-"Todas as alterações feitas através de commits no ramo atual, mas que não "
-"estão na <upstream>, são salvas em uma área temporária.  Este é o mesmo "
-"conjunto dos commits que seriam exibidos por `git log <upstream>..HEAD`; ou "
-"pelo comando `git log 'fork_point'..HEAD`, caso `--fork-point` esteja ativo ("
-"veja a descrição em `--fork-point` abaixo); ou através do `git log HEAD`, "
-"caso a opção `--root` for seja utilizada."
+msgstr "Todas as alterações feitas através de commits no ramo atual, mas que não estão na <upstream>, são salvas em uma área temporária.  Este é o mesmo conjunto dos commits que seriam exibidos por `git log <upstream>..HEAD`; ou pelo comando `git log 'fork_point'..HEAD`, caso `--fork-point` esteja ativo (veja a descrição em `--fork-point` abaixo); ou através do `git log HEAD`, caso a opção `--root` for seja utilizada."
 
 #. type: Plain text
 #: en/git-rebase.txt:40
 #, priority:100
 msgid "The current branch is reset to <upstream>, or <newbase> if the --onto option was supplied.  This has the exact same effect as `git reset --hard <upstream>` (or <newbase>).  ORIG_HEAD is set to point at the tip of the branch before the reset."
-msgstr ""
-"A ramificação atual é redefinida para <upstream> ou <newbase> caso a opção "
-"`--onto` seja utilizada.  Isso tem exatamente o mesmo efeito que `git reset "
-"--hard <upstream>` (ou <newbase>).  O `ORIG_HEAD` está definido para apontar "
-"no cume do ramo antes da redefinição."
+msgstr "A ramificação atual é redefinida para <upstream> ou <newbase> caso a opção `--onto` seja utilizada.  Isso tem exatamente o mesmo efeito que `git reset --hard <upstream>` (ou <newbase>).  O `ORIG_HEAD` está definido para apontar no cume do ramo antes da redefinição."
 
 #. type: Plain text
 #: en/git-rebase.txt:46
 #, priority:100
 msgid "The commits that were previously saved into the temporary area are then reapplied to the current branch, one by one, in order. Note that any commits in HEAD which introduce the same textual changes as a commit in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a different commit message or timestamp will be skipped)."
-msgstr ""
-"Os commits que foram salvos anteriormente na área temporária são reaplicadas "
-"no ramo atual, uma por uma e em ordem. Observe que quaisquer commits no "
-"`HEAD` que introduzam as mesmas alterações textuais que um commit no `HEAD`"
-".. `<upstream>` são omitidas (ou seja, um patch já aceito na inicial com uma "
-"mensagem de commit ou carimbo de data e hora diferente, serão ignorados)."
+msgstr "Os commits que foram salvos anteriormente na área temporária são reaplicadas no ramo atual, uma por uma e em ordem. Observe que quaisquer commits no `HEAD` que introduzam as mesmas alterações textuais que um commit no `HEAD`.. `<upstream>` são omitidas (ou seja, um patch já aceito na inicial com uma mensagem de commit ou carimbo de data e hora diferente, serão ignorados)."
 
 #. type: Plain text
 #: en/git-rebase.txt:53
 #, priority:100
 msgid "It is possible that a merge failure will prevent this process from being completely automatic.  You will have to resolve any such merge failure and run `git rebase --continue`.  Another option is to bypass the commit that caused the merge failure with `git rebase --skip`.  To check out the original <branch> and remove the .git/rebase-apply working files, use the command `git rebase --abort` instead."
-msgstr ""
-"É possível que uma falha da mesclagem impeça que este processo seja "
-"completamente automático.  Você terá que resolver qualquer falha da "
-"mesclagem e executar o comando `git rebase --continue`.  Outra opção é "
-"ignorar o commit que causou a falha da mesclagem com o comando `git rebase "
-"--skip`.  Para verificar o <ramo> original e remover os arquivos de trabalho "
-"'.git/rebase-apply', utilize o comando `git rebase --abort`."
+msgstr "É possível que uma falha da mesclagem impeça que este processo seja completamente automático.  Você terá que resolver qualquer falha da mesclagem e executar o comando `git rebase --continue`.  Outra opção é ignorar o commit que causou a falha da mesclagem com o comando `git rebase --skip`.  Para verificar o <ramo> original e remover os arquivos de trabalho '.git/rebase-apply', utilize o comando `git rebase --abort`."
 
 #. type: Plain text
 #: en/git-rebase.txt:55
 #, priority:100
 msgid "Assume the following history exists and the current branch is \"topic\":"
-msgstr ""
-"Suponha que o seguinte histórico exista e que o ramo atual seja \"topic\":"
+msgstr "Suponha que o seguinte histórico exista e que o ramo atual seja \"topic\":"
 
 #. type: delimited block -
 #: en/git-rebase.txt:60
@@ -45656,22 +40218,15 @@ msgid ""
 "followed by `git rebase master`. When rebase exits `topic` will\n"
 "remain the checked-out branch.\n"
 msgstr ""
-"*OBSERVAÇÃO:* Este último formulário é apenas uma abreviação de `git "
-"checkout topic`\n"
-"seguido por `git rebase master`. Quando a reconstrução (rebase) sair do "
-"`topic` será\n"
+"*OBSERVAÇÃO:* Este último formulário é apenas uma abreviação de `git checkout topic`\n"
+"seguido por `git rebase master`. Quando a reconstrução (rebase) sair do `topic` será\n"
 "mantido o ramo que foi averiguado.\n"
 
 #. type: Plain text
 #: en/git-rebase.txt:85
 #, priority:100
 msgid "If the upstream branch already contains a change you have made (e.g., because you mailed a patch which was applied upstream), then that commit will be skipped. For example, running `git rebase master` on the following history (in which `A'` and `A` introduce the same set of changes, but have different committer information):"
-msgstr ""
-"Caso a ramificação upstream já contiver uma alteração que você fez (porque "
-"você enviou um patch que foi aplicado na upstream por exemplo), então este "
-"commit será ignorado. Por exemplo, executando o comando `git rebase master` "
-"no histórico a seguir (onde `A'` e `A` introduzem o mesmo conjunto de "
-"alterações, mas possuem informações diferentes de quem fez o commit):"
+msgstr "Caso a ramificação upstream já contiver uma alteração que você fez (porque você enviou um patch que foi aplicado na upstream por exemplo), então este commit será ignorado. Por exemplo, executando o comando `git rebase master` no histórico a seguir (onde `A'` e `A` introduzem o mesmo conjunto de alterações, mas possuem informações diferentes de quem fez o commit):"
 
 #. type: delimited block -
 #: en/git-rebase.txt:90
@@ -45707,19 +40262,13 @@ msgstr ""
 #: en/git-rebase.txt:103
 #, priority:100
 msgid "Here is how you would transplant a topic branch based on one branch to another, to pretend that you forked the topic branch from the latter branch, using `rebase --onto`."
-msgstr ""
-"Aqui está como você transplantaria um ramo do tópico com base em um ramo "
-"para outro, para fingir que você bifurcou o ramo do tópico deste último "
-"ramo, utilizando `rebase --onto`."
+msgstr "Aqui está como você transplantaria um ramo do tópico com base em um ramo para outro, para fingir que você bifurcou o ramo do tópico deste último ramo, utilizando `rebase --onto`."
 
 #. type: Plain text
 #: en/git-rebase.txt:107
 #, priority:100
 msgid "First let's assume your 'topic' is based on branch 'next'.  For example, a feature developed in 'topic' depends on some functionality which is found in 'next'."
-msgstr ""
-"Primeiro, vamos supor que o seu 'tópico' seja baseado no ramo 'next'.  Por "
-"exemplo, um recurso desenvolvido em 'topic' depende de algumas "
-"funcionalidades encontradas em 'next'."
+msgstr "Primeiro, vamos supor que o seu 'tópico' seja baseado no ramo 'next'.  Por exemplo, um recurso desenvolvido em 'topic' depende de algumas funcionalidades encontradas em 'next'."
 
 #. type: delimited block -
 #: en/git-rebase.txt:114
@@ -45741,10 +40290,7 @@ msgstr ""
 #: en/git-rebase.txt:119
 #, priority:100
 msgid "We want to make 'topic' forked from branch 'master'; for example, because the functionality on which 'topic' depends was merged into the more stable 'master' branch. We want our tree to look like this:"
-msgstr ""
-"Queremos criar um 'tópico' bifurcado no ramo 'master'; porque a "
-"funcionalidade da qual o 'tópico' depende foi mesclado na ramificação "
-"'master' mais estável. Queremos que a nossa árvore fique assim:"
+msgstr "Queremos criar um 'tópico' bifurcado no ramo 'master'; porque a funcionalidade da qual o 'tópico' depende foi mesclado na ramificação 'master' mais estável. Queremos que a nossa árvore fique assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:126
@@ -45778,9 +40324,7 @@ msgstr "    git rebase --onto master next topic\n"
 #: en/git-rebase.txt:135
 #, priority:100
 msgid "Another example of --onto option is to rebase part of a branch.  If we have the following situation:"
-msgstr ""
-"Um outro exemplo da opção `--onto` é reconstruir a fundação da parte de uma "
-"ramificação.  Se tivermos a seguinte situação:"
+msgstr "Um outro exemplo da opção `--onto` é reconstruir a fundação da parte de uma ramificação.  Se tivermos a seguinte situação:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:142
@@ -45842,9 +40386,7 @@ msgstr "É útil quando o 'topicB' não depender do 'topicA'."
 #: en/git-rebase.txt:162
 #, priority:100
 msgid "A range of commits could also be removed with rebase.  If we have the following situation:"
-msgstr ""
-"Um intervalo dos commits também pode ser removido com a reconstrução "
-"'rebase'.  Se tivermos a seguinte situação:"
+msgstr "Um intervalo dos commits também pode ser removido com a reconstrução 'rebase'.  Se tivermos a seguinte situação:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:165
@@ -45874,22 +40416,13 @@ msgstr "    E---H'---I'---J'  topicA\n"
 #: en/git-rebase.txt:180
 #, priority:100
 msgid "This is useful if F and G were flawed in some way, or should not be part of topicA.  Note that the argument to --onto and the <upstream> parameter can be any valid commit-ish."
-msgstr ""
-"É útil caso 'F' e 'G' estejam de alguma forma com defeitos ou não deveriam "
-"fazer parte do 'topicA'.  Observe que o argumento para '--onto' e o "
-"parâmetro '<upstream>' podem ser qualquer 'commit-ish' válido."
+msgstr "É útil caso 'F' e 'G' estejam de alguma forma com defeitos ou não deveriam fazer parte do 'topicA'.  Observe que o argumento para '--onto' e o parâmetro '<upstream>' podem ser qualquer 'commit-ish' válido."
 
 #. type: Plain text
 #: en/git-rebase.txt:186
 #, priority:100
 msgid "In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree.  You can use 'git diff' to locate the markers (<<<<<<) and make edits to resolve the conflict.  For each file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with"
-msgstr ""
-"Em caso de conflito, o 'git rebase' irá parar no primeiro commit "
-"problemático e deixar os marcadores de conflito na árvore.  Você pode "
-"utilizar o 'git diff' para localizar os marcadores (<<<<<<) e fazer edições "
-"para resolver o conflito.  Para cada arquivo que você edita, é necessário "
-"informar ao Git que o conflito foi resolvido, normalmente isso seria feito "
-"com"
+msgstr "Em caso de conflito, o 'git rebase' irá parar no primeiro commit problemático e deixar os marcadores de conflito na árvore.  Você pode utilizar o 'git diff' para localizar os marcadores (<<<<<<) e fazer edições para resolver o conflito.  Para cada arquivo que você edita, é necessário informar ao Git que o conflito foi resolvido, normalmente isso seria feito com"
 
 #. type: Plain text
 #: en/git-rebase.txt:189
@@ -45901,10 +40434,7 @@ msgstr "    git add <nome-do-arquivo>\n"
 #: en/git-rebase.txt:193
 #, priority:100
 msgid "After resolving the conflict manually and updating the index with the desired resolution, you can continue the rebasing process with"
-msgstr ""
-"Depois de resolver o conflito manualmente e atualizar o índice com a "
-"resolução desejada, você pode continuar o processo de reconstrução com o "
-"comando"
+msgstr "Depois de resolver o conflito manualmente e atualizar o índice com a resolução desejada, você pode continuar o processo de reconstrução com o comando"
 
 #. type: Plain text
 #: en/git-rebase.txt:196
@@ -45934,20 +40464,13 @@ msgstr "--onto <nova-base>"
 #: en/git-rebase.txt:215
 #, priority:100
 msgid "Starting point at which to create the new commits. If the --onto option is not specified, the starting point is <upstream>.  May be any valid commit, and not just an existing branch name."
-msgstr ""
-"Ponto de partida onde criar os novos commits. Caso a opção '--onto' não seja "
-"utilizada, o ponto inicial é <upstream>.  Pode ser qualquer commit válido e "
-"não apenas um nome de um ramo já existente."
+msgstr "Ponto de partida onde criar os novos commits. Caso a opção '--onto' não seja utilizada, o ponto inicial é <upstream>.  Pode ser qualquer commit válido e não apenas um nome de um ramo já existente."
 
 #. type: Plain text
 #: en/git-rebase.txt:219
 #, ignore-ellipsis, priority:100
 msgid "As a special case, you may use \"A\\...B\" as a shortcut for the merge base of A and B if there is exactly one merge base. You can leave out at most one of A and B, in which case it defaults to HEAD."
-msgstr ""
-"Como um caso especial, você pode utilizar \"A\\...B\" como um atalho para a "
-"base de mesclagem 'A' e 'B' caso haja exatamente uma base para mesclagem. "
-"Você pode deixar de fora no máximo um de 'A' e 'B'; nesse caso, a "
-"predefinição retorna para `HEAD`."
+msgstr "Como um caso especial, você pode utilizar \"A\\...B\" como um atalho para a base de mesclagem 'A' e 'B' caso haja exatamente uma base para mesclagem. Você pode deixar de fora no máximo um de 'A' e 'B'; nesse caso, a predefinição retorna para `HEAD`."
 
 #. type: Labeled list
 #: en/git-rebase.txt:220
@@ -45959,32 +40482,19 @@ msgstr "--keep-base"
 #: en/git-rebase.txt:225
 #, ignore-ellipsis, priority:100
 msgid "Set the starting point at which to create the new commits to the merge base of <upstream> <branch>. Running 'git rebase --keep-base <upstream> <branch>' is equivalent to running 'git rebase --onto <upstream>... <upstream>'."
-msgstr ""
-"Defina o ponto de partida para criar os novos commits para a mesclagem base "
-"do <upstream> <ramo>. Executando o comando 'git rebase --keep-base "
-"<upstream> <ramo>' é o mesmo que executar o comando 'git rebase --onto "
-"<upstream>... <upstream>'."
+msgstr "Defina o ponto de partida para criar os novos commits para a mesclagem base do <upstream> <ramo>. Executando o comando 'git rebase --keep-base <upstream> <ramo>' é o mesmo que executar o comando 'git rebase --onto <upstream>... <upstream>'."
 
 #. type: Plain text
 #: en/git-rebase.txt:230
 #, priority:100
 msgid "This option is useful in the case where one is developing a feature on top of an upstream branch. While the feature is being worked on, the upstream branch may advance and it may not be the best idea to keep rebasing on top of the upstream but to keep the base commit as-is."
-msgstr ""
-"Esta opção é útil no caso onde se está desenvolvendo um recurso em cima de "
-"um ramo 'upstream'. Enquanto o recurso está sendo trabalhado, o ramo "
-"'upstream' pode avançar e talvez não seja a melhor ideia continuar "
-"reconstruindo no topo do 'upstream', porém manter a base do commit como está."
+msgstr "Esta opção é útil no caso onde se está desenvolvendo um recurso em cima de um ramo 'upstream'. Enquanto o recurso está sendo trabalhado, o ramo 'upstream' pode avançar e talvez não seja a melhor ideia continuar reconstruindo no topo do 'upstream', porém manter a base do commit como está."
 
 #. type: Plain text
 #: en/git-rebase.txt:235
 #, priority:100
 msgid "Although both this option and --fork-point find the merge base between <upstream> and <branch>, this option uses the merge base as the _starting point_ on which new commits will be created, whereas --fork-point uses the merge base to determine the _set of commits_ which will be rebased."
-msgstr ""
-"Embora esta opção e o `--fork-point` encontrem a base da mesclagem entre "
-"<upstream> e <ramo>, esta opção utiliza a base da mesclagem como o _ponto "
-"inicial_ onde os novos commits serão criados, enquanto `--fork-point` "
-"utiliza a mesclagem da base para determinar o _conjunto dos commits_ que "
-"serão reconstruídos."
+msgstr "Embora esta opção e o `--fork-point` encontrem a base da mesclagem entre <upstream> e <ramo>, esta opção utiliza a base da mesclagem como o _ponto inicial_ onde os novos commits serão criados, enquanto `--fork-point` utiliza a mesclagem da base para determinar o _conjunto dos commits_ que serão reconstruídos."
 
 #. type: Plain text
 #: en/git-rebase.txt:237 en/git-rebase.txt:268 en/git-rebase.txt:287 en/git-rebase.txt:308 en/git-rebase.txt:326 en/git-rebase.txt:334 en/git-rebase.txt:359 en/git-rebase.txt:372 en/git-rebase.txt:381 en/git-rebase.txt:426 en/git-rebase.txt:460 en/git-rebase.txt:468 en/git-rebase.txt:475 en/git-rebase.txt:482 en/git-rebase.txt:494 en/git-rebase.txt:534 en/git-rebase.txt:559 en/git-rebase.txt:571 en/git-rebase.txt:590
@@ -45996,53 +40506,40 @@ msgstr "Consulte também a seção \"OPÇÕES INCOMPATÍVEIS\" logo abaixo."
 #: en/git-rebase.txt:242
 #, priority:100
 msgid "Upstream branch to compare against.  May be any valid commit, not just an existing branch name. Defaults to the configured upstream for the current branch."
-msgstr ""
-"Ramo upstream para fazer a comparação.  Pode ser qualquer commit válido, não "
-"apenas um nome de uma ramo já existente. A predefinição retorna para "
-"\"upstream\" configurada para o ramo atual."
+msgstr "Ramo upstream para fazer a comparação.  Pode ser qualquer commit válido, não apenas um nome de uma ramo já existente. A predefinição retorna para \"upstream\" configurada para o ramo atual."
 
 #. type: Plain text
 #: en/git-rebase.txt:248
 #, priority:100
 msgid "Restart the rebasing process after having resolved a merge conflict."
-msgstr ""
-"Reinicie o processo de reformulação após resolver um conflito de mesclagem."
+msgstr "Reinicie o processo de reformulação após resolver um conflito de mesclagem."
 
 #. type: Plain text
 #: en/git-rebase.txt:255
 #, priority:100
 msgid "Abort the rebase operation and reset HEAD to the original branch. If <branch> was provided when the rebase operation was started, then HEAD will be reset to <branch>. Otherwise HEAD will be reset to where it was when the rebase operation was started."
-msgstr ""
-"Interrompa a operação de reconstrução da fundação e redefina o `HEAD` para o "
-"ramo original. Caso <ramo> seja informado quando a operação de reconstrução "
-"da fundação seja iniciada, o `HEAD` será redefinido para <ramo>. Caso "
-"contrário, o HEAD será redefinido para onde estava quando a operação de "
-"reconstrução foi iniciada."
+msgstr "Interrompa a operação de reconstrução da fundação e redefina o `HEAD` para o ramo original. Caso <ramo> seja informado quando a operação de reconstrução da fundação seja iniciada, o `HEAD` será redefinido para <ramo>. Caso contrário, o HEAD será redefinido para onde estava quando a operação de reconstrução foi iniciada."
 
 #. type: Plain text
 #: en/git-rebase.txt:261
 #, priority:100
 msgid "Abort the rebase operation but HEAD is not reset back to the original branch. The index and working tree are also left unchanged as a result. If a temporary stash entry was created using --autostash, it will be saved to the stash list."
-msgstr ""
-"Interrompa a operação de reconstrução, porém o `HEAD` não será redefinido "
-"para o ramo original. Como resultado, o índice e a árvore de trabalho também "
-"permanecem inalterados. Caso uma entrada temporária 'stash' seja criada "
-"utilizando `--autostash`, ela será salva na lista 'stash'."
+msgstr "Interrompa a operação de reconstrução, porém o `HEAD` não será redefinido para o ramo original. Como resultado, o índice e a árvore de trabalho também permanecem inalterados. Caso uma entrada temporária 'stash' seja criada utilizando `--autostash`, ela será salva na lista 'stash'."
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, fuzzy, priority:100
+#| msgid ""
+#| "--apply:\n"
+#| "\tUse applying strategies to rebase (calling `git-am`\n"
+#| "\tinternally).  This option may become a no-op in the future\n"
+#| "\tonce the merge backend handles everything the apply one does.\n"
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 "--apply:\n"
 "\tUtilize estratégias para aplicar o \"rebase\" (invocando `git-am`\n"
 "\tinternamente).  Esta opção poderá se tornar não operacional no futuro\n"
-"\tuma vez que o processo interno da mesclagem processe tudo o que a opção '--"
-"apply' fizer.\n"
+"\tuma vez que o processo interno da mesclagem processe tudo o que a opção '--apply' fizer.\n"
 
 #. type: Labeled list
 #: en/git-rebase.txt:269
@@ -46054,29 +40551,13 @@ msgstr "--empty={drop,keep,ask}"
 #: en/git-rebase.txt:280
 #, priority:100
 msgid "How to handle commits that are not empty to start and are not clean cherry-picks of any upstream commit, but which become empty after rebasing (because they contain a subset of already upstream changes).  With drop (the default), commits that become empty are dropped.  With keep, such commits are kept.  With ask (implied by --interactive), the rebase will halt when an empty commit is applied allowing you to choose whether to drop it, edit files more, or just commit the empty changes.  Other options, like --exec, will use the default of drop unless -i/--interactive is explicitly specified."
-msgstr ""
-"Como lidar com commits que não estão vazias para iniciar e não são escolhas "
-"seletivas limpas de nenhum commit upstream, mas que ficam vazias após a "
-"reconstrução (porque elas já contêm um subconjunto de alterações na upstream)"
-".  Com drop (a predefinição), os commits que ficam vazias são descartadas.  "
-"Com keep, estes commits são mantidos.  Com o comando 'ask' (implícito "
-"através da opção `--interactive`), uma reconstrução 'rebase' será "
-"interrompida quando um commit vazia for aplicado, permitindo que você "
-"escolha se elimina, edita mais arquivos ou apenas faça o commit das "
-"alterações vazias.  Outras opções, como `--exec`, utilizarão a predefinição "
-"'drop', a menos que a opção `-i/--interactive` seja informado de forma "
-"explicita."
+msgstr "Como lidar com commits que não estão vazias para iniciar e não são escolhas seletivas limpas de nenhum commit upstream, mas que ficam vazias após a reconstrução (porque elas já contêm um subconjunto de alterações na upstream).  Com drop (a predefinição), os commits que ficam vazias são descartadas.  Com keep, estes commits são mantidos.  Com o comando 'ask' (implícito através da opção `--interactive`), uma reconstrução 'rebase' será interrompida quando um commit vazia for aplicado, permitindo que você escolha se elimina, edita mais arquivos ou apenas faça o commit das alterações vazias.  Outras opções, como `--exec`, utilizarão a predefinição 'drop', a menos que a opção `-i/--interactive` seja informado de forma explicita."
 
 #. type: Plain text
 #: en/git-rebase.txt:285
 #, ignore-ellipsis, priority:100
 msgid "Note that commits which start empty are kept (unless --no-keep-empty is specified), and commits which are clean cherry-picks (as determined by `git log --cherry-mark ...`) are detected and dropped as a preliminary step (unless --reapply-cherry-picks is passed)."
-msgstr ""
-"Observe que, os commits que começam vazios são mantidos (a menos que a opção "
-"`--no-keep-empty` seja utilizado) e os commits que são escolhas limpas ("
-"conforme determinado pelo comando `git log --cherry-mark ...`) são "
-"detectados e descartados como uma etapa preliminar (a menos que a opção "
-"`--reapply-cherry-picks seja utilizado)."
+msgstr "Observe que, os commits que começam vazios são mantidos (a menos que a opção `--no-keep-empty` seja utilizado) e os commits que são escolhas limpas (conforme determinado pelo comando `git log --cherry-mark ...`) são detectados e descartados como uma etapa preliminar (a menos que a opção `--reapply-cherry-picks seja utilizado)."
 
 #. type: Plain text
 #: en/git-rebase.txt:288 en/git-rebase.txt:628
@@ -46094,32 +40575,19 @@ msgstr "--keep-empty"
 #: en/git-rebase.txt:297
 #, priority:100
 msgid "Do not keep commits that start empty before the rebase (i.e. that do not change anything from its parent) in the result.  The default is to keep commits which start empty, since creating such commits requires passing the --allow-empty override flag to `git commit`, signifying that a user is very intentionally creating such a commit and thus wants to keep it."
-msgstr ""
-"Não mantenha os commits que começam vazios antes da reconstrução (ou seja, "
-"que não alteram em nada a origem) no resultado.  A predefinição é manter os "
-"commits que começam vazios, pois a criação destes commits requer o "
-"encaminhamento da opção `--allow-empty override` para o comando `git commit`"
-", significa que um usuário está criando intencionalmente tal commit e "
-"portanto, deseja mantê-lo."
+msgstr "Não mantenha os commits que começam vazios antes da reconstrução (ou seja, que não alteram em nada a origem) no resultado.  A predefinição é manter os commits que começam vazios, pois a criação destes commits requer o encaminhamento da opção `--allow-empty override` para o comando `git commit`, significa que um usuário está criando intencionalmente tal commit e portanto, deseja mantê-lo."
 
 #. type: Plain text
 #: en/git-rebase.txt:303
 #, priority:100
 msgid "Usage of this flag will probably be rare, since you can get rid of commits that start empty by just firing up an interactive rebase and removing the lines corresponding to the commits you don't want.  This flag exists as a convenient shortcut, such as for cases where external tools generate many empty commits and you want them all removed."
-msgstr ""
-"A utilização desta opção é bem rara, já que você pode se livrar dos commits "
-"que iniciam vazios simplesmente executando uma reconstrução interativa e "
-"removendo as linhas correspondentes ao commit que você não quer.  Está opção "
-"existe como um atalho por mera conveniência, para casos onde as ferramentas "
-"externas gerem muitos commits vazios e você que todos eles sejam removidos."
+msgstr "A utilização desta opção é bem rara, já que você pode se livrar dos commits que iniciam vazios simplesmente executando uma reconstrução interativa e removendo as linhas correspondentes ao commit que você não quer.  Está opção existe como um atalho por mera conveniência, para casos onde as ferramentas externas gerem muitos commits vazios e você que todos eles sejam removidos."
 
 #. type: Plain text
 #: en/git-rebase.txt:306
 #, priority:100
 msgid "For commits which do not start empty but become empty after rebasing, see the --empty flag."
-msgstr ""
-"Para os commits que não começam vazios, mas ficam vazios após a reconstrução "
-"('rebase'), consulte a opção `--empty`."
+msgstr "Para os commits que não começam vazios, mas ficam vazios após a reconstrução ('rebase'), consulte a opção `--empty`."
 
 #. type: Plain text
 #: en/git-rebase.txt:309 en/git-rebase.txt:630
@@ -46137,47 +40605,31 @@ msgstr "--no-reapply-cherry-picks"
 #: en/git-rebase.txt:316
 #, priority:100
 msgid "Reapply all clean cherry-picks of any upstream commit instead of preemptively dropping them. (If these commits then become empty after rebasing, because they contain a subset of already upstream changes, the behavior towards them is controlled by the `--empty` flag.)"
-msgstr ""
-"Reaplique todas as escolhas seletivas que estejam limpas de qualquer commit "
-"\"upstream\" em vez inviabilizá-los por completo. (Então, caso estes commits "
-"se tornem vazios depois da reconstrução, por conter um subconjunto de "
-"alterações da \"upstream\", o comportamento em direção à eles é controlado "
-"através da opção `--empty`.)"
+msgstr "Reaplique todas as escolhas seletivas que estejam limpas de qualquer commit \"upstream\" em vez inviabilizá-los por completo. (Então, caso estes commits se tornem vazios depois da reconstrução, por conter um subconjunto de alterações da \"upstream\", o comportamento em direção à eles é controlado através da opção `--empty`.)"
 
 #. type: Plain text
 #: en/git-rebase.txt:321
 #, priority:100
 msgid "By default (or if `--no-reapply-cherry-picks` is given), these commits will be automatically dropped.  Because this necessitates reading all upstream commits, this can be expensive in repos with a large number of upstream commits that need to be read."
-msgstr ""
-"É predefinido que (ou se `--no-reapply-cherry-picks 'for fornecido), estes "
-"commits serão automaticamente eliminados.  Como isso requer a leitura de "
-"todos os commits upstream, isso pode custar caro nos repositórios com uma "
-"grande quantidade de commits na upstream que precisam ser lidos."
+msgstr "É predefinido que (ou se `--no-reapply-cherry-picks 'for fornecido), estes commits serão automaticamente eliminados.  Como isso requer a leitura de todos os commits upstream, isso pode custar caro nos repositórios com uma grande quantidade de commits na upstream que precisam ser lidos."
 
 #. type: Plain text
 #: en/git-rebase.txt:324
 #, priority:100
 msgid "`--reapply-cherry-picks` allows rebase to forgo reading all upstream commits, potentially improving performance."
-msgstr ""
-"A opção `--reapply-cherry-picks` permite que a reconstrução anteceda a "
-"leitura de todos os commits \"upstream\", melhorando muito o desempenho."
+msgstr "A opção `--reapply-cherry-picks` permite que a reconstrução anteceda a leitura de todos os commits \"upstream\", melhorando muito o desempenho."
 
 #. type: Plain text
 #: en/git-rebase.txt:332
 #, priority:100
 msgid "No-op.  Rebasing commits with an empty message used to fail and this option would override that behavior, allowing commits with empty messages to be rebased.  Now commits with an empty message do not cause rebasing to halt."
-msgstr ""
-"No-op.  A reconstrução dos commits com uma mensagem vazia costumava falhar, "
-"esta opção substitui este comportamento, permitindo que os commits com "
-"mensagens vazias sejam refeitas.  Agora os commits com uma mensagem vazia "
-"não causam mais a interrupção do \"rebasing\"."
+msgstr "No-op.  A reconstrução dos commits com uma mensagem vazia costumava falhar, esta opção substitui este comportamento, permitindo que os commits com mensagens vazias sejam refeitas.  Agora os commits com uma mensagem vazia não causam mais a interrupção do \"rebasing\"."
 
 #. type: Plain text
 #: en/git-rebase.txt:337
 #, priority:100
 msgid "Restart the rebasing process by skipping the current patch."
-msgstr ""
-"Reinicie o processo de reconstrução da fundação ignorando o patch atual."
+msgstr "Reinicie o processo de reconstrução da fundação ignorando o patch atual."
 
 #. type: Plain text
 #: en/git-rebase.txt:338 en/git-rebase.txt:631
@@ -46201,48 +40653,31 @@ msgstr "--show-current-patch"
 #: en/git-rebase.txt:345
 #, priority:100
 msgid "Show the current patch in an interactive rebase or when rebase is stopped because of conflicts. This is the equivalent of `git show REBASE_HEAD`."
-msgstr ""
-"Exiba o patch atual em uma nova recuperação interativa ou quando a nova "
-"recuperação for interrompida por causa de conflitos. É o equivalente ao `git "
-"show REBASE_HEAD`."
+msgstr "Exiba o patch atual em uma nova recuperação interativa ou quando a nova recuperação for interrompida por causa de conflitos. É o equivalente ao `git show REBASE_HEAD`."
 
 #. type: Plain text
 #: en/git-rebase.txt:351
 #, priority:100
 msgid "Use merging strategies to rebase.  When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side.  This is the default."
-msgstr ""
-"Utilize estratégias de mesclagem para fazer o `rebase`.  Quando a estratégia "
-"de mesclagem recursiva (predefinida) for utilizada, permite que o `rebase` "
-"esteja ciente das renomeações no lado upstream.  Esta é a predefinição."
+msgstr "Utilize estratégias de mesclagem para fazer o `rebase`.  Quando a estratégia de mesclagem recursiva (predefinida) for utilizada, permite que o `rebase` esteja ciente das renomeações no lado upstream.  Esta é a predefinição."
 
 #. type: Plain text
 #: en/git-rebase.txt:357
 #, priority:100
 msgid "Note that a rebase merge works by replaying each commit from the working branch on top of the <upstream> branch.  Because of this, when a merge conflict happens, the side reported as 'ours' is the so-far rebased series, starting with <upstream>, and 'theirs' is the working branch.  In other words, the sides are swapped."
-msgstr ""
-"Observe que uma mesclagem de reconstrução (rebase) funciona repetindo cada "
-"commit da ramificação de trabalho na parte do topo <upstream>.  Por esse "
-"motivo, quando ocorre um conflito na mesclagem, o lado relatado como 'nosso' "
-"é a série até agora reformulada, começando com <upstream> e 'deles' é o ramo "
-"de trabalho.  Em outras palavras, os lados são trocados."
+msgstr "Observe que uma mesclagem de reconstrução (rebase) funciona repetindo cada commit da ramificação de trabalho na parte do topo <upstream>.  Por esse motivo, quando ocorre um conflito na mesclagem, o lado relatado como 'nosso' é a série até agora reformulada, começando com <upstream> e 'deles' é o ramo de trabalho.  Em outras palavras, os lados são trocados."
 
 #. type: Plain text
 #: en/git-rebase.txt:365
 #, priority:100
 msgid "Use the given merge strategy.  If there is no `-s` option 'git merge-recursive' is used instead.  This implies --merge."
-msgstr ""
-"Use a estratégia de mesclagem informada.  Caso não haja a opção `-s ', o git "
-"merge-recursive' será utilizado em seu lugar.  implica no uso da opção '--"
-"merge'."
+msgstr "Use a estratégia de mesclagem informada.  Caso não haja a opção `-s ', o git merge-recursive' será utilizado em seu lugar.  implica no uso da opção '--merge'."
 
 #. type: Plain text
 #: en/git-rebase.txt:370
 #, priority:100
 msgid "Because 'git rebase' replays each commit from the working branch on top of the <upstream> branch using the given strategy, using the 'ours' strategy simply empties all patches from the <branch>, which makes little sense."
-msgstr ""
-"Como o 'git rebase' repete cada commit do ramo de trabalho no cume do ramo "
-"<upstream> utilizando a estratégia informada, o uso da estratégia 'our' "
-"simplesmente esvazia todos os patches do <ramo>, que faz pouco sentido."
+msgstr "Como o 'git rebase' repete cada commit do ramo de trabalho no cume do ramo <upstream> utilizando a estratégia informada, o uso da estratégia 'our' simplesmente esvazia todos os patches do <ramo>, que faz pouco sentido."
 
 #. type: Labeled list
 #: en/git-rebase.txt:373
@@ -46260,11 +40695,7 @@ msgstr "--strategy-option=<opção-da-estratégia>"
 #: en/git-rebase.txt:379
 #, priority:100
 msgid "Pass the <strategy-option> through to the merge strategy.  This implies `--merge` and, if no strategy has been specified, `-s recursive`.  Note the reversal of 'ours' and 'theirs' as noted above for the `-m` option."
-msgstr ""
-"Encaminhe a <opção-de-estratégia> para a estratégia da mesclagem.  implica "
-"no uso da opção `--merge` e, se nenhuma estratégia foi definida, `-s "
-"recursive`.  Observe a reversão do 'ours' (nossos) e 'theirs' (deles), "
-"conforme observado acima para a opção `-m`."
+msgstr "Encaminhe a <opção-de-estratégia> para a estratégia da mesclagem.  implica no uso da opção `--merge` e, se nenhuma estratégia foi definida, `-s recursive`.  Observe a reversão do 'ours' (nossos) e 'theirs' (deles), conforme observado acima para a opção `-m`."
 
 #. type: Plain text
 #: en/git-rebase.txt:399
@@ -46282,18 +40713,13 @@ msgstr "Seja loquaz. Implica no uso de `--stat`."
 #: en/git-rebase.txt:407
 #, priority:100
 msgid "Show a diffstat of what changed upstream since the last rebase. The diffstat is also controlled by the configuration option rebase.stat."
-msgstr ""
-"Exiba uma descrição do que mudou na upstream desde a última reconstrução "
-"(rebase). O diffstat também é controlado pela opção de configuração `rebase."
-"stat`."
+msgstr "Exiba uma descrição do que mudou na upstream desde a última reconstrução (rebase). O diffstat também é controlado pela opção de configuração `rebase.stat`."
 
 #. type: Plain text
 #: en/git-rebase.txt:411
 #, priority:100
 msgid "Do not show a diffstat as part of the rebase process."
-msgstr ""
-"Não mostre um \"diffstat\" como parte do processo de reconstrução da "
-"fundação (rebase)."
+msgstr "Não mostre um \"diffstat\" como parte do processo de reconstrução da fundação (rebase)."
 
 #. type: Plain text
 #: en/git-rebase.txt:414
@@ -46335,21 +40761,13 @@ msgstr "--force-rebase"
 #: en/git-rebase.txt:433
 #, priority:100
 msgid "Individually replay all rebased commits instead of fast-forwarding over the unchanged ones.  This ensures that the entire history of the rebased branch is composed of new commits."
-msgstr ""
-"Reproduza individualmente todos os commits reconstruídos em vez de avançar "
-"rapidamente sobre os que estejam inalterados.  Isso garante que todo o "
-"histórico do ramo reconstruído seja composto por novos commits."
+msgstr "Reproduza individualmente todos os commits reconstruídos em vez de avançar rapidamente sobre os que estejam inalterados.  Isso garante que todo o histórico do ramo reconstruído seja composto por novos commits."
 
 #. type: Plain text
 #: en/git-rebase.txt:439
 #, priority:100
 msgid "You may find this helpful after reverting a topic branch merge, as this option recreates the topic branch with fresh commits so it can be remerged successfully without needing to \"revert the reversion\" (see the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
-msgstr ""
-"Pode ser útil depois de reverter uma mesclagem do ramo \"topic\", pois esta "
-"opção recria o ramo \"topic\" com os novos commits, para que possa ser "
-"recuperado com êxito sem precisar \"reverter a reversão\" (para mais "
-"detalhes, consulte o link: howto/revert-a-fafe-merge.html [Como reverter uma "
-"falha da mesclagem])."
+msgstr "Pode ser útil depois de reverter uma mesclagem do ramo \"topic\", pois esta opção recria o ramo \"topic\" com os novos commits, para que possa ser recuperado com êxito sem precisar \"reverter a reversão\" (para mais detalhes, consulte o link: howto/revert-a-fafe-merge.html [Como reverter uma falha da mesclagem])."
 
 #. type: Labeled list
 #: en/git-rebase.txt:441
@@ -46361,38 +40779,25 @@ msgstr "--no-fork-point"
 #: en/git-rebase.txt:445
 #, priority:100
 msgid "Use reflog to find a better common ancestor between <upstream> and <branch> when calculating which commits have been introduced by <branch>."
-msgstr ""
-"Utilize reflog para encontrar um ancestral comum melhor entre a <upstream> e "
-"o <ramo> ao calcular quais os commits foram introduzidos pelo <ramo>."
+msgstr "Utilize reflog para encontrar um ancestral comum melhor entre a <upstream> e o <ramo> ao calcular quais os commits foram introduzidos pelo <ramo>."
 
 #. type: Plain text
 #: en/git-rebase.txt:451
 #, priority:100
 msgid "When --fork-point is active, 'fork_point' will be used instead of <upstream> to calculate the set of commits to rebase, where 'fork_point' is the result of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:git-merge-base[1]).  If 'fork_point' ends up being empty, the <upstream> will be used as a fallback."
-msgstr ""
-"Quando \"--fork-point\" está ativo o 'fork_point' será utilizado em vez do "
-"`<upstream>` calcular o conjunto dos commits para fazer o \"rebase\" onde "
-"'fork_point' é o resultado do comando `git merge-base --fork-point "
-"<upstream> <ramo>` (consulte linkgit:git-merge-base[1]).  Caso o "
-"'fork_point' termine vazio, o `<upstream>` será utilizado como substituto."
+msgstr "Quando \"--fork-point\" está ativo o 'fork_point' será utilizado em vez do `<upstream>` calcular o conjunto dos commits para fazer o \"rebase\" onde 'fork_point' é o resultado do comando `git merge-base --fork-point <upstream> <ramo>` (consulte linkgit:git-merge-base[1]).  Caso o 'fork_point' termine vazio, o `<upstream>` será utilizado como substituto."
 
 #. type: Plain text
 #: en/git-rebase.txt:454
 #, priority:100
 msgid "If <upstream> is given on the command line, then the default is `--no-fork-point`, otherwise the default is `--fork-point`."
-msgstr ""
-"Caso a <upstream> seja utilizada na linha de comando, a predefinição será "
-"`--no-fork-point`, caso contrário, a predefinição será `--fork-point`."
+msgstr "Caso a <upstream> seja utilizada na linha de comando, a predefinição será `--no-fork-point`, caso contrário, a predefinição será `--fork-point`."
 
 #. type: Plain text
 #: en/git-rebase.txt:458
 #, priority:100
 msgid "If your branch was based on <upstream> but <upstream> was rewound and your branch contains commits which were dropped, this option can be used with `--keep-base` in order to drop those commits from your branch."
-msgstr ""
-"Caso o seu ramo teve como base no <upstream>, porém <upstream> foi "
-"retrocedido e o seu ramo contém commits que foram eliminados, esta opção "
-"pode ser utilizada com a opção `--keep-base` para eliminar estes commits do "
-"seu ramo."
+msgstr "Caso o seu ramo teve como base no <upstream>, porém <upstream> foi retrocedido e o seu ramo contém commits que foram eliminados, esta opção pode ser utilizada com a opção `--keep-base` para eliminar estes commits do seu ramo."
 
 #. type: Plain text
 #: en/git-rebase.txt:466
@@ -46404,38 +40809,25 @@ msgstr "Estas opções são repassados para o comando 'git apply' que aplica o p
 #: en/git-rebase.txt:473
 #, priority:100
 msgid "These flags are passed to 'git am' to easily change the dates of the rebased commits (see linkgit:git-am[1])."
-msgstr ""
-"Estas opções são passados para o comando 'git am' para alterar facilmente as "
-"datas dos commits onde o \"rebase\" foi feito (consulte linkgit:git-am[1])."
+msgstr "Estas opções são passados para o comando 'git am' para alterar facilmente as datas dos commits onde o \"rebase\" foi feito (consulte linkgit:git-am[1])."
 
 #. type: Plain text
 #: en/git-rebase.txt:480
 #, priority:100
 msgid "Add a Signed-off-by: trailer to all the rebased commits. Note that if `--interactive` is given then only commits marked to be picked, edited or reworded will have the trailer added."
-msgstr ""
-"Adicione uma resposta Assinado-por: a todos os commits que tiveram a sua "
-"fundação reconstruída. Observe que caso a opção `--interactive` seja "
-"utilizada, apenas os commit marcados para serem selecionados, editados ou "
-"reformulados terão um caracteres de resposta adicionado."
+msgstr "Adicione uma resposta Assinado-por: a todos os commits que tiveram a sua fundação reconstruída. Observe que caso a opção `--interactive` seja utilizada, apenas os commit marcados para serem selecionados, editados ou reformulados terão um caracteres de resposta adicionado."
 
 #. type: Plain text
 #: en/git-rebase.txt:488
 #, priority:100
 msgid "Make a list of the commits which are about to be rebased.  Let the user edit that list before rebasing.  This mode can also be used to split commits (see SPLITTING COMMITS below)."
-msgstr ""
-"Faça uma lista dos commits que estão prestes a serem reconstruídos.  Deixe "
-"que o usuário edite esta lista antes da reconstrução.  Este modo também pode "
-"ser utilizado para dividir os commits (consulte 'DIVIDINDO OS COMMITS' "
-"abaixo)."
+msgstr "Faça uma lista dos commits que estão prestes a serem reconstruídos.  Deixe que o usuário edite esta lista antes da reconstrução.  Este modo também pode ser utilizado para dividir os commits (consulte 'DIVIDINDO OS COMMITS' abaixo)."
 
 #. type: Plain text
 #: en/git-rebase.txt:492
 #, priority:100
 msgid "The commit list format can be changed by setting the configuration option rebase.instructionFormat.  A customized instruction format will automatically have the long commit hash prepended to the format."
-msgstr ""
-"O formato da lista dos commits pode ser alterado definindo a opção de "
-"configuração `rebase.instructionFormat`.  Um formato de instrução "
-"personalizado terá automaticamente o hash longo do commit anexado ao formato."
+msgstr "O formato da lista dos commits pode ser alterado definindo a opção de configuração `rebase.instructionFormat`.  Um formato de instrução personalizado terá automaticamente o hash longo do commit anexado ao formato."
 
 #. type: Labeled list
 #: en/git-rebase.txt:496
@@ -46447,53 +40839,31 @@ msgstr "--rebase-merges[=(rebase-cousins|no-rebase-cousins)]"
 #: en/git-rebase.txt:504
 #, priority:100
 msgid "By default, a rebase will simply drop merge commits from the todo list, and put the rebased commits into a single, linear branch.  With `--rebase-merges`, the rebase will instead try to preserve the branching structure within the commits that are to be rebased, by recreating the merge commits. Any resolved merge conflicts or manual amendments in these merge commits will have to be resolved/re-applied manually."
-msgstr ""
-"É predefinido que uma reconstrução simplesmente remova os commits mesclados "
-"da lista de tarefas e as coloca em uma única ramificação linear.  Com a "
-"opção `--rebase-merges`, a reconstrução tentará preservar a estrutura da "
-"ramificação dentro dos commits que serão reexaminadas, recriando a mesclagem "
-"dos commits. Quaisquer conflitos na mesclagem que forem resolvidos ou nas "
-"alterações manuais destes commits mesclados terão que ser resolvidos/"
-"reaplicados manualmente."
+msgstr "É predefinido que uma reconstrução simplesmente remova os commits mesclados da lista de tarefas e as coloca em uma única ramificação linear.  Com a opção `--rebase-merges`, a reconstrução tentará preservar a estrutura da ramificação dentro dos commits que serão reexaminadas, recriando a mesclagem dos commits. Quaisquer conflitos na mesclagem que forem resolvidos ou nas alterações manuais destes commits mesclados terão que ser resolvidos/reaplicados manualmente."
 
 #. type: Plain text
 #: en/git-rebase.txt:511
 #, priority:100
 msgid "By default, or when `no-rebase-cousins` was specified, commits which do not have `<upstream>` as direct ancestor will keep their original branch point, i.e. commits that would be excluded by linkgit:git-log[1]'s `--ancestry-path` option will keep their original ancestry by default. If the `rebase-cousins` mode is turned on, such commits are instead rebased onto `<upstream>` (or `<onto>`, if specified)."
-msgstr ""
-"É predefinido que ou quando `no-rebase-cousins` seja utilizado, os commits "
-"que não possuam `<upstream>` como ancestral direto, manterão o seu ponto do "
-"ramo original, ou seja, os commits que seriam excluídos pela opção linkgit"
-":git-log[1] `--ancestry-path`, por predefinição manterá a sua ancestralidade "
-"original. Caso o modo `rebase-cousins` esteja ativo, estes commits serão "
-"reconstruídos para a `<upstream>` (ou `<onto>`, caso seja utilizado)."
+msgstr "É predefinido que ou quando `no-rebase-cousins` seja utilizado, os commits que não possuam `<upstream>` como ancestral direto, manterão o seu ponto do ramo original, ou seja, os commits que seriam excluídos pela opção linkgit:git-log[1] `--ancestry-path`, por predefinição manterá a sua ancestralidade original. Caso o modo `rebase-cousins` esteja ativo, estes commits serão reconstruídos para a `<upstream>` (ou `<onto>`, caso seja utilizado)."
 
 #. type: Plain text
 #: en/git-rebase.txt:515
 #, priority:100
 msgid "The `--rebase-merges` mode is similar in spirit to the deprecated `--preserve-merges` but works with interactive rebases, where commits can be reordered, inserted and dropped at will."
-msgstr ""
-"O modo `--rebase-merges` é semelhante (em espírito) a opção descontinuada "
-"`--preserve-merges` porém trabalha com reconstrução interativa (rebases), "
-"onde os commits possam ser reordenados, inseridos ou eliminados a vontade."
+msgstr "O modo `--rebase-merges` é semelhante (em espírito) a opção descontinuada `--preserve-merges` porém trabalha com reconstrução interativa (rebases), onde os commits possam ser reordenados, inseridos ou eliminados a vontade."
 
 #. type: Plain text
 #: en/git-rebase.txt:519
 #, ignore-ellipsis, priority:100
 msgid "It is currently only possible to recreate the merge commits using the `recursive` merge strategy; Different merge strategies can be used only via explicit `exec git merge -s <strategy> [...]` commands."
-msgstr ""
-"Atualmente, só é possível recriar a mesclagem dos commits utilizando a "
-"estratégia de mesclagem `recursive` (recursiva); Diferentes estratégias de "
-"mesclagem podem ser utilizada apenas através dos comandos explícitos como `"
-"exec git merge -s <strategy> [...]`."
+msgstr "Atualmente, só é possível recriar a mesclagem dos commits utilizando a estratégia de mesclagem `recursive` (recursiva); Diferentes estratégias de mesclagem podem ser utilizada apenas através dos comandos explícitos como `exec git merge -s <strategy> [...]`."
 
 #. type: Plain text
 #: en/git-rebase.txt:521
 #, priority:100
 msgid "See also REBASING MERGES and INCOMPATIBLE OPTIONS below."
-msgstr ""
-"Consulte também 'RECONSTRUINDO AS MESCLAGENS' e 'OPÇÕES INCOMPATÍVEIS' "
-"abaixo."
+msgstr "Consulte também 'RECONSTRUINDO AS MESCLAGENS' e 'OPÇÕES INCOMPATÍVEIS' abaixo."
 
 #. type: Plain text
 #: en/git-rebase.txt:523 en/git-rebase.txt:625
@@ -46505,20 +40875,13 @@ msgstr "--preserve-merges"
 #: en/git-rebase.txt:528
 #, priority:100
 msgid "[DEPRECATED: use `--rebase-merges` instead] Recreate merge commits instead of flattening the history by replaying commits a merge commit introduces. Merge conflict resolutions or manual amendments to merge commits are not preserved."
-msgstr ""
-"[DESCONTINUADO: utilize `--rebase-merges`] Recrie os commits mesclados em "
-"vez de achatar o histórico, reproduzindo os commits introduzidos por uma "
-"mesclagem do commit. As resoluções dos conflitos da mesclagem ou das emendas "
-"manuais para mesclar os commits não são preservadas."
+msgstr "[DESCONTINUADO: utilize `--rebase-merges`] Recrie os commits mesclados em vez de achatar o histórico, reproduzindo os commits introduzidos por uma mesclagem do commit. As resoluções dos conflitos da mesclagem ou das emendas manuais para mesclar os commits não são preservadas."
 
 #. type: Plain text
 #: en/git-rebase.txt:532
 #, priority:100
 msgid "This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good idea unless you know what you are doing (see BUGS below)."
-msgstr ""
-"Utiliza o mecanismo `--interactive` internamente, porém ao combiná-lo com a "
-"opção `--interactive` de forma explícita, em geral não é uma boa ideia a "
-"menos que saiba o que está fazendo (consulte 'BUGS' abaixo)."
+msgstr "Utiliza o mecanismo `--interactive` internamente, porém ao combiná-lo com a opção `--interactive` de forma explícita, em geral não é uma boa ideia a menos que saiba o que está fazendo (consulte 'BUGS' abaixo)."
 
 #. type: Labeled list
 #: en/git-rebase.txt:535
@@ -46536,19 +40899,13 @@ msgstr "--exec <cmd>"
 #: en/git-rebase.txt:541
 #, priority:100
 msgid "Append \"exec <cmd>\" after each line creating a commit in the final history. <cmd> will be interpreted as one or more shell commands. Any command that fails will interrupt the rebase, with exit code 1."
-msgstr ""
-"Anexe \"exec <cmd>\" após cada linha, criando um commit no final do "
-"histórico. O `<cmd>` será interpretado como um ou mais comandos do shell. "
-"Qualquer comando que falhar interromperá a reconstrução da fundação, com o "
-"código de encerramento igual a 1."
+msgstr "Anexe \"exec <cmd>\" após cada linha, criando um commit no final do histórico. O `<cmd>` será interpretado como um ou mais comandos do shell. Qualquer comando que falhar interromperá a reconstrução da fundação, com o código de encerramento igual a 1."
 
 #. type: Plain text
 #: en/git-rebase.txt:544
 #, priority:100
 msgid "You may execute several commands by either using one instance of `--exec` with several commands:"
-msgstr ""
-"É possível executar vários comandos utilizando uma instância da opção "
-"`--exec` com vários comandos:"
+msgstr "É possível executar vários comandos utilizando uma instância da opção `--exec` com vários comandos:"
 
 #. type: Plain text
 #: en/git-rebase.txt:546
@@ -46572,31 +40929,19 @@ msgstr "\tgit rebase -i --exec \"cmd1\" --exec \"cmd2\" --exec ...\n"
 #: en/git-rebase.txt:554
 #, priority:100
 msgid "If `--autosquash` is used, \"exec\" lines will not be appended for the intermediate commits, and will only appear at the end of each squash/fixup series."
-msgstr ""
-"Caso a opção `--autosquash` seja utilizado, as linhas \"exec\" não serão "
-"anexadas aos commits intermediários e aparecerão apenas no final de cada "
-"série de compressão/correção."
+msgstr "Caso a opção `--autosquash` seja utilizado, as linhas \"exec\" não serão anexadas aos commits intermediários e aparecerão apenas no final de cada série de compressão/correção."
 
 #. type: Plain text
 #: en/git-rebase.txt:557
 #, priority:100
 msgid "This uses the `--interactive` machinery internally, but it can be run without an explicit `--interactive`."
-msgstr ""
-"Utiliza o mecanismo `--interactive` internamente, porém pode ser executado "
-"sem a opção `--interactive` de forma explicita."
+msgstr "Utiliza o mecanismo `--interactive` internamente, porém pode ser executado sem a opção `--interactive` de forma explicita."
 
 #. type: Plain text
 #: en/git-rebase.txt:569
 #, priority:100
 msgid "Rebase all commits reachable from <branch>, instead of limiting them with an <upstream>.  This allows you to rebase the root commit(s) on a branch.  When used with --onto, it will skip changes already contained in <newbase> (instead of <upstream>) whereas without --onto it will operate on every change.  When used together with both --onto and --preserve-merges, 'all' root commits will be rewritten to have <newbase> as parent instead."
-msgstr ""
-"Reconstrói todos os commits acessíveis a partir do <ramo>, em vez de limitá-"
-"los com a <upstream>.  Permite a reestruturação dos commit da raiz em um "
-"ramo.  Quando utilizado com a opção `--onto`, será ignorado as alterações já "
-"contidas em <newbase> (em vez de <upstream>) enquanto que sem a opção "
-"`--onto` a operação ocorrerá em todas as alterações.  Quando utilizado junto "
-"com ambas as opções `--onto` e `--preserve-merges`, 'todos' os commits das "
-"raízes serão reescritos para ter o <newbase> como a sua origem."
+msgstr "Reconstrói todos os commits acessíveis a partir do <ramo>, em vez de limitá-los com a <upstream>.  Permite a reestruturação dos commit da raiz em um ramo.  Quando utilizado com a opção `--onto`, será ignorado as alterações já contidas em <newbase> (em vez de <upstream>) enquanto que sem a opção `--onto` a operação ocorrerá em todas as alterações.  Quando utilizado junto com ambas as opções `--onto` e `--preserve-merges`, 'todos' os commits das raízes serão reescritos para ter o <newbase> como a sua origem."
 
 #. type: Labeled list
 #: en/git-rebase.txt:572
@@ -46614,26 +40959,13 @@ msgstr "--no-autosquash"
 #: en/git-rebase.txt:584
 #, ignore-ellipsis, priority:100
 msgid "When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), and there is already a commit in the todo list that matches the same `...`, automatically modify the todo list of rebase -i so that the commit marked for squashing comes right after the commit to be modified, and change the action of the moved commit from `pick` to `squash` (or `fixup`).  A commit matches the `...` if the commit subject matches, or if the `...` refers to the commit's hash. As a fall-back, partial matches of the commit subject work, too.  The recommended way to create fixup/squash commits is by using the `--fixup`/`--squash` options of linkgit:git-commit[1]."
-msgstr ""
-"Quando a mensagem do registro log do commit começar com \"squash! ...\" (ou "
-"\"fixup! ...\"),e já existe um commit na lista de tarefas que coincidem com "
-"o mesmo `...`, altera a lista de tarefas automaticamente do 'rebase -i' para "
-"que o commit marcado para ser comprimido venha logo após o commit que será "
-"modificado e altere a ação do commit movido de `pick` para `squash` (ou "
-"`fixup`).  Um commit coincide com `...` caso haja a coincidência do assunto "
-"do commit ou se o `...` se referir ao hash do commit. Como alternativa, as "
-"coincidências que forem parciais ao assunto do commit, também funcionam.  A "
-"maneira recomendada para se criar os commits para correção/compressão é "
-"utilizando as opções `--fixup`/`--squash` do comando linkgit:git-commit[1]."
+msgstr "Quando a mensagem do registro log do commit começar com \"squash! ...\" (ou \"fixup! ...\"),e já existe um commit na lista de tarefas que coincidem com o mesmo `...`, altera a lista de tarefas automaticamente do 'rebase -i' para que o commit marcado para ser comprimido venha logo após o commit que será modificado e altere a ação do commit movido de `pick` para `squash` (ou `fixup`).  Um commit coincide com `...` caso haja a coincidência do assunto do commit ou se o `...` se referir ao hash do commit. Como alternativa, as coincidências que forem parciais ao assunto do commit, também funcionam.  A maneira recomendada para se criar os commits para correção/compressão é utilizando as opções `--fixup`/`--squash` do comando linkgit:git-commit[1]."
 
 #. type: Plain text
 #: en/git-rebase.txt:588
 #, priority:100
 msgid "If the `--autosquash` option is enabled by default using the configuration variable `rebase.autoSquash`, this option can be used to override and disable this setting."
-msgstr ""
-"Caso a opção `--autosquash` esteja predefinitivamente ativada utilizando a "
-"variável de configuração `rebase.autoSquash`, esta opção poderá ser "
-"utilizada para substituir e desativar esta configuração."
+msgstr "Caso a opção `--autosquash` esteja predefinitivamente ativada utilizando a variável de configuração `rebase.autoSquash`, esta opção poderá ser utilizada para substituir e desativar esta configuração."
 
 #. type: Labeled list
 #: en/git-rebase.txt:591 en/merge-options.txt:163
@@ -46651,12 +40983,7 @@ msgstr "--no-autostash"
 #: en/git-rebase.txt:598
 #, priority:100
 msgid "Automatically create a temporary stash entry before the operation begins, and apply it after the operation ends.  This means that you can run rebase on a dirty worktree.  However, use with care: the final stash application after a successful rebase might result in non-trivial conflicts."
-msgstr ""
-"Crie automaticamente uma entrada temporária 'stash' antes do início da "
-"operação e aplique-a ao finalizar.  Isso significa que é possível executar a "
-"reconstrução (rebase) em uma árvore de trabalho suja.  No entanto, use com "
-"cuidado: a aplicação 'stash' final após uma nova reconstrução bem-sucedida "
-"pode acabar em conflitos não triviais."
+msgstr "Crie automaticamente uma entrada temporária 'stash' antes do início da operação e aplique-a ao finalizar.  Isso significa que é possível executar a reconstrução (rebase) em uma árvore de trabalho suja.  No entanto, use com cuidado: a aplicação 'stash' final após uma nova reconstrução bem-sucedida pode acabar em conflitos não triviais."
 
 #. type: Labeled list
 #: en/git-rebase.txt:599
@@ -46674,9 +41001,7 @@ msgstr "--no-reschedule-failed-exec"
 #: en/git-rebase.txt:603
 #, priority:100
 msgid "Automatically reschedule `exec` commands that failed. This only makes sense in interactive mode (or when an `--exec` option was provided)."
-msgstr ""
-"Reagende automaticamente os comandos `exec` que falharam. Isso só faz "
-"sentido no modo interativo (ou quando uma opção `--exec` for utilizada)."
+msgstr "Reagende automaticamente os comandos `exec` que falharam. Isso só faz sentido no modo interativo (ou quando uma opção `--exec` for utilizada)."
 
 #. type: Title -
 #: en/git-rebase.txt:605
@@ -46810,14 +41135,11 @@ msgid ""
 "lower-level functionality that underpinned each.) There are some\n"
 "subtle differences in how these two backends behave:\n"
 msgstr ""
-"O git rebase possui duas estruturas primárias: `apply` e `merge`.  (A "
-"aplicação\n"
+"O git rebase possui duas estruturas primárias: `apply` e `merge`.  (A aplicação\n"
 "da estrutura era conhecido como 'am', porém o nome causava\n"
-"confusão já que parecia um verbo em vez de um substantivo.  Além disso, a "
-"estrutura\n"
+"confusão já que parecia um verbo em vez de um substantivo.  Além disso, a estrutura\n"
 "`merge` era informada como 'interactive backend', porém agora\n"
-"também é usado para casos não interativos.  Ambos foram renomeados com base "
-"na\n"
+"também é usado para casos não interativos.  Ambos foram renomeados com base na\n"
 "funcionalidade de baixo nível que sustentava cada um.) Há algumas\n"
 "diferenças sutis em como estes dois processos internos se comportam:\n"
 
@@ -46840,8 +41162,7 @@ msgid ""
 "also drops commits that become empty and has no option for controlling\n"
 "this behavior.\n"
 msgstr ""
-"A estrutura aplicada infelizmente descarta os commits vazios de forma "
-"intencional, ou seja.\n"
+"A estrutura aplicada infelizmente descarta os commits vazios de forma intencional, ou seja.\n"
 "Os commits que começaram vazios, contudo na prática, é algo raro.  Também\n"
 "descarta os commits que se tornam vazios e não há uma opção para controlar\n"
 "este comportamento.\n"
@@ -46855,8 +41176,7 @@ msgid ""
 "be dropped automatically with --no-keep-empty).\n"
 msgstr ""
 "É predefinido que a estrutura da mesclagem mantenha os commits\n"
-"intencionalmente vazios (com `-i` são marcados como vazio no editor da lista "
-"de tarefas,\n"
+"intencionalmente vazios (com `-i` são marcados como vazio no editor da lista de tarefas,\n"
 "ou podem ser descartados automaticamente com a opção `--no-keep-empty`).\n"
 
 #. type: delimited block -
@@ -46871,11 +41191,9 @@ msgid ""
 msgstr ""
 "Semelhante à estrutura aplicada, é predefinido que\n"
 "a estrutura da mesclagem derrube os commits que se tornaram vazios,\n"
-"a menos que as opções `-i` ou `--interactive` sejam definidas (nesse caso, "
-"ele\n"
+"a menos que as opções `-i` ou `--interactive` sejam definidas (nesse caso, ele\n"
 "para e pergunta ao usuário o que fazer).  A estrutura da mesclagem\n"
-"também possui uma opção --empty={drop,keep,ask} para alterar o "
-"comportamento\n"
+"também possui uma opção --empty={drop,keep,ask} para alterar o comportamento\n"
 "da manipulação dos commits que ficam vazios.\n"
 
 #. type: delimited block -
@@ -46903,14 +41221,10 @@ msgid ""
 msgstr ""
 "Devido à falta de informações precisas sobre as árvores (que surge de\n"
 "construções dos ancestrais falsos com informações limitadas disponíveis nos\n"
-"patches), a detecção da renomeação do diretório é desativado na estrutura da "
-"aplicação.\n"
-"A desativação da detecção da renomeação do diretório, significa que se um "
-"lado do histórico\n"
-"renomear um diretório e o outro adicionar novos arquivos no diretório "
-"antigo, então\n"
-"os novos arquivos serão deixados para trás no diretório antigo sem qualquer "
-"aviso, \n"
+"patches), a detecção da renomeação do diretório é desativado na estrutura da aplicação.\n"
+"A desativação da detecção da renomeação do diretório, significa que se um lado do histórico\n"
+"renomear um diretório e o outro adicionar novos arquivos no diretório antigo, então\n"
+"os novos arquivos serão deixados para trás no diretório antigo sem qualquer aviso, \n"
 "durante a reconstrução onde você possa talvez querer mover estes arquivos, \n"
 "para o novo diretório.\n"
 
@@ -46921,8 +41235,7 @@ msgid ""
 "Directory rename detection works with the merge backend to provide you\n"
 "warnings in such cases.\n"
 msgstr ""
-"A detecção da renomeação do diretório funciona com a estrutura da mesclagem,"
-"\n"
+"A detecção da renomeação do diretório funciona com a estrutura da mesclagem,\n"
 "neste caso, fornecendo informações para você.\n"
 
 #. type: delimited block -
@@ -46954,26 +41267,19 @@ msgid ""
 "problems, but increases the chance of spurious conflicts (since it\n"
 "will require more lines of matching context to apply).\n"
 msgstr ""
-"A aplicação da estrutura funciona ao criar uma sequencia de patches ("
-"chamando\n"
+"A aplicação da estrutura funciona ao criar uma sequencia de patches (chamando\n"
 "o `format-patch` internalmente), então se aplicam os patches em sequência\n"
-"(invocando o `am` internamente).  Os patches são compostos de vários pedaços,"
-"\n"
-"cada um com linhas numeradas, o contexto da região, e as alterações atuais.  "
-"As\n"
+"(invocando o `am` internamente).  Os patches são compostos de vários pedaços,\n"
+"cada um com linhas numeradas, o contexto da região, e as alterações atuais.  As\n"
 "linhas numeradas devem ser tomadas com alguma imprecisão, já que antes\n"
-"o outro lado provavelmente terá inserido ou terá excluído as linhas no "
-"arquivo.  O\n"
-"contexto da região destina-se no auxílio para encontrar como ajustar as "
-"linhas numeradas\n"
+"o outro lado provavelmente terá inserido ou terá excluído as linhas no arquivo.  O\n"
+"contexto da região destina-se no auxílio para encontrar como ajustar as linhas numeradas\n"
 "na ordem para aplicar as alterações nas linhas corretas.  No entanto, caso\n"
 "ao redor das várias áreas do código tenham as mesmas linhas de contexto, um\n"
 "código errado pode ser selecionado.  Existem casos no mundo real onde isso\n"
-"fez com que os commits fossem reaplicados de forma incorreta e nenhum "
-"conflito foi relatado.\n"
+"fez com que os commits fossem reaplicados de forma incorreta e nenhum conflito foi relatado.\n"
 "Definindo o `diff.context` para um valor maior, isso pode impedir que\n"
-"estes tipos de problemas ocorram, porém aumenta a chance de conflitos "
-"espúrios (uma vez que\n"
+"estes tipos de problemas ocorram, porém aumenta a chance de conflitos espúrios (uma vez que\n"
 "exigirá mais linhas que coincidam com o contexto para serem aplicados).\n"
 
 #. type: delimited block -
@@ -47017,12 +41323,10 @@ msgstr ""
 "informações sobre os commits reconstruídos e seus pais (em vez disso,\n"
 "gera novos commits falsos com base nas informações limitadas no\n"
 "patches que foram gerados), estes commits não podem ser identificados;\n"
-"em vez disso tem que retornar para um resumo do commit.  Além disso, quando "
-"`merge.conflictStyle` é\n"
+"em vez disso tem que retornar para um resumo do commit.  Além disso, quando `merge.conflictStyle` é\n"
 "definido para 'diff3', a estrutura aplicada utilizará uma\n"
 "\"mesclagem reconstruída da base\" para rotular o conteúdo da base mesclada\n"
-"e portanto, não fornecer qualquer informações sobre o commit da base "
-"mesclada.\n"
+"e portanto, não fornecer qualquer informações sobre o commit da base mesclada.\n"
 
 #. type: delimited block -
 #: en/git-rebase.txt:724
@@ -47062,23 +41366,16 @@ msgid ""
 "calling either of these hooks in the future.\n"
 msgstr ""
 "A estrutura da aplicação não chama tradicionalmente o gancho pós-commit,\n"
-"enquanto a estrutura da mesclagem chama.  Ambos chamaram o gancho pós-"
-"averiguação,\n"
+"enquanto a estrutura da mesclagem chama.  Ambos chamaram o gancho pós-averiguação,\n"
 "embora a estrutura da mesclagem reduza a sua saída.  Além disso, ambas\n"
 "as estruturas chamam apenas o gancho pós-averiguação com o ponto de partida\n"
-"para fazer o commit da reconstrução da fundação (rebase), nem o commit "
-"intermediário,\n"
-"nem o commit final.  Em cada caso, o chamado desses ganchos foi por acidente "
-"de\n"
-"implementação em vez de design (os dois processos internos eram "
-"originalmente\n"
+"para fazer o commit da reconstrução da fundação (rebase), nem o commit intermediário,\n"
+"nem o commit final.  Em cada caso, o chamado desses ganchos foi por acidente de\n"
+"implementação em vez de design (os dois processos internos eram originalmente\n"
 "implementados como scripts shell e passaram a chamar outros comandos\n"
-"como o 'git checkout' ou o 'git commit' que seriam chamados de ganchos).  "
-"Ambos\n"
-"os processos internos devem ter o mesmo comportamento, embora não seja "
-"inteiramente\n"
-"claro qual (caso existam), está correto.  Provavelmente faremos a "
-"reconstrução (rebase) parar\n"
+"como o 'git checkout' ou o 'git commit' que seriam chamados de ganchos).  Ambos\n"
+"os processos internos devem ter o mesmo comportamento, embora não seja inteiramente\n"
+"claro qual (caso existam), está correto.  Provavelmente faremos a reconstrução (rebase) parar\n"
 "chamando um destes ganchos no futuro.\n"
 
 #. type: delimited block -
@@ -47105,10 +41402,8 @@ msgid ""
 msgstr ""
 "A aplicação da estrutura possui problemas de segurança relacionada\n"
 "com interrupção de tempo; caso o usuário pressione Ctrl+C no momento errado\n"
-"ao tentar interromper o processo 'rebase' (reconstrução), o processo então "
-"pode entrar\n"
-"em uma condição ele não pode ser parado posteriormente com um comando `git "
-"rebase --abort`.  A estrutura da mesclagem não\n"
+"ao tentar interromper o processo 'rebase' (reconstrução), o processo então pode entrar\n"
+"em uma condição ele não pode ser parado posteriormente com um comando `git rebase --abort`.  A estrutura da mesclagem não\n"
 "parece sofrer da mesma deficiência.  (Consulte\n"
 "https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/\n"
 "para obter mais detalhes.)\n"
@@ -47135,12 +41430,10 @@ msgid ""
 "the apply backend blindly applies the original commit message.\n"
 msgstr ""
 "Quando ocorre um conflito durante o processo 'rebase', o processo\n"
-"para e pergunta ao usuário para resolver o problema.  Como o usuário pode "
-"precisar fazer muitas alterações enquanto\n"
+"para e pergunta ao usuário para resolver o problema.  Como o usuário pode precisar fazer muitas alterações enquanto\n"
 "resolve os conflitos, depois que os conflitos forem resolvidos e o\n"
 "usuário tenha executado o comando `git rebase --continue`, o 'rebase'\n"
-"deverá abrir o editor e perguntar ao usuário para atualizar a mensagem do "
-"commit.  A estrutura da mesclagem faz isso, enquanto\n"
+"deverá abrir o editor e perguntar ao usuário para atualizar a mensagem do commit.  A estrutura da mesclagem faz isso, enquanto\n"
 "a estrutura aplica cegamente a mensagem do commit original.\n"
 
 #. type: delimited block -
@@ -47173,8 +41466,7 @@ msgid ""
 "  the changes made in the reflog, though both will make use of the\n"
 "  word \"rebase\".\n"
 msgstr ""
-"* Reflog: As duas estruturas que utilizarão palavras diferentes durante a "
-"descrição\n"
+"* Reflog: As duas estruturas que utilizarão palavras diferentes durante a descrição\n"
 "  das alterações feitas no reflog, embora ambos façam a utilização da\n"
 "  palavra \"rebase\"\n"
 
@@ -47190,10 +41482,8 @@ msgid ""
 msgstr ""
 "* Mensagens de progresso, informacionais e de erro: As duas estruturas\n"
 "  fornecem um progresso ligeiramente diferente das mensagens informantes.\n"
-"  Além disso, a estrutura aplicada grava uma mensagens de erro (como \"Os "
-"seus arquivos\n"
-"  serão substituídos...\") para o stdout, enquanto a mesclagem da estrutura "
-"escrevem\n"
+"  Além disso, a estrutura aplicada grava uma mensagens de erro (como \"Os seus arquivos\n"
+"  serão substituídos...\") para o stdout, enquanto a mesclagem da estrutura escrevem\n"
 "  eles no stderr.\n"
 
 #. type: delimited block -
@@ -47203,8 +41493,7 @@ msgid ""
 "* State directories: The two backends keep their state in different\n"
 "  directories under .git/\n"
 msgstr ""
-"* Diretórios de estado: As duas estruturas mantêm a sua condição em "
-"diferentes\n"
+"* Diretórios de estado: As duas estruturas mantêm a sua condição em diferentes\n"
 "  diretórios dentro do `.git/`\n"
 
 #. type: delimited block -
@@ -47223,21 +41512,13 @@ msgstr "OBSERVAÇÕES\n"
 #: en/git-rebase.txt:790
 #, priority:100
 msgid "You should understand the implications of using 'git rebase' on a repository that you share.  See also RECOVERING FROM UPSTREAM REBASE below."
-msgstr ""
-"Você deve compreender as implicações da utilização do comando 'git rebase' "
-"em um repositório que você compartilha.  Consulte também SE RECUPERANDO DA "
-"RECONSTRUÇÃO DA FUNDAÇÃO INICIAL (UPSTREM REBASE) abaixo."
+msgstr "Você deve compreender as implicações da utilização do comando 'git rebase' em um repositório que você compartilha.  Consulte também SE RECUPERANDO DA RECONSTRUÇÃO DA FUNDAÇÃO INICIAL (UPSTREM REBASE) abaixo."
 
 #. type: Plain text
 #: en/git-rebase.txt:795
 #, priority:100
 msgid "When the git-rebase command is run, it will first execute a \"pre-rebase\" hook if one exists.  You can use this hook to do sanity checks and reject the rebase if it isn't appropriate.  Please see the template pre-rebase hook script for an example."
-msgstr ""
-"Quando o comando 'git rebase' é executado, ele primeiro executa um gancho "
-"\"pre-rebase\", caso exista.  Você pode usar este gancho para fazer as "
-"verificações de sanidade e rejeitar a nova reconstrução, caso não seja "
-"apropriado.  Consulte o modelo do script do gancho 'pre-rebase' para ter um "
-"exemplo."
+msgstr "Quando o comando 'git rebase' é executado, ele primeiro executa um gancho \"pre-rebase\", caso exista.  Você pode usar este gancho para fazer as verificações de sanidade e rejeitar a nova reconstrução, caso não seja apropriado.  Consulte o modelo do script do gancho 'pre-rebase' para ter um exemplo."
 
 #. type: Plain text
 #: en/git-rebase.txt:797
@@ -47249,10 +41530,7 @@ msgstr "Após a conclusão, o <ramo> será o ramo atual."
 #: en/git-rebase.txt:804
 #, priority:100
 msgid "Rebasing interactively means that you have a chance to edit the commits which are rebased.  You can reorder the commits, and you can remove them (weeding out bad or otherwise unwanted patches)."
-msgstr ""
-"Reconstruir de forma interativa significa ter a chance de editar os commits "
-"que são reconstruídos.  É possível reordenar os commits e removê-los ("
-"eliminando os patches ruins ou indesejados)."
+msgstr "Reconstruir de forma interativa significa ter a chance de editar os commits que são reconstruídos.  É possível reordenar os commits e removê-los (eliminando os patches ruins ou indesejados)."
 
 #. type: Plain text
 #: en/git-rebase.txt:806
@@ -47336,12 +41614,7 @@ msgstr "faça o commit"
 #: en/git-rebase.txt:830
 #, priority:100
 msgid "Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect commit it fixes, because that commit is buried deeply in a patch series.  That is exactly what interactive rebase is for: use it after plenty of \"a\"s and \"b\"s, by rearranging and editing commits, and squashing multiple commits into one."
-msgstr ""
-"Às vezes, a coisa fixada em b.2. não pode ser alterado para o commit nem tão "
-"perfeito que ele corrige, porque este commit está enterrado profundamente em "
-"uma série de correções.  É exatamente para isso que a reconstrução "
-"interativa serve: use-o após muitos \"a\" e \"b\", reorganizando e editando "
-"os commits e comprimindo vários commits em um."
+msgstr "Às vezes, a coisa fixada em b.2. não pode ser alterado para o commit nem tão perfeito que ele corrige, porque este commit está enterrado profundamente em uma série de correções.  É exatamente para isso que a reconstrução interativa serve: use-o após muitos \"a\" e \"b\", reorganizando e editando os commits e comprimindo vários commits em um."
 
 #. type: Plain text
 #: en/git-rebase.txt:832
@@ -47359,11 +41632,7 @@ msgstr "\tgit rebase -i <após-este-commit>\n"
 #: en/git-rebase.txt:839
 #, priority:100
 msgid "An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit.  You can reorder the commits in this list to your heart's content, and you can remove them.  The list looks more or less like this:"
-msgstr ""
-"Um editor será acionado com todos os commits no seu ramo atual (ignorando a "
-"mesclagem dos commits), que vêm após o commit informado.  Você pode "
-"reordenar os commits nesta lista para o conteúdo do seu coração e pode "
-"removê-los.  A lista é mais ou menos assim:"
+msgstr "Um editor será acionado com todos os commits no seu ramo atual (ignorando a mesclagem dos commits), que vêm após o commit informado.  Você pode reordenar os commits nesta lista para o conteúdo do seu coração e pode removê-los.  A lista é mais ou menos assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:844
@@ -47381,77 +41650,49 @@ msgstr ""
 #: en/git-rebase.txt:849
 #, priority:100
 msgid "The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this example), so do not delete or edit the names."
-msgstr ""
-"As descrições on-line são puramente para o seu prazer; o comando 'git "
-"rebase' não examinará eles, porém os nomes dos commits (\"deadbee\" e "
-"\"fa1afe1\" neste exemplo), portanto, não exclua ou edite os nomes."
+msgstr "As descrições on-line são puramente para o seu prazer; o comando 'git rebase' não examinará eles, porém os nomes dos commits (\"deadbee\" e \"fa1afe1\" neste exemplo), portanto, não exclua ou edite os nomes."
 
 #. type: Plain text
 #: en/git-rebase.txt:854
 #, priority:100
 msgid "By replacing the command \"pick\" with the command \"edit\", you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing."
-msgstr ""
-"Ao substituir o comando \"pick\" pelo comando \"edit\", é possível dizer ao "
-"comando 'git rebase' para parar após aplicar este commit, para que seja "
-"possível editar os arquivos e/ou a mensagem do commit, alterar o commit e "
-"continuar com a reconstrução."
+msgstr "Ao substituir o comando \"pick\" pelo comando \"edit\", é possível dizer ao comando 'git rebase' para parar após aplicar este commit, para que seja possível editar os arquivos e/ou a mensagem do commit, alterar o commit e continuar com a reconstrução."
 
 #. type: Plain text
 #: en/git-rebase.txt:857
 #, priority:100
 msgid "To interrupt the rebase (just like an \"edit\" command would do, but without cherry-picking any commit first), use the \"break\" command."
-msgstr ""
-"Para interromper um \"rebase\" (exatamente como um comando \"edit\" faria, "
-"mas sem fazer uma escolha seletiva de nenhum commit primeiro), use o comando "
-"\"break\"."
+msgstr "Para interromper um \"rebase\" (exatamente como um comando \"edit\" faria, mas sem fazer uma escolha seletiva de nenhum commit primeiro), use o comando \"break\"."
 
 #. type: Plain text
 #: en/git-rebase.txt:860
 #, priority:100
 msgid "If you just want to edit the commit message for a commit, replace the command \"pick\" with the command \"reword\"."
-msgstr ""
-"Caso apenas queira editar a mensagem do commit para um commit, substitua o "
-"comando `pick` pelo comando `reword`."
+msgstr "Caso apenas queira editar a mensagem do commit para um commit, substitua o comando `pick` pelo comando `reword`."
 
 #. type: Plain text
 #: en/git-rebase.txt:863
 #, priority:100
 msgid "To drop a commit, replace the command \"pick\" with \"drop\", or just delete the matching line."
-msgstr ""
-"Para eliminar um commit, substitua o comando \"pick\" por \"drop\" ou apenas "
-"exclua a linha coincidente."
+msgstr "Para eliminar um commit, substitua o comando \"pick\" por \"drop\" ou apenas exclua a linha coincidente."
 
 #. type: Plain text
 #: en/git-rebase.txt:871
 #, priority:100
 msgid "If you want to fold two or more commits into one, replace the command \"pick\" for the second and subsequent commits with \"squash\" or \"fixup\".  If the commits had different authors, the folded commit will be attributed to the author of the first commit.  The suggested commit message for the folded commit is the concatenation of the commit messages of the first commit and of those with the \"squash\" command, but omits the commit messages of commits with the \"fixup\" command."
-msgstr ""
-"Caso queira dobrar dois ou mais commits em um, substitua o comando \"pick\" "
-"da segunda e os commits subsequentes por \"squash\" ou \"fixup\".  Caso os "
-"commits tenham autores diferentes, o commit dobrado será atribuído ao autor "
-"do primeiro commit.  A mensagem do commit sugerido para o commit que foi "
-"dobrado é a concatenação das mensagens dos commits do primeiro commit e "
-"daquelas feitas com o comando \"squash\", porém omite as mensagens dos "
-"commits feitas com o comando \"fixup\"."
+msgstr "Caso queira dobrar dois ou mais commits em um, substitua o comando \"pick\" da segunda e os commits subsequentes por \"squash\" ou \"fixup\".  Caso os commits tenham autores diferentes, o commit dobrado será atribuído ao autor do primeiro commit.  A mensagem do commit sugerido para o commit que foi dobrado é a concatenação das mensagens dos commits do primeiro commit e daquelas feitas com o comando \"squash\", porém omite as mensagens dos commits feitas com o comando \"fixup\"."
 
 #. type: Plain text
 #: en/git-rebase.txt:875
 #, priority:100
 msgid "'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when a command fails due to merge errors. When you are done editing and/or resolving conflicts you can continue with `git rebase --continue`."
-msgstr ""
-"O comando 'git rebase' será interrompido quando o \"pick\" for substituído "
-"por \"edit\" ou quando um comando falhar devido aos erros da mesclagem. "
-"Quando você terminar de editar e/ou resolver os conflitos, será possível "
-"continuar utilizando `git rebase --continue`."
+msgstr "O comando 'git rebase' será interrompido quando o \"pick\" for substituído por \"edit\" ou quando um comando falhar devido aos erros da mesclagem. Quando você terminar de editar e/ou resolver os conflitos, será possível continuar utilizando `git rebase --continue`."
 
 #. type: Plain text
 #: en/git-rebase.txt:879
 #, priority:100
 msgid "For example, if you want to reorder the last 5 commits, such that what was HEAD~4 becomes the new HEAD. To achieve that, you would call 'git rebase' like this:"
-msgstr ""
-"Como por exemplo, caso você queira reordenar os últimos 5 commits de maneira "
-"onde o que era `HEAD~4` se torne o novo `HEAD`. Para conseguir isso, você "
-"chamaria o comando 'git rebase' assim:"
+msgstr "Como por exemplo, caso você queira reordenar os últimos 5 commits de maneira onde o que era `HEAD~4` se torne o novo `HEAD`. Para conseguir isso, você chamaria o comando 'git rebase' assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:882
@@ -47469,9 +41710,7 @@ msgstr "E mova o primeiro patch para o ramo da lista."
 #: en/git-rebase.txt:888
 #, priority:100
 msgid "You might want to recreate merge commits, e.g. if you have a history like this:"
-msgstr ""
-"Convém recriar a mesclagem dos commits, por exemplo, caso tenha um histórico "
-"como este:"
+msgstr "Convém recriar a mesclagem dos commits, por exemplo, caso tenha um histórico como este:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:895
@@ -47493,9 +41732,7 @@ msgstr ""
 #: en/git-rebase.txt:899
 #, priority:100
 msgid "Suppose you want to rebase the side branch starting at \"A\" to \"Q\". Make sure that the current HEAD is \"B\", and call"
-msgstr ""
-"Suponha que queira reconstruir o lado do ramo ao lado começando em \"A\" "
-"para \"Q\". Verifique se o `HEAD` atual é \"B\" e chame"
+msgstr "Suponha que queira reconstruir o lado do ramo ao lado começando em \"A\" para \"Q\". Verifique se o `HEAD` atual é \"B\" e chame"
 
 #. type: delimited block -
 #: en/git-rebase.txt:902
@@ -47507,12 +41744,7 @@ msgstr "$ git rebase -i -r --onto Q O\n"
 #: en/git-rebase.txt:909
 #, priority:100
 msgid "Reordering and editing commits usually creates untested intermediate steps.  You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate points in history by using the \"exec\" command (shortcut \"x\").  You may do so by creating a todo list like this one:"
-msgstr ""
-"Reordenando e editando os commits geralmente cria etapas intermediárias não "
-"testadas.  Convém verificar se a edição do seu histórico não quebrou nada "
-"durante a execução de um teste ou, pelo menos, recompilando em pontos "
-"intermediários do histórico utilizando o comando \"exec\" (atalho \"x\").  "
-"Você pode fazer isso criando uma lista de tarefas como esta:"
+msgstr "Reordenando e editando os commits geralmente cria etapas intermediárias não testadas.  Convém verificar se a edição do seu histórico não quebrou nada durante a execução de um teste ou, pelo menos, recompilando em pontos intermediários do histórico utilizando o comando \"exec\" (atalho \"x\").  Você pode fazer isso criando uma lista de tarefas como esta:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:918
@@ -47538,21 +41770,13 @@ msgstr ""
 #: en/git-rebase.txt:923
 #, priority:100
 msgid "The interactive rebase will stop when a command fails (i.e. exits with non-0 status) to give you an opportunity to fix the problem. You can continue with `git rebase --continue`."
-msgstr ""
-"A reconstrução interativa será interrompida quando um comando falhar (ou "
-"seja, encerra com uma condição diferente de 0) oferecendo uma oportunidade "
-"para a correção do problema. Você pode continuar com o comando `git rebase "
-"--continue`."
+msgstr "A reconstrução interativa será interrompida quando um comando falhar (ou seja, encerra com uma condição diferente de 0) oferecendo uma oportunidade para a correção do problema. Você pode continuar com o comando `git rebase --continue`."
 
 #. type: Plain text
 #: en/git-rebase.txt:928
 #, ignore-ellipsis, priority:100
 msgid "The \"exec\" command launches the command in a shell (the one specified in `$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell features (like \"cd\", \">\", \";\" ...). The command is run from the root of the working tree."
-msgstr ""
-"O comando \"exec\" inicia o comando em um shell (aquele definido em `$SHELL`"
-", ou o shell predefinido caso `$SHELL` não esteja definido), para que você "
-"possa utilizar os recursos do shell (como \"cd\", \">\", \";\" ...). O "
-"comando é executado a partir da raiz da árvore de trabalho."
+msgstr "O comando \"exec\" inicia o comando em um shell (aquele definido em `$SHELL`, ou o shell predefinido caso `$SHELL` não esteja definido), para que você possa utilizar os recursos do shell (como \"cd\", \">\", \";\" ...). O comando é executado a partir da raiz da árvore de trabalho."
 
 #. type: delimited block -
 #: en/git-rebase.txt:931
@@ -47564,9 +41788,7 @@ msgstr "$ git rebase -i --exec \"make test\"\n"
 #: en/git-rebase.txt:935
 #, priority:100
 msgid "This command lets you check that intermediate commits are compilable.  The todo list becomes like that:"
-msgstr ""
-"Este comando permite verificar se os commits intermediários são "
-"compiláveis.  A lista de tarefas fica assim:"
+msgstr "Este comando permite verificar se os commits intermediários são compiláveis.  A lista de tarefas fica assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:945
@@ -47600,21 +41822,13 @@ msgstr "DIVIDINDO OS COMMITS\t"
 #: en/git-rebase.txt:954
 #, priority:100
 msgid "In interactive mode, you can mark commits with the action \"edit\".  However, this does not necessarily mean that 'git rebase' expects the result of this edit to be exactly one commit.  Indeed, you can undo the commit, or you can add other commits.  This can be used to split a commit into two:"
-msgstr ""
-"No modo interativo, é possível marcar os commits com a ação \"editar\".  No "
-"entanto, isso não significa necessariamente que o comando 'git rebase' "
-"espere que o resultado dessa edição seja exatamente um commit.  Na verdade, "
-"é possível desfazer o commit ou adicionar outros.  Isso pode ser utilizado "
-"para dividir um commit em dois:"
+msgstr "No modo interativo, é possível marcar os commits com a ação \"editar\".  No entanto, isso não significa necessariamente que o comando 'git rebase' espere que o resultado dessa edição seja exatamente um commit.  Na verdade, é possível desfazer o commit ou adicionar outros.  Isso pode ser utilizado para dividir um commit em dois:"
 
 #. type: Plain text
 #: en/git-rebase.txt:958
 #, priority:100
 msgid "Start an interactive rebase with `git rebase -i <commit>^`, where <commit> is the commit you want to split.  In fact, any commit range will do, as long as it contains that commit."
-msgstr ""
-"Inicie uma reconstrução interativa com `git rebase -i <commit>^`, onde "
-"<commit> é o que você quer dividir.  De fato, qualquer intervalo do commit "
-"serve, desde que contenha aquele commit."
+msgstr "Inicie uma reconstrução interativa com `git rebase -i <commit>^`, onde <commit> é o que você quer dividir.  De fato, qualquer intervalo do commit serve, desde que contenha aquele commit."
 
 #. type: Plain text
 #: en/git-rebase.txt:960
@@ -47626,34 +41840,25 @@ msgstr "Marque o commit que deseja dividir com a ação \"edit\"."
 #: en/git-rebase.txt:964
 #, priority:100
 msgid "When it comes to editing that commit, execute `git reset HEAD^`.  The effect is that the HEAD is rewound by one, and the index follows suit.  However, the working tree stays the same."
-msgstr ""
-"Quando se trata de editar este commit, execute o comando `git reset HEAD^`.  "
-"O efeito é que o `HEAD` é retrocedido por um e o índice segue o conjunto.  "
-"No entanto, a árvore de trabalho permanece a mesma."
+msgstr "Quando se trata de editar este commit, execute o comando `git reset HEAD^`.  O efeito é que o `HEAD` é retrocedido por um e o índice segue o conjunto.  No entanto, a árvore de trabalho permanece a mesma."
 
 #. type: Plain text
 #: en/git-rebase.txt:968
 #, priority:100
 msgid "Now add the changes to the index that you want to have in the first commit.  You can use `git add` (possibly interactively) or 'git gui' (or both) to do that."
-msgstr ""
-"Agora adicione as alterações ao índice que você queira ter no primeiro "
-"commit.  Você pode utilizar o comando `git add` (possivelmente de forma "
-"interativa) ou o comando 'git gui' (ou ambos) para fazer isso."
+msgstr "Agora adicione as alterações ao índice que você queira ter no primeiro commit.  Você pode utilizar o comando `git add` (possivelmente de forma interativa) ou o comando 'git gui' (ou ambos) para fazer isso."
 
 #. type: Plain text
 #: en/git-rebase.txt:971
 #, priority:100
 msgid "Commit the now-current index with whatever commit message is appropriate now."
-msgstr ""
-"Faça o commit do índice agora atual com qualquer mensagem do commit que seja "
-"apropriada."
+msgstr "Faça o commit do índice agora atual com qualquer mensagem do commit que seja apropriada."
 
 #. type: Plain text
 #: en/git-rebase.txt:973
 #, priority:100
 msgid "Repeat the last two steps until your working tree is clean."
-msgstr ""
-"Repita as duas últimas etapas até que a sua árvore de trabalho esteja limpa."
+msgstr "Repita as duas últimas etapas até que a sua árvore de trabalho esteja limpa."
 
 #. type: Plain text
 #: en/git-rebase.txt:975
@@ -47665,12 +41870,7 @@ msgstr "Continue a reconstrução com `git rebase --continue`."
 #: en/git-rebase.txt:980
 #, priority:100
 msgid "If you are not absolutely sure that the intermediate revisions are consistent (they compile, pass the testsuite, etc.) you should use 'git stash' to stash away the not-yet-committed changes after each commit, test, and amend the commit if fixes are necessary."
-msgstr ""
-"Caso não tenha certeza absoluta que as revisões intermediárias são "
-"consistentes (elas compilam, passam no conjunto de testes, etc.), você deve "
-"usar o `git stash` para ocultar o commit das alterações que ainda não foram "
-"feitas após cada commit, teste e a alteração do commit caso as correções "
-"sejam necessárias."
+msgstr "Caso não tenha certeza absoluta que as revisões intermediárias são consistentes (elas compilam, passam no conjunto de testes, etc.), você deve usar o `git stash` para ocultar o commit das alterações que ainda não foram feitas após cada commit, teste e a alteração do commit caso as correções sejam necessárias."
 
 #. type: Title -
 #: en/git-rebase.txt:983
@@ -47682,22 +41882,13 @@ msgstr "SE RECUPERANDO DA RECONSTRUÇÃO DA FUNDAÇÃO INICIAL (UPSTREM REBASE)"
 #: en/git-rebase.txt:990
 #, priority:100
 msgid "Rebasing (or any other form of rewriting) a branch that others have based work on is a bad idea: anyone downstream of it is forced to manually fix their history.  This section explains how to do the fix from the downstream's point of view.  The real fix, however, would be to avoid rebasing the upstream in the first place."
-msgstr ""
-"Fazer a reconstrução da fundação (ou qualquer outra forma de reescrita) de "
-"um ramo onde outras pessoas tem a base de trabalho é uma péssima ideia: "
-"qualquer um que baixe dela é forçado a corrigir manualmente o seu "
-"histórico.  Esta seção explica como fazer a correção do ponto de vista de "
-"quem baixou.  A solução real, no entanto em primeiro lugar, seria evitar "
-"fazer a reconstrução da fundação de quem subiu (upstream)."
+msgstr "Fazer a reconstrução da fundação (ou qualquer outra forma de reescrita) de um ramo onde outras pessoas tem a base de trabalho é uma péssima ideia: qualquer um que baixe dela é forçado a corrigir manualmente o seu histórico.  Esta seção explica como fazer a correção do ponto de vista de quem baixou.  A solução real, no entanto em primeiro lugar, seria evitar fazer a reconstrução da fundação de quem subiu (upstream)."
 
 #. type: Plain text
 #: en/git-rebase.txt:995
 #, priority:100
 msgid "To illustrate, suppose you are in a situation where someone develops a 'subsystem' branch, and you are working on a 'topic' that is dependent on this 'subsystem'.  You might end up with a history like the following:"
-msgstr ""
-"Para ilustrar, suponha que esteja em uma situação onde alguém desenvolva um "
-"ramo de um 'subsystem' e esteja trabalhando em um 'topic' que depende desse "
-"'subsistema'.  Você pode acabar com um histórico como este:"
+msgstr "Para ilustrar, suponha que esteja em uma situação onde alguém desenvolva um ramo de um 'subsystem' e esteja trabalhando em um 'topic' que depende desse 'subsistema'.  Você pode acabar com um histórico como este:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1002
@@ -47719,9 +41910,7 @@ msgstr ""
 #: en/git-rebase.txt:1005
 #, priority:100
 msgid "If 'subsystem' is rebased against 'master', the following happens:"
-msgstr ""
-"Caso a reconstrução da fundação do 'subsystem' seja realizada contra o "
-"'master', o seguinte acontece:"
+msgstr "Caso a reconstrução da fundação do 'subsystem' seja realizada contra o 'master', o seguinte acontece:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1012
@@ -47743,10 +41932,7 @@ msgstr ""
 #: en/git-rebase.txt:1016
 #, priority:100
 msgid "If you now continue development as usual, and eventually merge 'topic' to 'subsystem', the commits from 'subsystem' will remain duplicated forever:"
-msgstr ""
-"Caso agora continue o desenvolvimento normalmente e eventualmente mescle o "
-"'topic' para 'subsystem', os commits do 'subsystem' permanecerão duplicados "
-"para sempre:"
+msgstr "Caso agora continue o desenvolvimento normalmente e eventualmente mescle o 'topic' para 'subsystem', os commits do 'subsystem' permanecerão duplicados para sempre:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1023
@@ -47768,12 +41954,7 @@ msgstr ""
 #: en/git-rebase.txt:1030
 #, priority:100
 msgid "Such duplicates are generally frowned upon because they clutter up history, making it harder to follow.  To clean things up, you need to transplant the commits on 'topic' to the new 'subsystem' tip, i.e., rebase 'topic'.  This becomes a ripple effect: anyone downstream from 'topic' is forced to rebase too, and so on!"
-msgstr ""
-"Geralmente, essas duplicatas são desaprovadas porque desordenam a história, "
-"dificultando o acompanhamento.  Para organizar as coisas, é necessário "
-"transplantar os commits no 'topic' para o novo cume do 'subsystem', ou seja, "
-"reconstruir (rebase) o 'topic'.  Isso se torna um efeito cascata: qualquer "
-"um que baixe do 'topic' é forçado a reconstruir (rebase) também e por aí vai!"
+msgstr "Geralmente, essas duplicatas são desaprovadas porque desordenam a história, dificultando o acompanhamento.  Para organizar as coisas, é necessário transplantar os commits no 'topic' para o novo cume do 'subsystem', ou seja, reconstruir (rebase) o 'topic'.  Isso se torna um efeito cascata: qualquer um que baixe do 'topic' é forçado a reconstruir (rebase) também e por aí vai!"
 
 #. type: Plain text
 #: en/git-rebase.txt:1032
@@ -47791,9 +41972,7 @@ msgstr "Caso fácil: as alterações são literalmente as mesmas."
 #: en/git-rebase.txt:1037
 #, priority:100
 msgid "This happens if the 'subsystem' rebase was a simple rebase and had no conflicts."
-msgstr ""
-"Isso acontece caso a reconstrução do 'subsystem' foi uma reconstrução "
-"simples e não houve conflitos."
+msgstr "Isso acontece caso a reconstrução do 'subsystem' foi uma reconstrução simples e não houve conflitos."
 
 #. type: Labeled list
 #: en/git-rebase.txt:1038
@@ -47805,12 +41984,7 @@ msgstr "Caso difícil: as alterações não são as mesmas."
 #: en/git-rebase.txt:1045
 #, priority:100
 msgid "This happens if the 'subsystem' rebase had conflicts, or used `--interactive` to omit, edit, squash, or fixup commits; or if the upstream used one of `commit --amend`, `reset`, or a full history rewriting command like https://github.com/newren/git-filter-repo[`filter-repo`]."
-msgstr ""
-"Isso acontece caso a reconstrução da fundação (rebase) do 'subsistema' tiver "
-"conflitos ou utilizar o `--interactive` para omitir, editar, esmagar ou "
-"consertar consertos; ou se a inicial utilizou um dos comandos `commit "
-"--amend`, `reset` ou um histórico completo da reescrita como https://github."
-"com/newren/git-filter-repo[`filter-repo`]."
+msgstr "Isso acontece caso a reconstrução da fundação (rebase) do 'subsistema' tiver conflitos ou utilizar o `--interactive` para omitir, editar, esmagar ou consertar consertos; ou se a inicial utilizou um dos comandos `commit --amend`, `reset` ou um histórico completo da reescrita como https://github.com/newren/git-filter-repo[`filter-repo`]."
 
 #. type: Title ~
 #: en/git-rebase.txt:1048
@@ -47822,20 +41996,13 @@ msgstr "O caso fácil"
 #: en/git-rebase.txt:1053
 #, priority:100
 msgid "Only works if the changes (patch IDs based on the diff contents) on 'subsystem' are literally the same before and after the rebase 'subsystem' did."
-msgstr ""
-"Funciona apenas se as alterações (IDs do patch com base no conteúdo do diff) "
-"no 'subsystem' que forem literalmente as mesmas antes e depois da "
-"reconstrução do 'subsystem'."
+msgstr "Funciona apenas se as alterações (IDs do patch com base no conteúdo do diff) no 'subsystem' que forem literalmente as mesmas antes e depois da reconstrução do 'subsystem'."
 
 #. type: Plain text
 #: en/git-rebase.txt:1058
 #, priority:100
 msgid "In that case, the fix is easy because 'git rebase' knows to skip changes that are already present in the new upstream (unless `--reapply-cherry-picks` is given). So if you say (assuming you're on 'topic')"
-msgstr ""
-"Nesse caso, a correção é fácil porque o comando 'git rebase' sabe ignorar as "
-"alterações que já estão presentes no novo 'upstream' (a menos que `--reapply-"
-"cherry-picks` seja utilizada). Então, se você diz (supondo que você esteja "
-"no 'topic')"
+msgstr "Nesse caso, a correção é fácil porque o comando 'git rebase' sabe ignorar as alterações que já estão presentes no novo 'upstream' (a menos que `--reapply-cherry-picks` seja utilizada). Então, se você diz (supondo que você esteja no 'topic')"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1060
@@ -47875,9 +42042,7 @@ msgstr "O caso difícil"
 #: en/git-rebase.txt:1076
 #, priority:100
 msgid "Things get more complicated if the 'subsystem' changes do not exactly correspond to the ones before the rebase."
-msgstr ""
-"As coisas ficam mais complicadas caso as alterações do \"subsistema\" não "
-"coincidam de forma exata aquelas antes da reconstrução."
+msgstr "As coisas ficam mais complicadas caso as alterações do \"subsistema\" não coincidam de forma exata aquelas antes da reconstrução."
 
 #. type: Plain text
 #: en/git-rebase.txt:1081
@@ -47889,21 +42054,15 @@ msgid ""
 "      --interactive` will be **resurrected**!\n"
 msgstr ""
 "Embora uma \"recuperação fácil dos casos\" às vezes pareça ser bem-sucedida\n"
-"      mesmo no caso difícil, pode haver consequências não intencionais.  "
-"Para\n"
-"      Por exemplo, um commit que foi removido através do comando `git "
-"rebase\n"
+"      mesmo no caso difícil, pode haver consequências não intencionais.  Para\n"
+"      Por exemplo, um commit que foi removido através do comando `git rebase\n"
 "      --interactive` será **ressuscitado**!\n"
 
 #. type: Plain text
 #: en/git-rebase.txt:1086
 #, priority:100
 msgid "The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended and your 'topic' began\", that is, what the old merge base between them was.  You will have to find a way to name the last commit of the old 'subsystem', for example:"
-msgstr ""
-"A ideia é dizer manualmente ao comando 'git rebase' \"onde o 'subsistema' "
-"antigo terminou e o seu 'tópico' começou\", ou seja, qual era a base da "
-"mesclagem antiga entre eles.  Você precisará encontrar uma maneira de nomear "
-"o último commit do antigo 'subsistema', por exemplo:"
+msgstr "A ideia é dizer manualmente ao comando 'git rebase' \"onde o 'subsistema' antigo terminou e o seu 'tópico' começou\", ou seja, qual era a base da mesclagem antiga entre eles.  Você precisará encontrar uma maneira de nomear o último commit do antigo 'subsistema', por exemplo:"
 
 #. type: Plain text
 #: en/git-rebase.txt:1090
@@ -47915,17 +42074,13 @@ msgstr "Com o 'subsistema' reflog: depois de 'git fetch', o antigo cume do 'subs
 #: en/git-rebase.txt:1093
 #, priority:100
 msgid "Relative to the tip of 'topic': knowing that your 'topic' has three commits, the old tip of 'subsystem' must be `topic~3`."
-msgstr ""
-"Em relação ao cume do 'topic': sabendo que o seu 'topic' tem três commits, o "
-"cume antigo do 'subsystem' deve ser `topic~3`."
+msgstr "Em relação ao cume do 'topic': sabendo que o seu 'topic' tem três commits, o cume antigo do 'subsystem' deve ser `topic~3`."
 
 #. type: Plain text
 #: en/git-rebase.txt:1096
 #, priority:100
 msgid "You can then transplant the old `subsystem..topic` to the new tip by saying (for the reflog case, and assuming you are on 'topic' already):"
-msgstr ""
-"Você pode então transplantar o antigo `subsystem..topic` para o novo cume "
-"dizendo (para o caso do reflog e supondo que você já esteja no 'topic'):"
+msgstr "Você pode então transplantar o antigo `subsystem..topic` para o novo cume dizendo (para o caso do reflog e supondo que você já esteja no 'topic'):"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1098
@@ -47937,10 +42092,7 @@ msgstr "    $ git rebase --onto subsystem subsystem@{1}\n"
 #: en/git-rebase.txt:1103
 #, priority:100
 msgid "The ripple effect of a \"hard case\" recovery is especially bad: 'everyone' downstream from 'topic' will now have to perform a \"hard case\" recovery too!"
-msgstr ""
-"O efeito cascata de uma recuperação \"difícil\" (hard case) é especialmente "
-"ruim: 'todos' baixaram do 'topic' e agora terão que executar também uma "
-"reconstrução \"difícil\"!"
+msgstr "O efeito cascata de uma recuperação \"difícil\" (hard case) é especialmente ruim: 'todos' baixaram do 'topic' e agora terão que executar também uma reconstrução \"difícil\"!"
 
 #. type: Title -
 #: en/git-rebase.txt:1105
@@ -47952,32 +42104,19 @@ msgstr "RECONSTRUINDO AS MESCLAGENS"
 #: en/git-rebase.txt:1113
 #, priority:100
 msgid "The interactive rebase command was originally designed to handle individual patch series. As such, it makes sense to exclude merge commits from the todo list, as the developer may have merged the then-current `master` while working on the branch, only to rebase all the commits onto `master` eventually (skipping the merge commits)."
-msgstr ""
-"O comando de reconstrução interativa foi originalmente projetado para lidar "
-"com séries de patches individuais. Como tal, faz sentido excluir a mesclagem "
-"dos commits da lista de tarefas, pois o desenvolvedor pode ter mesclado o "
-"`master` atual enquanto trabalhava no ramo, apenas para redefinir todos os "
-"commits para `master` eventualmente (ignorando a mesclagem dos commits)."
+msgstr "O comando de reconstrução interativa foi originalmente projetado para lidar com séries de patches individuais. Como tal, faz sentido excluir a mesclagem dos commits da lista de tarefas, pois o desenvolvedor pode ter mesclado o `master` atual enquanto trabalhava no ramo, apenas para redefinir todos os commits para `master` eventualmente (ignorando a mesclagem dos commits)."
 
 #. type: Plain text
 #: en/git-rebase.txt:1117
 #, priority:100
 msgid "However, there are legitimate reasons why a developer may want to recreate merge commits: to keep the branch structure (or \"commit topology\") when working on multiple, inter-related branches."
-msgstr ""
-"No entanto, existem razões legítimas pelas quais um desenvolvedor pode "
-"querer recriar as mesclagens dos commits: para manter a estrutura do ramo ("
-"ou a \"topologia do commit\") ao trabalhar em diversos ramos inter-"
-"relacionadas."
+msgstr "No entanto, existem razões legítimas pelas quais um desenvolvedor pode querer recriar as mesclagens dos commits: para manter a estrutura do ramo (ou a \"topologia do commit\") ao trabalhar em diversos ramos inter-relacionadas."
 
 #. type: Plain text
 #: en/git-rebase.txt:1122
 #, priority:100
 msgid "In the following example, the developer works on a topic branch that refactors the way buttons are defined, and on another topic branch that uses that refactoring to implement a \"Report a bug\" button. The output of `git log --graph --format=%s -5` may look like this:"
-msgstr ""
-"No exemplo a seguir, o desenvolvedor trabalha em um tópico no ramo que "
-"refatora a maneira como os botões são definidos, em outro tópico do ramo que "
-"utilize esta refatoração para implementar um botão \"Relatar um bug\". A "
-"saída do `git log --graph --format=%s -5` pode ficar assim:"
+msgstr "No exemplo a seguir, o desenvolvedor trabalha em um tópico no ramo que refatora a maneira como os botões são definidos, em outro tópico do ramo que utilize esta refatoração para implementar um botão \"Relatar um bug\". A saída do `git log --graph --format=%s -5` pode ficar assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1132
@@ -48005,20 +42144,13 @@ msgstr ""
 #: en/git-rebase.txt:1139
 #, priority:100
 msgid "The developer might want to rebase those commits to a newer `master` while keeping the branch topology, for example when the first topic branch is expected to be integrated into `master` much earlier than the second one, say, to resolve merge conflicts with changes to the DownloadButton class that made it into `master`."
-msgstr ""
-"O desenvolvedor pode querer redefinir estes commits para um novo `master` "
-"enquanto mantém a topologia da ramificação. Quando se espera que o primeiro "
-"tópico do ramo que seja integrado ao` master` muito antes do segundo por "
-"exemplo. Para resolver os conflitos da mesclagem com as alterações para a "
-"classe `DownloadButton` que a transformou em `master` por exemplo."
+msgstr "O desenvolvedor pode querer redefinir estes commits para um novo `master` enquanto mantém a topologia da ramificação. Quando se espera que o primeiro tópico do ramo que seja integrado ao` master` muito antes do segundo por exemplo. Para resolver os conflitos da mesclagem com as alterações para a classe `DownloadButton` que a transformou em `master` por exemplo."
 
 #. type: Plain text
 #: en/git-rebase.txt:1142
 #, priority:100
 msgid "This rebase can be performed using the `--rebase-merges` option.  It will generate a todo list looking like this:"
-msgstr ""
-"Esta reconstrução pode ser realizada utilizando a opção `--rebase-merges`.  "
-"Ele irá gerar uma lista de tarefas, assim:"
+msgstr "Esta reconstrução pode ser realizada utilizando a opção `--rebase-merges`.  Ele irá gerar uma lista de tarefas, assim:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1145 en/git-rebase.txt:1222
@@ -48072,89 +42204,49 @@ msgstr ""
 #: en/git-rebase.txt:1164
 #, priority:100
 msgid "In contrast to a regular interactive rebase, there are `label`, `reset` and `merge` commands in addition to `pick` ones."
-msgstr ""
-"Ao contrário de uma reconstrução interativa regular, existem os comandos "
-"`label`, `reset` e `merge` além dos comandos `pick`."
+msgstr "Ao contrário de uma reconstrução interativa regular, existem os comandos `label`, `reset` e `merge` além dos comandos `pick`."
 
 #. type: Plain text
 #: en/git-rebase.txt:1172
 #, priority:100
 msgid "The `label` command associates a label with the current HEAD when that command is executed. These labels are created as worktree-local refs (`refs/rewritten/<label>`) that will be deleted when the rebase finishes. That way, rebase operations in multiple worktrees linked to the same repository do not interfere with one another. If the `label` command fails, it is rescheduled immediately, with a helpful message how to proceed."
-msgstr ""
-"O comando `label` associa um rótulo ao `HEAD` atual quando este comando for "
-"executado. Estes rótulos são criados como refs locais da árvore de trabalho "
-"(`refs/rewritten/<label>`) que serão excluídos quando a reconstrução "
-"terminar. Dessa forma, as operações da reconstrução em várias árvores de "
-"trabalho vinculadas ao mesmo repositório não interferem entre si. Caso o "
-"comando `label` falhe, este é imediatamente reagendado, com uma mensagem "
-"útil sobre como proceder."
+msgstr "O comando `label` associa um rótulo ao `HEAD` atual quando este comando for executado. Estes rótulos são criados como refs locais da árvore de trabalho (`refs/rewritten/<label>`) que serão excluídos quando a reconstrução terminar. Dessa forma, as operações da reconstrução em várias árvores de trabalho vinculadas ao mesmo repositório não interferem entre si. Caso o comando `label` falhe, este é imediatamente reagendado, com uma mensagem útil sobre como proceder."
 
 #. type: Plain text
 #: en/git-rebase.txt:1179
 #, priority:100
 msgid "The `reset` command resets the HEAD, index and worktree to the specified revision. It is similar to an `exec git reset --hard <label>`, but refuses to overwrite untracked files. If the `reset` command fails, it is rescheduled immediately, with a helpful message how to edit the todo list (this typically happens when a `reset` command was inserted into the todo list manually and contains a typo)."
-msgstr ""
-"O comando `reset` redefine o `HEAD`, o índice e a árvore de trabalho para a "
-"revisão específica. É semelhante a um comando `exec git reset --hard <label>`"
-", porém se recusa a sobrescrever os arquivos que não sejam monitorados. Se o "
-"comando `reset` falhar, ele será imediatamente reagendado, com uma mensagem "
-"útil sobre como editar a lista de tarefas (normalmente acontece quando um "
-"comando `reset` foi inserido manualmente na lista de tarefas e contém um "
-"erro de digitação)."
+msgstr "O comando `reset` redefine o `HEAD`, o índice e a árvore de trabalho para a revisão específica. É semelhante a um comando `exec git reset --hard <label>`, porém se recusa a sobrescrever os arquivos que não sejam monitorados. Se o comando `reset` falhar, ele será imediatamente reagendado, com uma mensagem útil sobre como editar a lista de tarefas (normalmente acontece quando um comando `reset` foi inserido manualmente na lista de tarefas e contém um erro de digitação)."
 
 #. type: Plain text
 #: en/git-rebase.txt:1185
 #, priority:100
 msgid "The `merge` command will merge the specified revision(s) into whatever is HEAD at that time. With `-C <original-commit>`, the commit message of the specified merge commit will be used. When the `-C` is changed to a lower-case `-c`, the message will be opened in an editor after a successful merge so that the user can edit the message."
-msgstr ""
-"O comando `merge` mesclará revisões especificadas no que seja `HEAD` naquele "
-"momento. Com `-C <original-commit>`, a mensagem do commit de um determinada "
-"mesclagem será usada. Quando o `C` é alterado para minúsculo `-c`, a "
-"mensagem será aberta em um editor após uma mesclagem bem-sucedida, para que "
-"o usuário possa edita-lá."
+msgstr "O comando `merge` mesclará revisões especificadas no que seja `HEAD` naquele momento. Com `-C <original-commit>`, a mensagem do commit de um determinada mesclagem será usada. Quando o `C` é alterado para minúsculo `-c`, a mensagem será aberta em um editor após uma mesclagem bem-sucedida, para que o usuário possa edita-lá."
 
 #. type: Plain text
 #: en/git-rebase.txt:1188
 #, priority:100
 msgid "If a `merge` command fails for any reason other than merge conflicts (i.e.  when the merge operation did not even start), it is rescheduled immediately."
-msgstr ""
-"Caso um comando `merge` falhar por qualquer motivo que não seja um conflito "
-"da mesclagem (ou seja, quando a operação da mesclagem sequer iniciou), ele "
-"será reagendado imediatamente."
+msgstr "Caso um comando `merge` falhar por qualquer motivo que não seja um conflito da mesclagem (ou seja, quando a operação da mesclagem sequer iniciou), ele será reagendado imediatamente."
 
 #. type: Plain text
 #: en/git-rebase.txt:1195
 #, priority:100
 msgid "At this time, the `merge` command will *always* use the `recursive` merge strategy for regular merges, and `octopus` for octopus merges, with no way to choose a different one. To work around this, an `exec` command can be used to call `git merge` explicitly, using the fact that the labels are worktree-local refs (the ref `refs/rewritten/onto` would correspond to the label `onto`, for example)."
-msgstr ""
-"Neste momento, o comando `merge` *sempre* utilizará a estratégia da "
-"mesclagem `recursiva` para as mesclagens regulares, e `octopus` para "
-"mesclagens \"polvo\", sem nenhuma maneira de escolher uma diferente. Para "
-"contornar isso, um comando `exec` pode ser utilizado para chamar o comando `"
-"git merge` de forma explicita, utilizando o fato onde os rótulos são as "
-"'refs' locais da área de trabalho (o ref `refs/rewritten/onto` "
-"corresponderia ao rótulo `onto` , por exemplo)."
+msgstr "Neste momento, o comando `merge` *sempre* utilizará a estratégia da mesclagem `recursiva` para as mesclagens regulares, e `octopus` para mesclagens \"polvo\", sem nenhuma maneira de escolher uma diferente. Para contornar isso, um comando `exec` pode ser utilizado para chamar o comando `git merge` de forma explicita, utilizando o fato onde os rótulos são as 'refs' locais da área de trabalho (o ref `refs/rewritten/onto` corresponderia ao rótulo `onto` , por exemplo)."
 
 #. type: Plain text
 #: en/git-rebase.txt:1199
 #, priority:100
 msgid "Note: the first command (`label onto`) labels the revision onto which the commits are rebased; The name `onto` is just a convention, as a nod to the `--onto` option."
-msgstr ""
-"Observação: o primeiro comando (`label onto`) rotula a revisão onde os "
-"commits são refeitos; O nome `onto` é apenas uma convenção, como um aceno "
-"para a opção `--onto`."
+msgstr "Observação: o primeiro comando (`label onto`) rotula a revisão onde os commits são refeitos; O nome `onto` é apenas uma convenção, como um aceno para a opção `--onto`."
 
 #. type: Plain text
 #: en/git-rebase.txt:1206
 #, priority:100
 msgid "It is also possible to introduce completely new merge commits from scratch by adding a command of the form `merge <merge-head>`. This form will generate a tentative commit message and always open an editor to let the user edit it. This can be useful e.g. when a topic branch turns out to address more than a single concern and wants to be split into two or even more topic branches. Consider this todo list:"
-msgstr ""
-"Também é possível introduzir commits para mesclagem completamente novos, "
-"adicionando um comando no formato `merge <merge-head>`. Este formulário gera "
-"uma mensagem de commit provisória e sempre abre um editor para permitir que "
-"o usuário a edite. Pode ser útil quando por exemplo, um ramo de um tópico "
-"acaba resolvendo mais de um problema e quer ser dividido em dois ou mais "
-"ramos de tópico. Considere esta lista de tarefas:"
+msgstr "Também é possível introduzir commits para mesclagem completamente novos, adicionando um comando no formato `merge <merge-head>`. Este formulário gera uma mensagem de commit provisória e sempre abre um editor para permitir que o usuário a edite. Pode ser útil quando por exemplo, um ramo de um tópico acaba resolvendo mais de um problema e quer ser dividido em dois ou mais ramos de tópico. Considere esta lista de tarefas:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1213
@@ -48176,12 +42268,7 @@ msgstr ""
 #: en/git-rebase.txt:1219
 #, priority:100
 msgid "The one commit in this list that is not related to CMake may very well have been motivated by working on fixing all those bugs introduced by switching to CMake, but it addresses a different concern. To split this branch into two topic branches, the todo list could be edited like this:"
-msgstr ""
-"O único commit nesta lista que não está relacionado ao CMake pode muito bem "
-"ter sido motivado ao trabalhar na correção de todos os erros introduzidos "
-"durante a mudança para o CMake, porém ele lida com um interesse diferente. "
-"Para dividir esse ramo em dois tópicos, a lista de tarefas pode ser editada "
-"desta maneira:"
+msgstr "O único commit nesta lista que não está relacionado ao CMake pode muito bem ter sido motivado ao trabalhar na correção de todos os erros introduzidos durante a mudança para o CMake, porém ele lida com um interesse diferente. Para dividir esse ramo em dois tópicos, a lista de tarefas pode ser editada desta maneira:"
 
 #. type: delimited block -
 #: en/git-rebase.txt:1225
@@ -48227,13 +42314,7 @@ msgstr ""
 #: en/git-rebase.txt:1245
 #, priority:100
 msgid "The todo list presented by the deprecated `--preserve-merges --interactive` does not represent the topology of the revision graph (use `--rebase-merges` instead).  Editing commits and rewording their commit messages should work fine, but attempts to reorder commits tend to produce counterintuitive results.  Use `--rebase-merges` in such scenarios instead."
-msgstr ""
-"A lista de tarefas apresentada pela opção descontinuada `--preserve-merges "
-"--interactive` não representa a topologia do grafo da revisão (em vez disso "
-"use a opção `--rebase-merges`).  A edição dos commits e a reformulação das "
-"suas mensagens devem funcionar bem, porém as tentativas de reordenar os "
-"commits tendem a produzir resultados contra-intuitivos.  Em vez disso, use a "
-"opção `--rebase-merges` em tais cenários."
+msgstr "A lista de tarefas apresentada pela opção descontinuada `--preserve-merges --interactive` não representa a topologia do grafo da revisão (em vez disso use a opção `--rebase-merges`).  A edição dos commits e a reformulação das suas mensagens devem funcionar bem, porém as tentativas de reordenar os commits tendem a produzir resultados contra-intuitivos.  Em vez disso, use a opção `--rebase-merges` em tais cenários."
 
 #. type: Plain text
 #: en/git-rebase.txt:1247
@@ -48293,9 +42374,7 @@ msgstr "'git-receive-pack' <diretório>\n"
 #: en/git-receive-pack.txt:18
 #, priority:100
 msgid "Invoked by 'git send-pack' and updates the repository with the information fed from the remote end."
-msgstr ""
-"Chamado através do comando 'git send-pack' e atualiza o repositório com as "
-"informações fornecidas pelo terminal remoto."
+msgstr "Chamado através do comando 'git send-pack' e atualiza o repositório com as informações fornecidas pelo terminal remoto."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:23
@@ -48307,29 +42386,19 @@ msgstr "Este comando geralmente não é invocado diretamente pelo usuário final
 #: en/git-receive-pack.txt:28
 #, priority:100
 msgid "The command allows for creation and fast-forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end 'git-receive-pack' runs, but to the user who is sitting at the send-pack end, it is updating the remote.  Confused?)"
-msgstr ""
-"O comando permite a criação e o encaminhamento rápido dos sha1 das refs ("
-"heads/tags) na extremidade remota (falando estritamente, é a extremidade "
-"local do comando 'git receive pack' executado, porém, para o usuário que "
-"está sentado na outra extremidade do pacote de envio, é atualizando o ramo "
-"remoto.  Confundiu?)"
+msgstr "O comando permite a criação e o encaminhamento rápido dos sha1 das refs (heads/tags) na extremidade remota (falando estritamente, é a extremidade local do comando 'git receive pack' executado, porém, para o usuário que está sentado na outra extremidade do pacote de envio, é atualizando o ramo remoto.  Confundiu?)"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:31
 #, priority:100
 msgid "There are other real-world examples of using update and post-update hooks found in the Documentation/howto directory."
-msgstr ""
-"Existem outros exemplos no mundo real da utilização dos ganchos de "
-"atualização e pós-atualização encontrados no diretório 'Documentation/howto'."
+msgstr "Existem outros exemplos no mundo real da utilização dos ganchos de atualização e pós-atualização encontrados no diretório 'Documentation/howto'."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:35
 #, priority:100
 msgid "'git-receive-pack' honours the receive.denyNonFastForwards config option, which tells it if updates to a ref should be denied if they are not fast-forwards."
-msgstr ""
-"O coamndo 'git-receive-pack' respeita a opção de configuração `receive."
-"denyNonFastForwards`, que informa se as atualizações de uma \"ref\" devem "
-"ser negadas caso não sejam rápidas."
+msgstr "O coamndo 'git-receive-pack' respeita a opção de configuração `receive.denyNonFastForwards`, que informa se as atualizações de uma \"ref\" devem ser negadas caso não sejam rápidas."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:38
@@ -48353,11 +42422,7 @@ msgstr "O GANCHO DE PRÉ-RECEBIMENTO"
 #: en/git-receive-pack.txt:49
 #, priority:100
 msgid "Before any ref is updated, if $GIT_DIR/hooks/pre-receive file exists and is executable, it will be invoked once with no parameters.  The standard input of the hook will be one line per ref to be updated:"
-msgstr ""
-"Antes de qualquer \"ref\" ser atualizada, caso o arquivo '$GIT_DIR/hooks/pre-"
-"receive' existir e for executável, ele será chamado uma vez e sem "
-"parâmetros.  A entrada predefinido do gancho será uma linha por referência "
-"que será atualizada:"
+msgstr "Antes de qualquer \"ref\" ser atualizada, caso o arquivo '$GIT_DIR/hooks/pre-receive' existir e for executável, ele será chamado uma vez e sem parâmetros.  A entrada predefinido do gancho será uma linha por referência que será atualizada:"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:51 en/git-receive-pack.txt:150
@@ -48369,14 +42434,7 @@ msgstr "       sha1-old SP sha1-new SP refname LF\n"
 #: en/git-receive-pack.txt:58
 #, priority:100
 msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\".  The two sha1 values before each refname are the object names for the refname before and after the update.  Refs to be created will have sha1-old equal to 0\\{40}, while refs to be deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
-msgstr ""
-"O valor do 'refname' é relativo ao `$GIT_DIR`; como por exemplo, para a "
-"cabeçalho principal, isto é \"refs/heads/master\".  Os dois valores sha1 "
-"antes de cada 'refname' são os nomes dos objetos para o 'refname' antes e "
-"depois da atualização.  As refs que serão criadas terão um sha1 antigo igual "
-"a '0\\{40}', enquanto as refs que serão excluídas terão um sha1 novo igual a "
-"0\\{40}, caso contrário, tanto o sha1 novo quanto o sha1 antigo devem ser "
-"objetos válidos no repositório."
+msgstr "O valor do 'refname' é relativo ao `$GIT_DIR`; como por exemplo, para a cabeçalho principal, isto é \"refs/heads/master\".  Os dois valores sha1 antes de cada 'refname' são os nomes dos objetos para o 'refname' antes e depois da atualização.  As refs que serão criadas terão um sha1 antigo igual a '0\\{40}', enquanto as refs que serão excluídas terão um sha1 novo igual a 0\\{40}, caso contrário, tanto o sha1 novo quanto o sha1 antigo devem ser objetos válidos no repositório."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:65
@@ -48394,9 +42452,7 @@ msgstr "`GIT_PUSH_CERT_SIGNER`"
 #: en/git-receive-pack.txt:69
 #, priority:100
 msgid "The name and the e-mail address of the owner of the key that signed the push certificate."
-msgstr ""
-"O nome e o endereço do e-mail do proprietário da chave que assinou o "
-"certificado push."
+msgstr "O nome e o endereço do e-mail do proprietário da chave que assinou o certificado push."
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:70
@@ -48432,12 +42488,7 @@ msgstr "`GIT_PUSH_CERT_NONCE`"
 #: en/git-receive-pack.txt:84
 #, priority:100
 msgid "The nonce string the process asked the signer to include in the push certificate.  If this does not match the value recorded on the \"nonce\" header in the push certificate, it may indicate that the certificate is a valid one that is being replayed from a separate \"git push\" session."
-msgstr ""
-"A sequência nonce que o processo solicitou ao assinante para incluir no "
-"certificado \"push\".  Caso isso não corresponda ao valor registrado no "
-"cabeçalho \"nonce\" no certificado \"push\", isso pode indicar que o "
-"certificado é válido e está sendo reproduzido em uma sessão separada do "
-"comando \"git push\"."
+msgstr "A sequência nonce que o processo solicitou ao assinante para incluir no certificado \"push\".  Caso isso não corresponda ao valor registrado no cabeçalho \"nonce\" no certificado \"push\", isso pode indicar que o certificado é válido e está sendo reproduzido em uma sessão separada do comando \"git push\"."
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:85
@@ -48455,9 +42506,7 @@ msgstr "`UNSOLICITED`"
 #: en/git-receive-pack.txt:89
 #, priority:100
 msgid "\"git push --signed\" sent a nonce when we did not ask it to send one."
-msgstr ""
-"O comando \"git push --signed\" enviou um nonce quando não pedimos para "
-"enviar um."
+msgstr "O comando \"git push --signed\" enviou um nonce quando não pedimos para enviar um."
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:89
@@ -48493,8 +42542,7 @@ msgstr "`OK`"
 #: en/git-receive-pack.txt:95
 #, priority:100
 msgid "\"git push --signed\" sent the nonce we asked it to send."
-msgstr ""
-"O comando \"git push --signed\" enviou o nonce que pedimos para ser enviado."
+msgstr "O comando \"git push --signed\" enviou o nonce que pedimos para ser enviado."
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:95
@@ -48506,10 +42554,7 @@ msgstr "`SLOP`"
 #: en/git-receive-pack.txt:99
 #, priority:100
 msgid "\"git push --signed\" sent a nonce different from what we asked it to send now, but in a previous session.  See `GIT_PUSH_CERT_NONCE_SLOP` environment variable."
-msgstr ""
-"O comando \"git push --signed\" enviou um nonce diferente do que foi pedido "
-"para enviar agora, porém em uma sessão anterior.  Consulte a variável de "
-"ambiente `GIT_PUSH_CERT_NONCE_SLOP`."
+msgstr "O comando \"git push --signed\" enviou um nonce diferente do que foi pedido para enviar agora, porém em uma sessão anterior.  Consulte a variável de ambiente `GIT_PUSH_CERT_NONCE_SLOP`."
 
 #. type: Labeled list
 #: en/git-receive-pack.txt:100
@@ -48521,30 +42566,19 @@ msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
 #: en/git-receive-pack.txt:108
 #, priority:100
 msgid "\"git push --signed\" sent a nonce different from what we asked it to send now, but in a different session whose starting time is different by this many seconds from the current session.  Only meaningful when `GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`.  Also read about `receive.certNonceSlop` variable in linkgit:git-config[1]."
-msgstr ""
-"O comando \"git push --signed\" enviou um nonce diferente do que foi pedido "
-"agora, porém em uma sessão diferente, cujo horário do início e é diferente "
-"em muitos segundos da sessão atual.  So faz sentido quando "
-"`GIT_PUSH_CERT_NONCE_STATUS` diz `SLOP`.  Leia também sobre a variável "
-"`receive.certNonceSlop` no linkgit:git-config[1]."
+msgstr "O comando \"git push --signed\" enviou um nonce diferente do que foi pedido agora, porém em uma sessão diferente, cujo horário do início e é diferente em muitos segundos da sessão atual.  So faz sentido quando `GIT_PUSH_CERT_NONCE_STATUS` diz `SLOP`.  Leia também sobre a variável `receive.certNonceSlop` no linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:111
 #, priority:100
 msgid "This hook is called before any refname is updated and before any fast-forward checks are performed."
-msgstr ""
-"Este gancho é chamado antes que qualquer \"refname\" seja atualizado e antes "
-"que qualquer verificação de avanço rápido seja executada."
+msgstr "Este gancho é chamado antes que qualquer \"refname\" seja atualizado e antes que qualquer verificação de avanço rápido seja executada."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:116
 #, priority:100
 msgid "If the pre-receive hook exits with a non-zero exit status no updates will be performed, and the update, post-receive and post-update hooks will not be invoked either.  This can be useful to quickly bail out if the update is not to be supported."
-msgstr ""
-"Caso o gancho 'pre-receive' termine com uma condição diferente de zero, "
-"nenhuma atualização será executada, a atualização, os ganchos 'pre-receive' "
-"e 'post-update' também não serão invocados.  Isso pode ser útil para o "
-"resgate rápido caso a atualização não seja compatível."
+msgstr "Caso o gancho 'pre-receive' termine com uma condição diferente de zero, nenhuma atualização será executada, a atualização, os ganchos 'pre-receive' e 'post-update' também não serão invocados.  Isso pode ser útil para o resgate rápido caso a atualização não seja compatível."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:118
@@ -48562,10 +42596,7 @@ msgstr "GANCHO DE ATUALIZAÇÃO"
 #: en/git-receive-pack.txt:123
 #, priority:100
 msgid "Before each ref is updated, if $GIT_DIR/hooks/update file exists and is executable, it is invoked once per ref, with three parameters:"
-msgstr ""
-"Antes de cada \"ref\" que será atualizada, caso o arquivo '$GIT_DIR/hooks/"
-"update' existir e for executável, ele será chamado uma vez por referência, "
-"com três parâmetros:"
+msgstr "Antes de cada \"ref\" que será atualizada, caso o arquivo '$GIT_DIR/hooks/update' existir e for executável, ele será chamado uma vez por referência, com três parâmetros:"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:125
@@ -48577,33 +42608,19 @@ msgstr "       $GIT_DIR/hooks/update refname sha1-old sha1-new\n"
 #: en/git-receive-pack.txt:132
 #, priority:100
 msgid "The refname parameter is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\".  The two sha1 arguments are the object names for the refname before and after the update.  Note that the hook is called before the refname is updated, so either sha1-old is 0\\{40} (meaning there is no such ref yet), or it should match what is recorded in refname."
-msgstr ""
-"O parâmetro \"refname\" é relativo ao `$GIT_DIR`; como por exemplo, para a "
-"cabeçalho principal, isto é \"refs/heads/master\".  Os dois argumentos sha1 "
-"são os nomes dos objetos para o \"refname\" antes e depois da atualização.  "
-"Observe que o gancho é chamado antes que o \"refname\" seja atualizado; "
-"portanto, o sha1 antigo é 0\\{40} (o que significa que essa \"ref\" ainda "
-"não existe) ou deve coincidir ao que está registrado no \"refname\"."
+msgstr "O parâmetro \"refname\" é relativo ao `$GIT_DIR`; como por exemplo, para a cabeçalho principal, isto é \"refs/heads/master\".  Os dois argumentos sha1 são os nomes dos objetos para o \"refname\" antes e depois da atualização.  Observe que o gancho é chamado antes que o \"refname\" seja atualizado; portanto, o sha1 antigo é 0\\{40} (o que significa que essa \"ref\" ainda não existe) ou deve coincidir ao que está registrado no \"refname\"."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:135
 #, priority:100
 msgid "The hook should exit with non-zero status if it wants to disallow updating the named ref.  Otherwise it should exit with zero."
-msgstr ""
-"O gancho deve encerrar com uma condição diferente de zero caso queira "
-"impedir a atualização da \"ref\" informada.  Caso contrário, ele deve "
-"encerrar com zero."
+msgstr "O gancho deve encerrar com uma condição diferente de zero caso queira impedir a atualização da \"ref\" informada.  Caso contrário, ele deve encerrar com zero."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:140
 #, priority:100
 msgid "Successful execution (a zero exit status) of this hook does not ensure the ref will actually be updated, it is only a prerequisite.  As such it is not a good idea to send notices (e.g. email) from this hook.  Consider using the post-receive hook instead."
-msgstr ""
-"Uma execução bem-sucedida (uma condição de encerramento com zero) deste "
-"gancho não garante que a \"ref\" seja realmente atualizada; é apenas um pré-"
-"requisito.  Como tal, não é uma boa ideia enviar avisos (por email por "
-"exemplo) deste gancho.  Em vez disso, considere utilizar o gancho pós-"
-"recebimento."
+msgstr "Uma execução bem-sucedida (uma condição de encerramento com zero) deste gancho não garante que a \"ref\" seja realmente atualizada; é apenas um pré-requisito.  Como tal, não é uma boa ideia enviar avisos (por email por exemplo) deste gancho.  Em vez disso, considere utilizar o gancho pós-recebimento."
 
 #. type: Title -
 #: en/git-receive-pack.txt:142
@@ -48615,44 +42632,25 @@ msgstr "O GANCHO DO PÓS-RECEBIMENTO"
 #: en/git-receive-pack.txt:148
 #, priority:100
 msgid "After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post-receive file exists and is executable, it will be invoked once with no parameters.  The standard input of the hook will be one line for each successfully updated ref:"
-msgstr ""
-"Depois da atualização de todas as refs (ou que tentaram ser atualizadas), "
-"caso alguma atualização seja bem-sucedida e se o arquivo '$GIT_DIR/hooks/"
-"post-receive' existir e for executável, ele será chamado uma vez sem "
-"parâmetros.  A entrada padrão do gancho será uma linha para cada 'ref' "
-"atualizada com êxito:"
+msgstr "Depois da atualização de todas as refs (ou que tentaram ser atualizadas), caso alguma atualização seja bem-sucedida e se o arquivo '$GIT_DIR/hooks/post-receive' existir e for executável, ele será chamado uma vez sem parâmetros.  A entrada padrão do gancho será uma linha para cada 'ref' atualizada com êxito:"
 
 #. type: Plain text
 #: en/git-receive-pack.txt:158
 #, priority:100
 msgid "The refname value is relative to $GIT_DIR; e.g. for the master head this is \"refs/heads/master\".  The two sha1 values before each refname are the object names for the refname before and after the update.  Refs that were created will have sha1-old equal to 0\\{40}, while refs that were deleted will have sha1-new equal to 0\\{40}, otherwise sha1-old and sha1-new should be valid objects in the repository."
-msgstr ""
-"O valor do 'refname' é relativo ao `$GIT_DIR`; como por exemplo, para a "
-"cabeçalho principal, isto é \"refs/heads/master\".  Os dois valores sha1 "
-"antes de cada 'refname' são os nomes dos objetos para o 'refname' antes e "
-"depois da atualização.  As refs que serão criadas terão um sha1 antigo igual "
-"a '0\\{40}', enquanto as refs que serão excluídas terão um sha1 novo igual a "
-"0\\{40}, caso contrário, tanto o sha1 novo quanto o sha1 antigo devem ser "
-"objetos válidos no repositório."
+msgstr "O valor do 'refname' é relativo ao `$GIT_DIR`; como por exemplo, para a cabeçalho principal, isto é \"refs/heads/master\".  Os dois valores sha1 antes de cada 'refname' são os nomes dos objetos para o 'refname' antes e depois da atualização.  As refs que serão criadas terão um sha1 antigo igual a '0\\{40}', enquanto as refs que serão excluídas terão um sha1 novo igual a 0\\{40}, caso contrário, tanto o sha1 novo quanto o sha1 antigo devem ser objetos válidos no repositório."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:161
 #, priority:100
 msgid "The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-receive` hook, after accepting a signed push."
-msgstr ""
-"As variáveis de ambiente `GIT_PUSH_CERT*` podem ser inspecionadas, assim "
-"como no gancho de `pré-recebimento`, após aceitar um \"push\" assinado."
+msgstr "As variáveis de ambiente `GIT_PUSH_CERT*` podem ser inspecionadas, assim como no gancho de `pré-recebimento`, após aceitar um \"push\" assinado."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:167
 #, priority:100
 msgid "Using this hook, it is easy to generate mails describing the updates to the repository.  This example script sends one mail message per ref listing the commits pushed to the repository, and logs the push certificates of signed pushes with good signatures to a logger service:"
-msgstr ""
-"Com a utilização deste gancho, é fácil gerar e-mails descrevendo as "
-"atualizações no repositório.  Este script de demonstração envia uma mensagem "
-"de e-mail listando cada \"ref\" dos commits impulsionados ao repositório e "
-"faz o registro dos certificados dos impulsionamentos assinados com boas "
-"assinaturas em um serviço para o registro dos eventos:"
+msgstr "Com a utilização deste gancho, é fácil gerar e-mails descrevendo as atualizações no repositório.  Este script de demonstração envia uma mensagem de e-mail listando cada \"ref\" dos commits impulsionados ao repositório e faz o registro dos certificados dos impulsionamentos assinados com boas assinaturas em um serviço para o registro dos eventos:"
 
 #. type: delimited block -
 #: en/git-receive-pack.txt:192
@@ -48702,8 +42700,7 @@ msgstr ""
 "\t(\n"
 "\t\techo expected nonce is ${GIT_PUSH_NONCE}\n"
 "\t\tgit cat-file blob ${GIT_PUSH_CERT}\n"
-"\t) | mail -s \"certificado push do $GIT_PUSH_CERT_SIGNER\" push-log@"
-"mydomain\n"
+"\t) | mail -s \"certificado push do $GIT_PUSH_CERT_SIGNER\" push-log@mydomain\n"
 "fi\n"
 "exit 0\n"
 
@@ -48711,21 +42708,13 @@ msgstr ""
 #: en/git-receive-pack.txt:196
 #, priority:100
 msgid "The exit code from this hook invocation is ignored, however a non-zero exit code will generate an error message."
-msgstr ""
-"O código de encerramento vindo desta invocação do gancho é ignorado; no "
-"entanto, um código de encerramento diferente de zero gera uma mensagem de "
-"erro."
+msgstr "O código de encerramento vindo desta invocação do gancho é ignorado; no entanto, um código de encerramento diferente de zero gera uma mensagem de erro."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:202
 #, priority:100
 msgid "Note that it is possible for refname to not have sha1-new when this hook runs.  This can easily occur if another user modifies the ref after it was updated by 'git-receive-pack', but before the hook was able to evaluate it.  It is recommended that hooks rely on sha1-new rather than the current value of refname."
-msgstr ""
-"Observe que é possível para o \"refname\" não ter um sha1 novo durante a "
-"execução deste gancho.  Isso pode ocorrer facilmente caso outro usuário "
-"modifique a \"ref\" após a atualização do 'git receive pack', porém antes "
-"que o gancho possa avaliá-lo.  Recomenda-se que os ganchos confiem no sha1 "
-"novo ao invés do valor atual do \"refname\"."
+msgstr "Observe que é possível para o \"refname\" não ter um sha1 novo durante a execução deste gancho.  Isso pode ocorrer facilmente caso outro usuário modifique a \"ref\" após a atualização do 'git receive pack', porém antes que o gancho possa avaliá-lo.  Recomenda-se que os ganchos confiem no sha1 novo ao invés do valor atual do \"refname\"."
 
 #. type: Title -
 #: en/git-receive-pack.txt:204
@@ -48737,29 +42726,19 @@ msgstr "O GANCHO DE PÓS-ATUALIZAÇÃO"
 #: en/git-receive-pack.txt:209
 #, priority:100
 msgid "After all other processing, if at least one ref was updated, and if $GIT_DIR/hooks/post-update file exists and is executable, then post-update will be called with the list of refs that have been updated.  This can be used to implement any repository wide cleanup tasks."
-msgstr ""
-"Após todos os outros processamentos, se pelo menos uma 'ref' foi atualizada "
-"e caso o arquivo '$GIT_DIR/hooks/post-update' existe e é executável, então o "
-"\"post-update\" (pós-atualização) será chamada com a lista das 'refs' que "
-"foram atualizadas.  Isso pode ser utilizado para implementar qualquer outra "
-"tarefa de limpeza em todo o repositório."
+msgstr "Após todos os outros processamentos, se pelo menos uma 'ref' foi atualizada e caso o arquivo '$GIT_DIR/hooks/post-update' existe e é executável, então o \"post-update\" (pós-atualização) será chamada com a lista das 'refs' que foram atualizadas.  Isso pode ser utilizado para implementar qualquer outra tarefa de limpeza em todo o repositório."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:213
 #, priority:100
 msgid "The exit code from this hook invocation is ignored; the only thing left for 'git-receive-pack' to do at that point is to exit itself anyway."
-msgstr ""
-"O código de saída deste gancho de chamada é ignorado; a única coisa que "
-"resta para o 'git receive pack' nesse ponto é encerrar de qualquer maneira."
+msgstr "O código de saída deste gancho de chamada é ignorado; a única coisa que resta para o 'git receive pack' nesse ponto é encerrar de qualquer maneira."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:216
 #, priority:100
 msgid "This hook can be used, for example, to run `git update-server-info` if the repository is packed and is served via a dumb transport."
-msgstr ""
-"Este gancho pode ser utilizado, como por exemplo, para executar `git update "
-"server info` caso o repositório esteja empacotado e seja servido através de "
-"um transporte burro."
+msgstr "Este gancho pode ser utilizado, como por exemplo, para executar `git update server info` caso o repositório esteja empacotado e seja servido através de um transporte burro."
 
 #. type: delimited block -
 #: en/git-receive-pack.txt:220
@@ -48781,12 +42760,7 @@ msgstr "AMBIENTE DE QUARENTENA"
 #: en/git-receive-pack.txt:231
 #, priority:100
 msgid "When `receive-pack` takes in objects, they are placed into a temporary \"quarantine\" directory within the `$GIT_DIR/objects` directory and migrated into the main object store only after the `pre-receive` hook has completed. If the push fails before then, the temporary directory is removed entirely."
-msgstr ""
-"Quando o `receive-pack` recebe os objetos, eles são colocados em um "
-"diretório temporário de \"quarentena\" dentro do diretório `$GIT_DIR/objects`"
-" e migrados para o armazenamento dos objetos principais somente após a "
-"conclusão do gancho `pré-recebimento`. Caso o envio falhe antes, o diretório "
-"temporário será removido completamente."
+msgstr "Quando o `receive-pack` recebe os objetos, eles são colocados em um diretório temporário de \"quarentena\" dentro do diretório `$GIT_DIR/objects` e migrados para o armazenamento dos objetos principais somente após a conclusão do gancho `pré-recebimento`. Caso o envio falhe antes, o diretório temporário será removido completamente."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:233
@@ -48798,32 +42772,19 @@ msgstr "Isso tem alguns efeitos e advertências visíveis ao usuário:"
 #: en/git-receive-pack.txt:239
 #, priority:100
 msgid "Pushes which fail due to problems with the incoming pack, missing objects, or due to the `pre-receive` hook will not leave any on-disk data. This is usually helpful to prevent repeated failed pushes from filling up your disk, but can make debugging more challenging."
-msgstr ""
-"Os impulsionamentos que falharem devido aos problemas com o pacote recebido, "
-"os objetos ausentes ou devido ao gancho do `pré-recebimento` não deixarão "
-"nenhum dado no disco. Geralmente é útil para impedir que impulsionamentos "
-"sem sucesso e de forma repetida preencham o seu disco, porém podem tornar a "
-"depuração muito mais desafiadora."
+msgstr "Os impulsionamentos que falharem devido aos problemas com o pacote recebido, os objetos ausentes ou devido ao gancho do `pré-recebimento` não deixarão nenhum dado no disco. Geralmente é útil para impedir que impulsionamentos sem sucesso e de forma repetida preencham o seu disco, porém podem tornar a depuração muito mais desafiadora."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:242
 #, priority:100
 msgid "Any objects created by the `pre-receive` hook will be created in the quarantine directory (and migrated only if it succeeds)."
-msgstr ""
-"Quaisquer objetos criados pelo gancho `pre-receive` (recebimento prévio) "
-"serão criados no diretório de quarentena (e migrados apenas caso sejam bem-"
-"sucedidos)."
+msgstr "Quaisquer objetos criados pelo gancho `pre-receive` (recebimento prévio) serão criados no diretório de quarentena (e migrados apenas caso sejam bem-sucedidos)."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:248
 #, priority:100
 msgid "The `pre-receive` hook MUST NOT update any refs to point to quarantined objects. Other programs accessing the repository will not be able to see the objects (and if the pre-receive hook fails, those refs would become corrupted). For safety, any ref updates from within `pre-receive` are automatically rejected."
-msgstr ""
-"O gancho `pre-receive` NÃO DEVE atualizar nenhuma refs para apontar para os "
-"objetos em quarentena. Outros programas que acessam o repositório não "
-"poderão ver os objetos (e se o gancho do \"pre-receive\" falhar, estes refs "
-"serão corrompidos). Por questões de segurança, qualquer atualização do \"ref"
-"\" dento do `pre-receive` são rejeitadas automaticamente."
+msgstr "O gancho `pre-receive` NÃO DEVE atualizar nenhuma refs para apontar para os objetos em quarentena. Outros programas que acessam o repositório não poderão ver os objetos (e se o gancho do \"pre-receive\" falhar, estes refs serão corrompidos). Por questões de segurança, qualquer atualização do \"ref\" dento do `pre-receive` são rejeitadas automaticamente."
 
 #. type: Plain text
 #: en/git-receive-pack.txt:253
@@ -48897,20 +42858,13 @@ msgstr "O subcomando \"expire\" remove as entradas mais antigas do \"reflog\". A
 #: en/git-reflog.txt:55
 #, priority:100
 msgid "The \"delete\" subcommand deletes single entries from the reflog. Its argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). This subcommand is also typically not used directly by end users."
-msgstr ""
-"O subcomando \"delete\" exclui as entradas únicas do reflog. O seu argumento "
-"deve ser uma entrada _exata_ (como por exemplo, \"`git reflog delete "
-"master@{2}`\"). Este subcomando também não é utilizado diretamente pelos "
-"usuários finais."
+msgstr "O subcomando \"delete\" exclui as entradas únicas do reflog. O seu argumento deve ser uma entrada _exata_ (como por exemplo, \"`git reflog delete master@{2}`\"). Este subcomando também não é utilizado diretamente pelos usuários finais."
 
 #. type: Plain text
 #: en/git-reflog.txt:59
 #, priority:100
 msgid "The \"exists\" subcommand checks whether a ref has a reflog.  It exits with zero status if the reflog exists, and non-zero status if it does not."
-msgstr ""
-"O subcomando \"existe\" verifica se uma \"ref\" tem um reflog.  Encerra com "
-"a condição zero, caso o \"reflog\" exista, e a condição seja diferente de "
-"zero caso não exista."
+msgstr "O subcomando \"existe\" verifica se uma \"ref\" tem um reflog.  Encerra com a condição zero, caso o \"reflog\" exista, e a condição seja diferente de zero caso não exista."
 
 #. type: Title ~
 #: en/git-reflog.txt:64
@@ -48922,8 +42876,7 @@ msgstr "Opções para `show`"
 #: en/git-reflog.txt:67
 #, priority:100
 msgid "`git reflog show` accepts any of the options accepted by `git log`."
-msgstr ""
-"O `git reflog show` aceita qualquer uma das opções aceitas pelo` git log`."
+msgstr "O `git reflog show` aceita qualquer uma das opções aceitas pelo` git log`."
 
 #. type: Title ~
 #: en/git-reflog.txt:70
@@ -48947,10 +42900,7 @@ msgstr "--single-worktree"
 #: en/git-reflog.txt:79
 #, priority:100
 msgid "By default when `--all` is specified, reflogs from all working trees are processed. This option limits the processing to reflogs from the current working tree only."
-msgstr ""
-"É predefinido que quando `--all` seja utilizado, os reflogs de todas as "
-"árvores de trabalho sejam processadas. Esta opção limita o processamento da "
-"reflogs apenas na árvore de trabalho atual."
+msgstr "É predefinido que quando `--all` seja utilizado, os reflogs de todas as árvores de trabalho sejam processadas. Esta opção limita o processamento da reflogs apenas na árvore de trabalho atual."
 
 #. type: Labeled list
 #: en/git-reflog.txt:80
@@ -48962,13 +42912,7 @@ msgstr "--expire=<tempo>"
 #: en/git-reflog.txt:87
 #, priority:100
 msgid "Prune entries older than the specified time. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes entries regardless of their age; `--expire=never` turns off pruning of reachable entries (but see `--expire-unreachable`)."
-msgstr ""
-"Remova os lançamentos mais antigos que o tempo informado. Caso esta opção "
-"não seja definida, o tempo da expiração será obtido com a opção de "
-"configuração `gc.reflogExpire`, que por sua vez a sua predefinição retorna "
-"para 90 dias. A opção `--expire=all` remove as entradas independentemente da "
-"idade; `--expire=never` desativa a remoção dos lançamentos acessíveis (porém "
-"consulte `--expire-unreachable`)."
+msgstr "Remova os lançamentos mais antigos que o tempo informado. Caso esta opção não seja definida, o tempo da expiração será obtido com a opção de configuração `gc.reflogExpire`, que por sua vez a sua predefinição retorna para 90 dias. A opção `--expire=all` remove as entradas independentemente da idade; `--expire=never` desativa a remoção dos lançamentos acessíveis (porém consulte `--expire-unreachable`)."
 
 #. type: Labeled list
 #: en/git-reflog.txt:88
@@ -48980,14 +42924,7 @@ msgstr "--expire-unreachable=<tempo>"
 #: en/git-reflog.txt:97
 #, priority:100
 msgid "Prune entries older than `<time>` that are not reachable from the current tip of the branch. If this option is not specified, the expiration time is taken from the configuration setting `gc.reflogExpireUnreachable`, which in turn defaults to 30 days. `--expire-unreachable=all` prunes unreachable entries regardless of their age; `--expire-unreachable=never` turns off early pruning of unreachable entries (but see `--expire`)."
-msgstr ""
-"Remova os lançamentos mais antigos que o `<tempo>` que não sejam acessíveis "
-"através do cume atual do ramo. Caso esta opção não seja definida, o tempo da "
-"expiração será obtido com a opção de configuração `gc.reflogExpire`, que por "
-"sua vez a sua predefinição retorna para 90 dias. A opção `--expire-"
-"unreachable=all` remove as entradas não acessíveis independentemente da sua "
-"idade; `--expire-unreachable=never` desativa a remoção prévia dos "
-"lançamentos não acessíveis (porém consulte `--expire`)."
+msgstr "Remova os lançamentos mais antigos que o `<tempo>` que não sejam acessíveis através do cume atual do ramo. Caso esta opção não seja definida, o tempo da expiração será obtido com a opção de configuração `gc.reflogExpire`, que por sua vez a sua predefinição retorna para 90 dias. A opção `--expire-unreachable=all` remove as entradas não acessíveis independentemente da sua idade; `--expire-unreachable=never` desativa a remoção prévia dos lançamentos não acessíveis (porém consulte `--expire`)."
 
 #. type: Labeled list
 #: en/git-reflog.txt:98
@@ -48999,10 +42936,7 @@ msgstr "--updateref"
 #: en/git-reflog.txt:102
 #, priority:100
 msgid "Update the reference to the value of the top reflog entry (i.e.  <ref>@\\{0\\}) if the previous top entry was pruned.  (This option is ignored for symbolic references.)"
-msgstr ""
-"Atualize a referência ao valor da entrada do topo do \"reflog\" (como por "
-"exemplo, <ref>@\\{0\\}) caso o topo do lançamento anterior tenha sido "
-"removido.  (Esta opção é ignorada para referências simbólicas.)"
+msgstr "Atualize a referência ao valor da entrada do topo do \"reflog\" (como por exemplo, <ref>@\\{0\\}) caso o topo do lançamento anterior tenha sido removido.  (Esta opção é ignorada para referências simbólicas.)"
 
 #. type: Labeled list
 #: en/git-reflog.txt:103
@@ -49014,10 +42948,7 @@ msgstr "--rewrite"
 #: en/git-reflog.txt:107
 #, priority:100
 msgid "If a reflog entry's predecessor is pruned, adjust its \"old\" SHA-1 to be equal to the \"new\" SHA-1 field of the entry that now precedes it."
-msgstr ""
-"Caso o antecessor de uma entrada reflog seja removido, ajuste o seu SHA-1 "
-"\"antigo\" para ser igual ao \"novo\" campo SHA-1 da entrada que agora o "
-"precede."
+msgstr "Caso o antecessor de uma entrada reflog seja removido, ajuste o seu SHA-1 \"antigo\" para ser igual ao \"novo\" campo SHA-1 da entrada que agora o precede."
 
 #. type: Labeled list
 #: en/git-reflog.txt:108
@@ -49029,30 +42960,19 @@ msgstr "--stale-fix"
 #: en/git-reflog.txt:113
 #, priority:100
 msgid "Prune any reflog entries that point to \"broken commits\". A broken commit is a commit that is not reachable from any of the reference tips and that refers, directly or indirectly, to a missing commit, tree, or blob object."
-msgstr ""
-"Elimine qualquer entradas no reflog que apontem para \"commits com "
-"problemas\". Um commit com problema (broken commit) é um commit que não pode "
-"ser acessado por nenhum topo de referência e que se tenha referência, direta "
-"ou indiretamente, a um objeto commit, árvore ou bolha ausente."
+msgstr "Elimine qualquer entradas no reflog que apontem para \"commits com problemas\". Um commit com problema (broken commit) é um commit que não pode ser acessado por nenhum topo de referência e que se tenha referência, direta ou indiretamente, a um objeto commit, árvore ou bolha ausente."
 
 #. type: Plain text
 #: en/git-reflog.txt:118
 #, priority:100
 msgid "This computation involves traversing all the reachable objects, i.e. it has the same cost as 'git prune'.  It is primarily intended to fix corruption caused by garbage collecting using older versions of Git, which didn't protect objects referred to by reflogs."
-msgstr ""
-"Este cálculo envolve percorrer todos os objetos acessíveis, ou seja, tem o "
-"mesmo custo que o comando 'git prune'.  Ele se destina principalmente para "
-"corrigir a corrupção causada pela coleta de lixo usando as versões mais "
-"antigas do Git, que não protegiam os objetos referidos através dos \"reflogs"
-"\"."
+msgstr "Este cálculo envolve percorrer todos os objetos acessíveis, ou seja, tem o mesmo custo que o comando 'git prune'.  Ele se destina principalmente para corrigir a corrupção causada pela coleta de lixo usando as versões mais antigas do Git, que não protegiam os objetos referidos através dos \"reflogs\"."
 
 #. type: Plain text
 #: en/git-reflog.txt:123
 #, priority:100
 msgid "Do not actually prune any entries; just show what would have been pruned."
-msgstr ""
-"Na verdade, não faça a poda de nenhuma entrada; apenas exiba o que teria "
-"sido podado."
+msgstr "Na verdade, não faça a poda de nenhuma entrada; apenas exiba o que teria sido podado."
 
 #. type: Plain text
 #: en/git-reflog.txt:126
@@ -49070,10 +42990,7 @@ msgstr "Opções para o `delete`"
 #: en/git-reflog.txt:134
 #, priority:100
 msgid "`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, `--dry-run`, and `--verbose`, with the same meanings as when they are used with `expire`."
-msgstr ""
-"O `git reflog delete` aceita as opções `--updateref`, `--rewrite`, `-n`, "
-"`--dry-run`, e `--verbose`, com os mesmos significados de quando são "
-"utilizadas com `expirar`."
+msgstr "O `git reflog delete` aceita as opções `--updateref`, `--rewrite`, `-n`, `--dry-run`, e `--verbose`, com os mesmos significados de quando são utilizadas com `expirar`."
 
 #. type: Title =
 #: en/git-remote-ext.txt:2
@@ -49085,8 +43002,7 @@ msgstr "git-remote-ext(1)"
 #: en/git-remote-ext.txt:7
 #, priority:100
 msgid "git-remote-ext - Bridge smart transport to external command."
-msgstr ""
-"git-remote-ext - Ponte de transporte inteligente para um comando externo."
+msgstr "git-remote-ext - Ponte de transporte inteligente para um comando externo."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:12
@@ -49098,20 +43014,13 @@ msgstr "git remote e <nick> \"ext::<comando>[ <argumentos>...]\"\n"
 #: en/git-remote-ext.txt:17
 #, priority:100
 msgid "This remote helper uses the specified '<command>' to connect to a remote Git server."
-msgstr ""
-"Este auxiliar remoto utiliza o '<comando>' informado para se conectar em um "
-"servidor Git remoto."
+msgstr "Este auxiliar remoto utiliza o '<comando>' informado para se conectar em um servidor Git remoto."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:23
 #, priority:100
 msgid "Data written to stdin of the specified '<command>' is assumed to be sent to a git:// server, git-upload-pack, git-receive-pack or git-upload-archive (depending on situation), and data read from stdout of <command> is assumed to be received from the same service."
-msgstr ""
-"Assume-se que os dados gravados no stdin do '<comando>' informado sejam "
-"encaminhados para um servidor `git://`, `git-upload-pack`, `git-receive-pack`"
-", `git-receive-pack` ou `git-upload-archive` (dependendo da situação) e os "
-"dados lidos do stdout do <comando> assume-se ter sido recebido do mesmo "
-"serviço."
+msgstr "Assume-se que os dados gravados no stdin do '<comando>' informado sejam encaminhados para um servidor `git://`, `git-upload-pack`, `git-receive-pack`, `git-receive-pack` ou `git-upload-archive` (dependendo da situação) e os dados lidos do stdout do <comando> assume-se ter sido recebido do mesmo serviço."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:25
@@ -49159,10 +43068,7 @@ msgstr "'%s'"
 #: en/git-remote-ext.txt:37
 #, priority:100
 msgid "Replaced with name (receive-pack, upload-pack, or upload-archive) of the service Git wants to invoke."
-msgstr ""
-"Substituído pelo nome (`receive-pack` (pacote de recebimento), `upload-pack` "
-"(pacote de upload), ou `upload-archive` (arquivo de upload)) do serviço que "
-"o Git deseja invocar."
+msgstr "Substituído pelo nome (`receive-pack` (pacote de recebimento), `upload-pack` (pacote de upload), ou `upload-archive` (arquivo de upload)) do serviço que o Git deseja invocar."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:38 en/pretty-formats.txt:211
@@ -49174,9 +43080,7 @@ msgstr "'%S'"
 #: en/git-remote-ext.txt:42
 #, priority:100
 msgid "Replaced with long name (git-receive-pack, git-upload-pack, or git-upload-archive) of the service Git wants to invoke."
-msgstr ""
-"Substituído pelo longo nome (`git-receive-pack`, `git-upload-pack`, ou `git-"
-"upload-archive`) do serviço que o Git deseja invocar."
+msgstr "Substituído pelo longo nome (`git-receive-pack`, `git-upload-pack`, ou `git-upload-archive`) do serviço que o Git deseja invocar."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:43
@@ -49188,18 +43092,13 @@ msgstr "'%G' (devem ser os primeiros caracteres em um argumento)"
 #: en/git-remote-ext.txt:49
 #, priority:100
 msgid "This argument will not be passed to '<command>'. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to rest of the argument. Default is not to send such a request."
-msgstr ""
-"Este argumento não será encaminhado para '<comando>'. Instead, it will cause "
-"the helper to start by sending git:// service requests to the remote side "
-"with the service field set to an appropriate value and the repository field "
-"set to rest of the argument. Default is not to send such a request."
+msgstr "Este argumento não será encaminhado para '<comando>'. Instead, it will cause the helper to start by sending git:// service requests to the remote side with the service field set to an appropriate value and the repository field set to rest of the argument. Default is not to send such a request."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:52
 #, priority:100
 msgid "This is useful if remote side is git:// server accessed over some tunnel."
-msgstr ""
-"É útil caso o lado remoto seja um servidor git:// acessado por algum túnel."
+msgstr "É útil caso o lado remoto seja um servidor git:// acessado por algum túnel."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:53
@@ -49211,11 +43110,7 @@ msgstr "'%V' (deve ser o primeiro caractere no argumento)"
 #: en/git-remote-ext.txt:57
 #, priority:100
 msgid "This argument will not be passed to '<command>'. Instead it sets the vhost field in the git:// service request (to rest of the argument).  Default is not to send vhost in such request (if sent)."
-msgstr ""
-"Este argumento não será encaminhado para '<comando>'. Em vez disso, define o "
-"campo vhost na solicitação do serviço 'git://' (para o restante do argumento)"
-".  A predefinição é não enviar o vhost em tal solicitação (caso seja "
-"enviada)."
+msgstr "Este argumento não será encaminhado para '<comando>'. Em vez disso, define o campo vhost na solicitação do serviço 'git://' (para o restante do argumento).  A predefinição é não enviar o vhost em tal solicitação (caso seja enviada)."
 
 #. type: Title -
 #: en/git-remote-ext.txt:59 en/git-remote-fd.txt:32
@@ -49233,9 +43128,7 @@ msgstr "GIT_TRANSLOOP_DEBUG"
 #: en/git-remote-ext.txt:63 en/git-remote-fd.txt:35
 #, priority:100
 msgid "If set, prints debugging information about various reads/writes."
-msgstr ""
-"Se definido, imprime as informações de depuração sobre várias leituras/"
-"gravações."
+msgstr "Se definido, imprime as informações de depuração sobre várias leituras/gravações."
 
 #. type: Title -
 #: en/git-remote-ext.txt:65
@@ -49253,9 +43146,7 @@ msgstr "GIT_EXT_SERVICE"
 #: en/git-remote-ext.txt:70
 #, ignore-ellipsis, priority:100
 msgid "Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
-msgstr ""
-"Defina como um nome longo (git-upload-pack, etc...) do assistente de serviço "
-"que precisa ser invocado."
+msgstr "Defina como um nome longo (git-upload-pack, etc...) do assistente de serviço que precisa ser invocado."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:71
@@ -49267,9 +43158,7 @@ msgstr "GIT_EXT_SERVICE_NOPREFIX"
 #: en/git-remote-ext.txt:74
 #, ignore-ellipsis, priority:100
 msgid "Set to long name (upload-pack, etc...) of service helper needs to invoke."
-msgstr ""
-"Defina como um nome longo (upload-pack, etc...) do assistente de serviço que "
-"precisa ser invocado."
+msgstr "Defina como um nome longo (upload-pack, etc...) do assistente de serviço que precisa ser invocado."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:82
@@ -49281,17 +43170,13 @@ msgstr "Este ajudante remoto é usado de forma transparente pelo Git quando voc
 #: en/git-remote-ext.txt:83
 #, no-wrap, priority:100
 msgid "\"ext::ssh -i /home/foo/.ssh/somekey user&#64;host.example %S 'foo/repo'\""
-msgstr ""
-"\"ext::ssh -i /home/foo/.ssh/somekey user&#64;host.example %S 'foo/repo'\""
+msgstr "\"ext::ssh -i /home/foo/.ssh/somekey user&#64;host.example %S 'foo/repo'\""
 
 #. type: Plain text
 #: en/git-remote-ext.txt:87
 #, priority:100
 msgid "Like host.example:foo/repo, but use /home/foo/.ssh/somekey as keypair and user as user on remote side. This avoids needing to edit .ssh/config."
-msgstr ""
-"Como 'host.example:foo/repo', porém utilize '/home/foo/.ssh/somekey' como um "
-"par de chaves e usuário como usuário no lado remoto. Isso evita a "
-"necessidade de se editar o '.ssh/config'."
+msgstr "Como 'host.example:foo/repo', porém utilize '/home/foo/.ssh/somekey' como um par de chaves e usuário como usuário no lado remoto. Isso evita a necessidade de se editar o '.ssh/config'."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:88
@@ -49303,9 +43188,7 @@ msgstr "\"ext::socat -t3600 - ABSTRACT-CONNECT:/git-server %G/somerepo\""
 #: en/git-remote-ext.txt:91
 #, priority:100
 msgid "Represents repository with path /somerepo accessible over git protocol at abstract namespace address /git-server."
-msgstr ""
-"Representa o repositório com o caminho '/algumrepo' acessível através do "
-"protocolo git no endereço do espaço de nomes abstrato '/git-server'."
+msgstr "Representa o repositório com o caminho '/algumrepo' acessível através do protocolo git no endereço do espaço de nomes abstrato '/git-server'."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:92
@@ -49317,11 +43200,7 @@ msgstr "\"ext::git-server-alias foo %G/repo\""
 #: en/git-remote-ext.txt:98
 #, priority:100
 msgid "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\".  The path to the repository and type of request are not passed on the command line but as part of the protocol stream, as usual with git:// protocol."
-msgstr ""
-"Representa um repositório com o caminho '/repo' acessado utilizando o "
-"programa auxiliar \"git-server-alias foo\".  O caminho para o repositório e "
-"o tipo da solicitação que não são encaminhados na linha de comando, porém "
-"como parte do fluxo do protocolo, como de costume, com o protocolo git://."
+msgstr "Representa um repositório com o caminho '/repo' acessado utilizando o programa auxiliar \"git-server-alias foo\".  O caminho para o repositório e o tipo da solicitação que não são encaminhados na linha de comando, porém como parte do fluxo do protocolo, como de costume, com o protocolo git://."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:99
@@ -49333,11 +43212,7 @@ msgstr "\"ext::git-server-alias foo %G/repo %Vfoo\""
 #: en/git-remote-ext.txt:105
 #, priority:100
 msgid "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\".  The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
-msgstr ""
-"Represents a repository with path /repo accessed using the helper program "
-"\"git-server-alias foo\".  O nome do host do servidor remoto passado no "
-"fluxo do protocolo será \"foo\" (permite que vários servidores Git virtuais "
-"compartilhem um endereço no nível do link)."
+msgstr "Represents a repository with path /repo accessed using the helper program \"git-server-alias foo\".  O nome do host do servidor remoto passado no fluxo do protocolo será \"foo\" (permite que vários servidores Git virtuais compartilhem um endereço no nível do link)."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:106
@@ -49349,11 +43224,7 @@ msgstr "\"ext::git-server-alias foo %G/repo% with% spaces %Vfoo\""
 #: en/git-remote-ext.txt:112
 #, priority:100
 msgid "Represents a repository with path `/repo with spaces` accessed using the helper program \"git-server-alias foo\".  The hostname for the remote server passed in the protocol stream will be \"foo\" (this allows multiple virtual Git servers to share a link-level address)."
-msgstr ""
-"Representa um repositório com o caminho `/repo com espaços` acessado "
-"utilizando o programa auxiliar \"git-server-alias foo\".  O nome do host do "
-"servidor remoto passado no fluxo do protocolo será \"foo\" (permite que "
-"vários servidores Git virtuais compartilhem um endereço no nível do link)."
+msgstr "Representa um repositório com o caminho `/repo com espaços` acessado utilizando o programa auxiliar \"git-server-alias foo\".  O nome do host do servidor remoto passado no fluxo do protocolo será \"foo\" (permite que vários servidores Git virtuais compartilhem um endereço no nível do link)."
 
 #. type: Labeled list
 #: en/git-remote-ext.txt:113
@@ -49365,10 +43236,7 @@ msgstr "\"ext::git-ssl foo.examplo /bar\""
 #: en/git-remote-ext.txt:118
 #, priority:100
 msgid "Represents a repository accessed using the helper program \"git-ssl foo.example /bar\".  The type of request can be determined by the helper using environment variables (see above)."
-msgstr ""
-"Representa um repositório acessado utilizando o programa auxiliar \"git-ssl "
-"foo.example /bar\".  O tipo de solicitação pode ser determinado através do "
-"auxiliar utilizando as variáveis do ambiente (veja acima)."
+msgstr "Representa um repositório acessado utilizando o programa auxiliar \"git-ssl foo.example /bar\".  O tipo de solicitação pode ser determinado através do auxiliar utilizando as variáveis do ambiente (veja acima)."
 
 #. type: Plain text
 #: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
@@ -49386,9 +43254,7 @@ msgstr "git-remote-fd(1)"
 #: en/git-remote-fd.txt:7
 #, priority:100
 msgid "git-remote-fd - Reflect smart transport stream back to caller"
-msgstr ""
-"git remote-fd - Reflita o fluxo de transporte inteligente de volta para quem "
-"chamou"
+msgstr "git remote-fd - Reflita o fluxo de transporte inteligente de volta para quem chamou"
 
 #. type: Plain text
 #: en/git-remote-fd.txt:11
@@ -49400,39 +43266,25 @@ msgstr "\"fd::<infd>[,<outfd>][/<anything>]\" (as URL)"
 #: en/git-remote-fd.txt:17
 #, priority:100
 msgid "This helper uses specified file descriptors to connect to a remote Git server.  This is not meant for end users but for programs and scripts calling git fetch, push or archive."
-msgstr ""
-"Este auxiliar utiliza os descritores do arquivo definidos para se conectar "
-"em um servidor Git remoto.  Isso não é para usuários finais, porém para "
-"programas e scripts que chamam `git fetch`, `push` ou `archive`."
+msgstr "Este auxiliar utiliza os descritores do arquivo definidos para se conectar em um servidor Git remoto.  Isso não é para usuários finais, porém para programas e scripts que chamam `git fetch`, `push` ou `archive`."
 
 #. type: Plain text
 #: en/git-remote-fd.txt:23
 #, priority:100
 msgid "If only <infd> is given, it is assumed to be a bidirectional socket connected to remote Git server (git-upload-pack, git-receive-pack or git-upload-archive). If both <infd> and <outfd> are given, they are assumed to be pipes connected to a remote Git server (<infd> being the inbound pipe and <outfd> being the outbound pipe."
-msgstr ""
-"Caso apenas o <infd> seja informado, será considerado um soquete "
-"bidirecional conectado com o servidor Git remoto (`git-upload-pack`, `git-"
-"receive-pack` ou `git-receive-pack` ou `git-upload-archive`). Caso ambos os "
-"<infd> e o <outfd> sejam informados, eles serão pipes conectados em um "
-"servidor Git remoto (o <infd> sendo o pipe da entrada e o <outfd> sendo o da "
-"saída."
+msgstr "Caso apenas o <infd> seja informado, será considerado um soquete bidirecional conectado com o servidor Git remoto (`git-upload-pack`, `git-receive-pack` ou `git-receive-pack` ou `git-upload-archive`). Caso ambos os <infd> e o <outfd> sejam informados, eles serão pipes conectados em um servidor Git remoto (o <infd> sendo o pipe da entrada e o <outfd> sendo o da saída."
 
 #. type: Plain text
 #: en/git-remote-fd.txt:26
 #, priority:100
 msgid "It is assumed that any handshaking procedures have already been completed (such as sending service request for git://) before this helper is started."
-msgstr ""
-"Supõe-se que qualquer procedimento de acordo (handshake) que já tenha sido "
-"concluído (como o envio da solicitação do serviço para o 'git://') antes da "
-"inicialização deste assistente."
+msgstr "Supõe-se que qualquer procedimento de acordo (handshake) que já tenha sido concluído (como o envio da solicitação do serviço para o 'git://') antes da inicialização deste assistente."
 
 #. type: Plain text
 #: en/git-remote-fd.txt:30
 #, priority:100
 msgid "<anything> can be any string. It is ignored. It is meant for providing information to user in the URL in case that URL is displayed in some context."
-msgstr ""
-"<anything> pode ser qualquer texto. É ignorado. Destina-se a prover "
-"informações ao usuário na URL, caso esta URL seja exibida em algum contexto."
+msgstr "<anything> pode ser qualquer texto. É ignorado. Destina-se a prover informações ao usuário na URL, caso esta URL seja exibida em algum contexto."
 
 #. type: Labeled list
 #: en/git-remote-fd.txt:38
@@ -49444,9 +43296,7 @@ msgstr "`git fetch fd::17 master`"
 #: en/git-remote-fd.txt:41
 #, priority:100
 msgid "Fetch master, using file descriptor #17 to communicate with git-upload-pack."
-msgstr ""
-"Busque o mestre, utilizando o descritor do arquivo nº 17 para se comunicar "
-"com o 'git-upload-pack'."
+msgstr "Busque o mestre, utilizando o descritor do arquivo nº 17 para se comunicar com o 'git-upload-pack'."
 
 #. type: Labeled list
 #: en/git-remote-fd.txt:42
@@ -49464,10 +43314,7 @@ msgstr "`git push fd::7,8 master (as URL)`"
 #: en/git-remote-fd.txt:49
 #, priority:100
 msgid "Push master, using file descriptor #7 to read data from git-receive-pack and file descriptor #8 to write data to same service."
-msgstr ""
-"O 'push master', usando o descritor do arquivo #7 para ler os dados do 'git-"
-"receive-pack' e o descritor de arquivo #8 para gravar os dados no mesmo "
-"serviço."
+msgstr "O 'push master', usando o descritor do arquivo #7 para ler os dados do 'git-receive-pack' e o descritor de arquivo #8 para gravar os dados no mesmo serviço."
 
 #. type: Labeled list
 #: en/git-remote-fd.txt:50
@@ -49489,10 +43336,24 @@ msgstr "git-remote - Gerencie o conjunto dos repositórios monitorados"
 
 #. type: Plain text
 #: en/git-remote.txt:25
-#, ignore-ellipsis, no-wrap, priority:220
+#, fuzzy, ignore-ellipsis, no-wrap, priority:220
+#| msgid ""
+#| "'git remote' [-v | --verbose]\n"
+#| "'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+#| "'git remote rename' <old> <new>\n"
+#| "'git remote remove' <name>\n"
+#| "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
+#| "'git remote set-branches' [--add] <name> <branch>...\n"
+#| "'git remote get-url' [--push] [--all] <name>\n"
+#| "'git remote set-url' [--push] <name> <newurl> [<oldurl>]\n"
+#| "'git remote set-url --add' [--push] <name> <newurl>\n"
+#| "'git remote set-url --delete' [--push] <name> <url>\n"
+#| "'git remote' [-v | --verbose] 'show' [-n] <name>...\n"
+#| "'git remote prune' [-n | --dry-run] <name>...\n"
+#| "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -49506,8 +43367,7 @@ msgid ""
 "'git remote' [-v | --verbose] 'update' [-p | --prune] [(<group> | <remote>)...]\n"
 msgstr ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <ramo>] [-m <master>] [-f] [--[no-]tags] "
-"[--mirror=(fetch|push)] <nome> <url>\n"
+"'git remote add' [-t <ramo>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <nome> <url>\n"
 "'git remote rename' <antigo> <novo>\n"
 "'git remote remove' <nome>\n"
 "'git remote set-head' <nome> (-a | --auto | -d | --delete | <ramo>)\n"
@@ -49518,31 +43378,26 @@ msgstr ""
 "'git remote set-url --delete' [--push] <nome> <url>\n"
 "'git remote' [-v | --verbose] 'show' [-n] <nome>...\n"
 "'git remote prune' [-n | --dry-run] <nome>...\n"
-"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | "
-"<remoto>)...]\n"
+"'git remote' [-v | --verbose] 'update' [-p | --prune] [(<grupo> | <remoto>)...]\n"
 
 #. type: Plain text
 #: en/git-remote.txt:30
 #, priority:220
 msgid "Manage the set of repositories (\"remotes\") whose branches you track."
-msgstr ""
-"Gerencie o conjunto de repositórios (\"remotos\") cujos ramos você monitora."
+msgstr "Gerencie o conjunto de repositórios (\"remotos\") cujos ramos você monitora."
 
 #. type: Plain text
 #: en/git-remote.txt:39
-#, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
-msgstr ""
-"Seja um pouco mais detalhado e exiba o endereço URL remoto após o nome.  "
-"NOTE: This must be placed between `remote` and subcommand."
+#, fuzzy, priority:220
+#| msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
+msgstr "Seja um pouco mais detalhado e exiba o endereço URL remoto após o nome.  NOTE: This must be placed between `remote` and subcommand."
 
 #. type: Plain text
 #: en/git-remote.txt:46
 #, priority:220
 msgid "With no arguments, shows a list of existing remotes.  Several subcommands are available to perform operations on the remotes."
-msgstr ""
-"Sem argumentos, exibe uma lista dos ramos remotos existentes.  Vários "
-"subcomandos estão disponíveis para executar as operações nos ramos remotos."
+msgstr "Sem argumentos, exibe uma lista dos ramos remotos existentes.  Vários subcomandos estão disponíveis para executar as operações nos ramos remotos."
 
 #. type: Labeled list
 #: en/git-remote.txt:47
@@ -49552,20 +43407,16 @@ msgstr "'add'"
 
 #. type: Plain text
 #: en/git-remote.txt:52
-#, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
-msgstr ""
-"Adicione um ramo remoto chamado <nome> para o repositório na <url>.  O "
-"comando `git fetch <nome>` pode ser utilizado para criar e atualizar os "
-"ramos monitorados remotamente <nome>/<ramo>."
+#, fuzzy, priority:220
+#| msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgstr "Adicione um ramo remoto chamado <nome> para o repositório na <url>.  O comando `git fetch <nome>` pode ser utilizado para criar e atualizar os ramos monitorados remotamente <nome>/<ramo>."
 
 #. type: Plain text
 #: en/git-remote.txt:55
 #, priority:220
 msgid "With `-f` option, `git fetch <name>` is run immediately after the remote information is set up."
-msgstr ""
-"Com a opção `-f`, o comando `git fetch <nome>` é executado imediatamente a "
-"informação remota seja configurada."
+msgstr "Com a opção `-f`, o comando `git fetch <nome>` é executado imediatamente a informação remota seja configurada."
 
 #. type: Plain text
 #: en/git-remote.txt:58
@@ -49589,40 +43440,25 @@ msgstr "É predefinido que apenas as tags recolhidas dos ramos são importadas (
 #: en/git-remote.txt:70
 #, priority:220
 msgid "With `-t <branch>` option, instead of the default glob refspec for the remote to track all branches under the `refs/remotes/<name>/` namespace, a refspec to track only `<branch>` is created.  You can give more than one `-t <branch>` to track multiple branches without grabbing all branches."
-msgstr ""
-"Com a opção `-t <ramo>`, em vez do 'glob refspec' predefinido para que o "
-"ramo remoto monitore todos os ramos sob o espaço de nomes `refs/remotes/"
-"<nome>/`, um \"refspec\" para monitorar apenas o `<ramo>` que foi criado.  "
-"Você pode utilizar mais de um `-t <ramo>` para monitorar várias ramificações "
-"sem monitorar todas."
+msgstr "Com a opção `-t <ramo>`, em vez do 'glob refspec' predefinido para que o ramo remoto monitore todos os ramos sob o espaço de nomes `refs/remotes/<nome>/`, um \"refspec\" para monitorar apenas o `<ramo>` que foi criado.  Você pode utilizar mais de um `-t <ramo>` para monitorar várias ramificações sem monitorar todas."
 
 #. type: Plain text
 #: en/git-remote.txt:73
 #, priority:220
 msgid "With `-m <master>` option, a symbolic-ref `refs/remotes/<name>/HEAD` is set up to point at remote's `<master>` branch. See also the set-head command."
-msgstr ""
-"Com a opção `-m <master>`, uma \"ref\" simbólica `refs/remotes/<nome>/HEAD` "
-"é configurado para apontar para o ramo `<master>` do ramo remoto. Veja "
-"também o comando `set-head`."
+msgstr "Com a opção `-m <master>`, uma \"ref\" simbólica `refs/remotes/<nome>/HEAD` é configurado para apontar para o ramo `<master>` do ramo remoto. Veja também o comando `set-head`."
 
 #. type: Plain text
 #: en/git-remote.txt:79
 #, priority:220
 msgid "When a fetch mirror is created with `--mirror=fetch`, the refs will not be stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on the remote will be directly mirrored into 'refs/' in the local repository. This option only makes sense in bare repositories, because a fetch would overwrite any local commits."
-msgstr ""
-"Quando um espelho de busca é criado com a opção `--mirror=fetch`, as refs "
-"não serão armazenados no espaço de nomes 'refs/remotes/', porém tudo nas '"
-"refs/' no ramo remoto será espelhado diretamente na 'refs/' em o repositório "
-"local. Esta opção faz sentido apenas nos repositórios vazios, porque uma "
-"busca substituirá quaisquer commits locais."
+msgstr "Quando um espelho de busca é criado com a opção `--mirror=fetch`, as refs não serão armazenados no espaço de nomes 'refs/remotes/', porém tudo nas 'refs/' no ramo remoto será espelhado diretamente na 'refs/' em o repositório local. Esta opção faz sentido apenas nos repositórios vazios, porque uma busca substituirá quaisquer commits locais."
 
 #. type: Plain text
 #: en/git-remote.txt:82
 #, priority:220
 msgid "When a push mirror is created with `--mirror=push`, then `git push` will always behave as if `--mirror` was passed."
-msgstr ""
-"Quando um espelho \"push\" é criado com a opção `--mirror=push`, então o "
-"comando `git push` sempre se comportará como se o `--mirror` fosse utilizado."
+msgstr "Quando um espelho \"push\" é criado com a opção `--mirror=push`, então o comando `git push` sempre se comportará como se o `--mirror` fosse utilizado."
 
 #. type: Labeled list
 #: en/git-remote.txt:83
@@ -49634,19 +43470,13 @@ msgstr "'rename'"
 #: en/git-remote.txt:87
 #, priority:220
 msgid "Rename the remote named <old> to <new>. All remote-tracking branches and configuration settings for the remote are updated."
-msgstr ""
-"Renomeie o ramo remoto chamado `<old>` para `<novo>`. Todos os ramos "
-"monitorados remotamente e as suas definições de configuração para o ramo "
-"remoto são atualizados."
+msgstr "Renomeie o ramo remoto chamado `<old>` para `<novo>`. Todos os ramos monitorados remotamente e as suas definições de configuração para o ramo remoto são atualizados."
 
 #. type: Plain text
 #: en/git-remote.txt:91
 #, priority:220
 msgid "In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the configuration file format."
-msgstr ""
-"Caso <antigo> e <novo> sejam iguais, e <old> seja um arquivo existente no `$"
-"GIT_DIR/remotes` ou `$GIT_DIR/branches`, o ramo remoto será convertido para "
-"o formato do arquivo de configuração."
+msgstr "Caso <antigo> e <novo> sejam iguais, e <old> seja um arquivo existente no `$GIT_DIR/remotes` ou `$GIT_DIR/branches`, o ramo remoto será convertido para o formato do arquivo de configuração."
 
 #. type: Labeled list
 #: en/git-remote.txt:92
@@ -49664,10 +43494,7 @@ msgstr "'rm'"
 #: en/git-remote.txt:97
 #, priority:220
 msgid "Remove the remote named <name>. All remote-tracking branches and configuration settings for the remote are removed."
-msgstr ""
-"Remova o ramo remoto chamado `<nome>`. Todos os ramos monitorados "
-"remotamente e as suas definições de configuração para o ramo remoto são "
-"atualizados."
+msgstr "Remova o ramo remoto chamado `<nome>`. Todos os ramos monitorados remotamente e as suas definições de configuração para o ramo remoto são atualizados."
 
 #. type: Labeled list
 #: en/git-remote.txt:98
@@ -49679,46 +43506,27 @@ msgstr "'set-head'"
 #: en/git-remote.txt:107
 #, priority:220
 msgid "Sets or deletes the default branch (i.e. the target of the symbolic-ref `refs/remotes/<name>/HEAD`) for the named remote. Having a default branch for a remote is not required, but allows the name of the remote to be specified in lieu of a specific branch. For example, if the default branch for `origin` is set to `master`, then `origin` may be specified wherever you would normally specify `origin/master`."
-msgstr ""
-"Define ou exclui o ramo predefinido (ou seja, o destino da ref simbólica `"
-"refs/remotes/<nome>/HEAD`) do ramo remoto informado. Não é necessário ter um "
-"ramo remoto predefinido para o ramo remoto, porém permite que o nome do ramo "
-"remoto seja utilizado no lugar de um ramo específico. Como por exemplo, caso "
-"o ramo predefinido para `origin` estiver definido como `master`, então "
-"`origin` poderá ser definido onde quer que você normalmente definiria `"
-"origin/master`."
+msgstr "Define ou exclui o ramo predefinido (ou seja, o destino da ref simbólica `refs/remotes/<nome>/HEAD`) do ramo remoto informado. Não é necessário ter um ramo remoto predefinido para o ramo remoto, porém permite que o nome do ramo remoto seja utilizado no lugar de um ramo específico. Como por exemplo, caso o ramo predefinido para `origin` estiver definido como `master`, então `origin` poderá ser definido onde quer que você normalmente definiria `origin/master`."
 
 #. type: Plain text
 #: en/git-remote.txt:109
 #, priority:220
 msgid "With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted."
-msgstr ""
-"Com `-d` ou `--delete`, a referência simbólica `refs/remotes/<nome>/HEAD` é "
-"excluída."
+msgstr "Com `-d` ou `--delete`, a referência simbólica `refs/remotes/<nome>/HEAD` é excluída."
 
 #. type: Plain text
 #: en/git-remote.txt:116
-#, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
-msgstr ""
-"Com `-a` ou `--auto`, o ramo remoto é consultado para determinar o seu `HEAD`"
-", então a referência simbólica `refs/remotes/<nome>/HEAD` é definida no "
-"mesmo ramo. Como por exemplo, caso o `HEAD` remoto aponte para `next`, o "
-"comando `git remote set-head origin -a` definirá a referência remota `refs/"
-"remotes/origin/HEAD` para `refs/remotes/origin/next`. Isso só funcionará "
-"caso o `refs/remotes/origin/next` já existir; caso contrário, deve ser "
-"buscado (fetched) primeiro."
+#, fuzzy, priority:220
+#| msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgstr "Com `-a` ou `--auto`, o ramo remoto é consultado para determinar o seu `HEAD`, então a referência simbólica `refs/remotes/<nome>/HEAD` é definida no mesmo ramo. Como por exemplo, caso o `HEAD` remoto aponte para `next`, o comando `git remote set-head origin -a` definirá a referência remota `refs/remotes/origin/HEAD` para `refs/remotes/origin/next`. Isso só funcionará caso o `refs/remotes/origin/next` já existir; caso contrário, deve ser buscado (fetched) primeiro."
 
 #. type: Plain text
 #: en/git-remote.txt:121
-#, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
-msgstr ""
-"Utilize o `<ramo>` para definir explicitamente a referência simbólica `refs/"
-"remotes/<nome>/HEAD`. Como por exemplo, o comando `git remote set-head "
-"origin master` definirá a referência remota `refs/remotes/origin/HEAD` para `"
-"refs/remotes/origin/master`. Isso só funcionará caso o `refs/remotes/origin/"
-"master` já existir; caso contrário, deve ser buscado (fetched) primeiro."
+#, fuzzy, priority:220
+#| msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgstr "Utilize o `<ramo>` para definir explicitamente a referência simbólica `refs/remotes/<nome>/HEAD`. Como por exemplo, o comando `git remote set-head origin master` definirá a referência remota `refs/remotes/origin/HEAD` para `refs/remotes/origin/master`. Isso só funcionará caso o `refs/remotes/origin/master` já existir; caso contrário, deve ser buscado (fetched) primeiro."
 
 #. type: Labeled list
 #: en/git-remote.txt:123
@@ -49730,26 +43538,20 @@ msgstr "'set-branches'"
 #: en/git-remote.txt:128
 #, priority:220
 msgid "Changes the list of branches tracked by the named remote.  This can be used to track a subset of the available remote branches after the initial setup for a remote."
-msgstr ""
-"Altera a lista das ramificações monitoradas pelo ramo remoto informado.  "
-"Pode ser utilizado para monitorar um subconjunto das ramificações remotas "
-"disponíveis após a configuração inicial de um ramo remoto."
+msgstr "Altera a lista das ramificações monitoradas pelo ramo remoto informado.  Pode ser utilizado para monitorar um subconjunto das ramificações remotas disponíveis após a configuração inicial de um ramo remoto."
 
 #. type: Plain text
 #: en/git-remote.txt:131
-#, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
-msgstr ""
-"Os ramos informados serão interpretados como se fossem definidos com a opção "
-"`-t` na linha de comando `git remote add`."
+#, fuzzy, priority:220
+#| msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
+msgstr "Os ramos informados serão interpretados como se fossem definidos com a opção `-t` na linha de comando `git remote add`."
 
 #. type: Plain text
 #: en/git-remote.txt:134
 #, priority:220
 msgid "With `--add`, instead of replacing the list of currently tracked branches, adds to that list."
-msgstr ""
-"Com `--add`, em vez de substituir a lista das ramificações monitoradas no "
-"momento, será adicionada a lista."
+msgstr "Com `--add`, em vez de substituir a lista das ramificações monitoradas no momento, será adicionada a lista."
 
 #. type: Labeled list
 #: en/git-remote.txt:135
@@ -49761,18 +43563,13 @@ msgstr "'get-url'"
 #: en/git-remote.txt:139
 #, priority:220
 msgid "Retrieves the URLs for a remote. Configurations for `insteadOf` and `pushInsteadOf` are expanded here. By default, only the first URL is listed."
-msgstr ""
-"Recupera as URLs para um ramo remoto. As configurações para o `ratherOf` e "
-"`pushInsteadOf` são expandidas aqui. É predefinido que, apenas a primeira "
-"URL é listada."
+msgstr "Recupera as URLs para um ramo remoto. As configurações para o `ratherOf` e `pushInsteadOf` são expandidas aqui. É predefinido que, apenas a primeira URL é listada."
 
 #. type: Plain text
 #: en/git-remote.txt:141
 #, priority:220
 msgid "With `--push`, push URLs are queried rather than fetch URLs."
-msgstr ""
-"Com o `--push`, as URLs 'push' são apenas consultadas em vez de buscar as "
-"URLs."
+msgstr "Com o `--push`, as URLs 'push' são apenas consultadas em vez de buscar as URLs."
 
 #. type: Plain text
 #: en/git-remote.txt:143
@@ -49790,46 +43587,31 @@ msgstr "'set-url'"
 #: en/git-remote.txt:149
 #, priority:220
 msgid "Changes URLs for the remote. Sets first URL for remote <name> that matches regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If <oldurl> doesn't match any URL, an error occurs and nothing is changed."
-msgstr ""
-"Altera as URLs para o ramo remoto. Define a primeira URL para o <nome> "
-"remoto que coincida com à regex <oldurl> (primeira URL caso nenhuma <oldurl> "
-"seja informada) como <newurl>. Caso <oldurl> não coincida com nenhuma URL, "
-"ocorrerá um erro e nada será alterado."
+msgstr "Altera as URLs para o ramo remoto. Define a primeira URL para o <nome> remoto que coincida com à regex <oldurl> (primeira URL caso nenhuma <oldurl> seja informada) como <newurl>. Caso <oldurl> não coincida com nenhuma URL, ocorrerá um erro e nada será alterado."
 
 #. type: Plain text
 #: en/git-remote.txt:151
 #, priority:220
 msgid "With `--push`, push URLs are manipulated instead of fetch URLs."
-msgstr ""
-"Com o `--push`, as URLs 'push' são manipuladas em vez de buscar as URLs."
+msgstr "Com o `--push`, as URLs 'push' são manipuladas em vez de buscar as URLs."
 
 #. type: Plain text
 #: en/git-remote.txt:153
 #, priority:220
 msgid "With `--add`, instead of changing existing URLs, new URL is added."
-msgstr ""
-"Com `--add`, em vez de alterar as URLs existentes, uma nova URL é adicionada."
+msgstr "Com `--add`, em vez de alterar as URLs existentes, uma nova URL é adicionada."
 
 #. type: Plain text
 #: en/git-remote.txt:157
 #, priority:220
 msgid "With `--delete`, instead of changing existing URLs, all URLs matching regex <url> are deleted for remote <name>.  Trying to delete all non-push URLs is an error."
-msgstr ""
-"Com `--delete`, em vez de alterar as URLs existentes, todas as URLs "
-"coincidentes à expressão regular <url> são excluídas para o ramo remoto "
-"<nome>.  Tentar excluir todas as URLs 'não push' é um erro."
+msgstr "Com `--delete`, em vez de alterar as URLs existentes, todas as URLs coincidentes à expressão regular <url> são excluídas para o ramo remoto <nome>.  Tentar excluir todas as URLs 'não push' é um erro."
 
 #. type: Plain text
 #: en/git-remote.txt:164
 #, priority:220
 msgid "Note that the push URL and the fetch URL, even though they can be set differently, must still refer to the same place.  What you pushed to the push URL should be what you would see if you immediately fetched from the fetch URL.  If you are trying to fetch from one place (e.g. your upstream) and push to another (e.g.  your publishing repository), use two separate remotes."
-msgstr ""
-"Observe que a URL de envio e a URL de busca, mesmo que possam ser definidos "
-"de maneira diferente, ainda devem se referir ao mesmo local.  O que você "
-"impulsionou para a URL de envio deve ser o que você veria se buscasse "
-"imediatamente a URL de busca.  Caso esteja tentando buscar de um lugar (como "
-"por exemplo, a sua \"upstream\") e enviar para outro (como por exemplo, o "
-"seu repositório de publicação), utilize dois ramos remotos separados."
+msgstr "Observe que a URL de envio e a URL de busca, mesmo que possam ser definidos de maneira diferente, ainda devem se referir ao mesmo local.  O que você impulsionou para a URL de envio deve ser o que você veria se buscasse imediatamente a URL de busca.  Caso esteja tentando buscar de um lugar (como por exemplo, a sua \"upstream\") e enviar para outro (como por exemplo, o seu repositório de publicação), utilize dois ramos remotos separados."
 
 #. type: Labeled list
 #: en/git-remote.txt:166
@@ -49847,9 +43629,7 @@ msgstr "Fornece algumas informações sobre o ramo remoto <nome>."
 #: en/git-remote.txt:172
 #, priority:220
 msgid "With `-n` option, the remote heads are not queried first with `git ls-remote <name>`; cached information is used instead."
-msgstr ""
-"Com a opção `-n`, os cabeçalhos remotos não são consultadas primeiro com o "
-"comando `git ls remote`; as informações em cache são utilizadas em vez disso."
+msgstr "Com a opção `-n`, os cabeçalhos remotos não são consultadas primeiro com o comando `git ls remote`; as informações em cache são utilizadas em vez disso."
 
 #. type: Labeled list
 #: en/git-remote.txt:173
@@ -49861,29 +43641,20 @@ msgstr "'prune'"
 #: en/git-remote.txt:180
 #, priority:220
 msgid "Deletes stale references associated with <name>. By default, stale remote-tracking branches under <name> are deleted, but depending on global configuration and the configuration of the remote we might even prune local tags that haven't been pushed there. Equivalent to `git fetch --prune <name>`, except that no new references will be fetched."
-msgstr ""
-"Exclui as referências antigas associadas com <nome>. É predefinido que as "
-"ramificações antigas monitoradas remotamente sob <nome> são excluídas, "
-"porém, dependendo da configuração global e da configuração do ramo remoto, "
-"podemos até remover as tags locais que não foram enviadas para lá. É o "
-"equivalente ao comando `git fetch --prune <nome>`, exceto que nenhuma nova "
-"referência será buscada."
+msgstr "Exclui as referências antigas associadas com <nome>. É predefinido que as ramificações antigas monitoradas remotamente sob <nome> são excluídas, porém, dependendo da configuração global e da configuração do ramo remoto, podemos até remover as tags locais que não foram enviadas para lá. É o equivalente ao comando `git fetch --prune <nome>`, exceto que nenhuma nova referência será buscada."
 
 #. type: Plain text
 #: en/git-remote.txt:183
 #, priority:220
 msgid "See the PRUNING section of linkgit:git-fetch[1] for what it'll prune depending on various configuration."
-msgstr ""
-"Veja a seção 'PRUNING' do linkgit:git-fetch[1] para saber o que será "
-"removido dependendo das várias configurações."
+msgstr "Veja a seção 'PRUNING' do linkgit:git-fetch[1] para saber o que será removido dependendo das várias configurações."
 
 #. type: Plain text
 #: en/git-remote.txt:186
-#, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
-msgstr ""
-"Com a opção `--dry-run`, relate quais os ramos serão eliminados, mas na "
-"verdade não os eliminem."
+#, fuzzy, priority:220
+#| msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
+msgstr "Com a opção `--dry-run`, relate quais os ramos serão eliminados, mas na verdade não os eliminem."
 
 #. type: Labeled list
 #: en/git-remote.txt:187
@@ -49893,23 +43664,16 @@ msgstr "'update'"
 
 #. type: Plain text
 #: en/git-remote.txt:195
-#, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
-msgstr ""
-"A captura das atualizações remoras ou em grupos remotos no repositório como "
-"definido em `remotes.<grupo>`.  Caso nenhum grupo local ou remoto seja "
-"especificado na linha de comandos, o parâmetro `remotes.default` será "
-"utilizado; caso `remotes.default` não esteja definido, todos os remotos que "
-"não possuem o parâmetro da configuração `remote.<nome>.skipDefaultUpdate` "
-"definido como `true` serão atualizados.  (Consulte linkgit:git-config[1])."
+#, fuzzy, priority:220
+#| msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgstr "A captura das atualizações remoras ou em grupos remotos no repositório como definido em `remotes.<grupo>`.  Caso nenhum grupo local ou remoto seja especificado na linha de comandos, o parâmetro `remotes.default` será utilizado; caso `remotes.default` não esteja definido, todos os remotos que não possuem o parâmetro da configuração `remote.<nome>.skipDefaultUpdate` definido como `true` serão atualizados.  (Consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-remote.txt:197
 #, priority:220
 msgid "With `--prune` option, run pruning against all the remotes that are updated."
-msgstr ""
-"Com a opção `--prune`, execute a poda em todos os ramos remotos que estão "
-"atualizados."
+msgstr "Com a opção `--prune`, execute a poda em todos os ramos remotos que estão atualizados."
 
 #. type: Plain text
 #: en/git-remote.txt:205
@@ -49979,8 +43743,7 @@ msgstr ""
 #: en/git-remote.txt:238
 #, priority:220
 msgid "Imitate 'git clone' but track only selected branches"
-msgstr ""
-"Imite o comando `git clone`, porém monitore apenas os ramos selecionados"
+msgstr "Imite o comando `git clone`, porém monitore apenas os ramos selecionados"
 
 #. type: delimited block -
 #: en/git-remote.txt:245
@@ -50020,48 +43783,31 @@ msgstr "git-repack - Empacota os objetos descompactados em um repositório"
 #: en/git-repack.txt:13
 #, no-wrap, priority:100
 msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
-msgstr ""
-"'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] "
-"[--depth=<n>] [--threads=<n>] [--keep-pack=<nome-do-pacote>]\n"
+msgstr "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<nome-do-pacote>]\n"
 
 #. type: Plain text
 #: en/git-repack.txt:20
 #, priority:100
 msgid "This command is used to combine all objects that do not currently reside in a \"pack\", into a pack.  It can also be used to re-organize existing packs into a single, more efficient pack."
-msgstr ""
-"Este comando é utilizado para combinar todos os objetos que atualmente não "
-"residem em um \"pacote\", em um pacote.  Também pode ser utilizado para "
-"reorganizar os pacotes existentes, em um único pacote mais eficiente."
+msgstr "Este comando é utilizado para combinar todos os objetos que atualmente não residem em um \"pacote\", em um pacote.  Também pode ser utilizado para reorganizar os pacotes existentes, em um único pacote mais eficiente."
 
 #. type: Plain text
 #: en/git-repack.txt:39
 #, priority:100
 msgid "Instead of incrementally packing the unpacked objects, pack everything referenced into a single pack.  Especially useful when packing a repository that is used for private development. Use with `-d`.  This will clean up the objects that `git prune` leaves behind, but `git fsck --full --dangling` shows as dangling."
-msgstr ""
-"Em vez de empacotar de forma incremental os objetos que foram "
-"descompactados, empacote tudo em um único pacote.  É especialmente útil ao "
-"compactar um repositório utilizado para o desenvolvimento privado. Utilize "
-"com `-d`.  Isso limpará os objetos que o `git prune` deixa para trás, porém "
-"o `git fsck --full --dangling` será exibido como se estivesse pendurado."
+msgstr "Em vez de empacotar de forma incremental os objetos que foram descompactados, empacote tudo em um único pacote.  É especialmente útil ao compactar um repositório utilizado para o desenvolvimento privado. Utilize com `-d`.  Isso limpará os objetos que o `git prune` deixa para trás, porém o `git fsck --full --dangling` será exibido como se estivesse pendurado."
 
 #. type: Plain text
 #: en/git-repack.txt:43
 #, priority:100
 msgid "Note that users fetching over dumb protocols will have to fetch the whole new pack in order to get any contained object, no matter how many other objects in that pack they already have locally."
-msgstr ""
-"Observe que os usuários que buscam protocolos \"burros\" terão que buscar "
-"todo o novo pacote para obter o conteúdo de qualquer objeto, não importa "
-"quantos outros objetos nesse pacote eles já tenham localmente."
+msgstr "Observe que os usuários que buscam protocolos \"burros\" terão que buscar todo o novo pacote para obter o conteúdo de qualquer objeto, não importa quantos outros objetos nesse pacote eles já tenham localmente."
 
 #. type: Plain text
 #: en/git-repack.txt:48
 #, priority:100
 msgid "Promisor packfiles are repacked separately: if there are packfiles that have an associated \".promisor\" file, these packfiles will be repacked into another separate pack, and an empty \".promisor\" file corresponding to the new separate pack will be written."
-msgstr ""
-"Os arquivos de pacotes \"promisor\" são empacotados separadamente, caso haja "
-"arquivos de pacote que tenham um arquivo \".promisor\" associado, estes "
-"arquivos de pacote serão reempacotados em outro pacote separado e um arquivo "
-"\".promisor\" vazio correspondente será gravado em um novo pacote separado."
+msgstr "Os arquivos de pacotes \"promisor\" são empacotados separadamente, caso haja arquivos de pacote que tenham um arquivo \".promisor\" associado, estes arquivos de pacote serão reempacotados em outro pacote separado e um arquivo \".promisor\" vazio correspondente será gravado em um novo pacote separado."
 
 #. type: Plain text
 #: en/git-repack.txt:59
@@ -50073,11 +43819,7 @@ msgstr "O mesmo que `-a`, a menos que`-d` seja utilizado.  Em seguida todos os o
 #: en/git-repack.txt:65
 #, priority:100
 msgid "After packing, if the newly created packs make some existing packs redundant, remove the redundant packs.  Also run 'git prune-packed' to remove redundant loose object files."
-msgstr ""
-"Após o empacotamento, caso os pacotes recém-criados recriem pacotes "
-"redundantes dos pacotes já existentes, remova os pacotes redundantes.  "
-"Execute também o comando 'git prune-packed' para remover os arquivos "
-"redundantes dos objetos soltos."
+msgstr "Após o empacotamento, caso os pacotes recém-criados recriem pacotes redundantes dos pacotes já existentes, remova os pacotes redundantes.  Execute também o comando 'git prune-packed' para remover os arquivos redundantes dos objetos soltos."
 
 #. type: Plain text
 #: en/git-repack.txt:69
@@ -50113,15 +43855,7 @@ msgstr "Não atualize a informação do servidor com 'git update-server-info'.
 #: en/git-repack.txt:98
 #, priority:100
 msgid "These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within `--window` to see if using delta compression saves space. `--depth` limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object."
-msgstr ""
-"Essas duas opções afetam como os objetos existentes no pacote são "
-"armazenados utilizando a compactação delta. Primeiramente os objetos são "
-"classificados internamente pelo tipo, tamanho e opcionalmente pelos nomes e "
-"comparados com os outros objetos existentes na opção `--window` para ver se "
-"a utilização da compactação delta economiza espaço. A opção `--depth` limita "
-"a profundidade delta máxima; torná-la muito profunda afeta o desempenho do "
-"lado do desempacotador, porque os dados delta precisam ser aplicados várias "
-"vezes para chegar ao objeto necessário."
+msgstr "Essas duas opções afetam como os objetos existentes no pacote são armazenados utilizando a compactação delta. Primeiramente os objetos são classificados internamente pelo tipo, tamanho e opcionalmente pelos nomes e comparados com os outros objetos existentes na opção `--window` para ver se a utilização da compactação delta economiza espaço. A opção `--depth` limita a profundidade delta máxima; torná-la muito profunda afeta o desempenho do lado do desempacotador, porque os dados delta precisam ser aplicados várias vezes para chegar ao objeto necessário."
 
 #. type: Plain text
 #: en/git-repack.txt:104
@@ -50133,28 +43867,13 @@ msgstr "Esta opção é encaminhada para o comando `git pack-objects`."
 #: en/git-repack.txt:117
 #, priority:100
 msgid "This option provides an additional limit on top of `--window`; the window size will dynamically scale down so as to not take up more than '<n>' bytes in memory.  This is useful in repositories with a mix of large and small objects to not run out of memory with a large window, but still be able to take advantage of the large window for the smaller objects.  The size can be suffixed with \"k\", \"m\", or \"g\".  `--window-memory=0` makes memory usage unlimited.  The default is taken from the `pack.windowMemory` configuration variable.  Note that the actual memory usage will be the limit multiplied by the number of threads used by linkgit:git-pack-objects[1]."
-msgstr ""
-"Esta opção oferece um limite adicional em cima da opção `--window`; o "
-"tamanho da janela será reduzido dinamicamente para não ocupar mais do que "
-"'<n>' bytes na memória.  É útil nos repositórios com uma mistura de objetos "
-"grandes e pequenos para não ficar sem memória com uma janela grande, mas "
-"ainda assim pode tirar proveito da janela grande para os objetos menores.  O "
-"tamanho pode ter o sufixo \"k\", \"m\" ou \"g\".  A opção `--window-memory=0`"
-" torna o uso da memória ilimitado.  A predefinição é obtido da variável de "
-"configuração `pack.windowMemory`.  Observe que a utilização atual da memória "
-"será o limite multiplicado pela quantidade de threads utilizados pelo linkgit"
-":git-pack-objects[1]."
+msgstr "Esta opção oferece um limite adicional em cima da opção `--window`; o tamanho da janela será reduzido dinamicamente para não ocupar mais do que '<n>' bytes na memória.  É útil nos repositórios com uma mistura de objetos grandes e pequenos para não ficar sem memória com uma janela grande, mas ainda assim pode tirar proveito da janela grande para os objetos menores.  O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\".  A opção `--window-memory=0` torna o uso da memória ilimitado.  A predefinição é obtido da variável de configuração `pack.windowMemory`.  Observe que a utilização atual da memória será o limite multiplicado pela quantidade de threads utilizados pelo linkgit:git-pack-objects[1]."
 
 #. type: Plain text
 #: en/git-repack.txt:125
 #, priority:100
 msgid "Maximum size of each output pack file. The size can be suffixed with \"k\", \"m\", or \"g\". The minimum size allowed is limited to 1 MiB.  If specified, multiple packfiles may be created, which also prevents the creation of a bitmap index.  The default is unlimited, unless the config variable `pack.packSizeLimit` is set."
-msgstr ""
-"O Tamanho máximo de cada arquivo do pacote que foi gerado. O tamanho pode "
-"ter o sufixo \"k\", \"m\" ou \"g\". O tamanho mínimo permitido é limitado a "
-"1 MiB.  Caso seja definido, vários pacotes poderão ser criados, o que também "
-"previne a criação de um índice do bitmap.  A predefinição é ilimitada, a "
-"menos que a variável de configuração `pack.packSizeLimit` esteja definida."
+msgstr "O Tamanho máximo de cada arquivo do pacote que foi gerado. O tamanho pode ter o sufixo \"k\", \"m\" ou \"g\". O tamanho mínimo permitido é limitado a 1 MiB.  Caso seja definido, vários pacotes poderão ser criados, o que também previne a criação de um índice do bitmap.  A predefinição é ilimitada, a menos que a variável de configuração `pack.packSizeLimit` esteja definida."
 
 #. type: Labeled list
 #: en/git-repack.txt:127
@@ -50166,12 +43885,7 @@ msgstr "--write-bitmap-index"
 #: en/git-repack.txt:133
 #, priority:100
 msgid "Write a reachability bitmap index as part of the repack. This only makes sense when used with `-a` or `-A`, as the bitmaps must be able to refer to all reachable objects. This option overrides the setting of `repack.writeBitmaps`.  This option has no effect if multiple packfiles are created."
-msgstr ""
-"Escreva um índice bitmap de acessibilidade como parte do reempacotamento. "
-"Isso só faz sentido quando utilizado com `-a` ou `-A`, pois os bitmaps devem "
-"poder se referir para todos os objetos que sejam acessíveis. Esta opção "
-"substitui a configuração da variável de ambiente `GIT_CURL_VERBOSE`.  Esta "
-"opção não tem efeito caso vários arquivos de pacotes sejam criados."
+msgstr "Escreva um índice bitmap de acessibilidade como parte do reempacotamento. Isso só faz sentido quando utilizado com `-a` ou `-A`, pois os bitmaps devem poder se referir para todos os objetos que sejam acessíveis. Esta opção substitui a configuração da variável de ambiente `GIT_CURL_VERBOSE`.  Esta opção não tem efeito caso vários arquivos de pacotes sejam criados."
 
 #. type: Labeled list
 #: en/git-repack.txt:134
@@ -50183,24 +43897,13 @@ msgstr "--pack-kept-objects"
 #: en/git-repack.txt:142
 #, priority:100
 msgid "Include objects in `.keep` files when repacking.  Note that we still do not delete `.keep` packs after `pack-objects` finishes.  This means that we may duplicate objects, but this makes the option safe to use when there are concurrent pushes or fetches.  This option is generally only useful if you are writing bitmaps with `-b` or `repack.writeBitmaps`, as it ensures that the bitmapped packfile has the necessary objects."
-msgstr ""
-"Inclua os objetos no arquivo `.keep` durante o reempacotamento.  Observe que "
-"nós anda não excluímos os pacotes `.keep` depois da finalização dos objetos "
-"empacotados (`pack-objects`).  Significa que podemos duplicar os objetos, "
-"porém isso torna a opção segura para ser utilizada quando existem "
-"impulsionamentos ou buscas simultâneos.  Esta opção geralmente é útil apenas "
-"caso esteja escrevendo bitmaps com `-b` ou `repack.writeBitmaps`, pois "
-"garante que o pacote de bitmap tenha os objetos necessários."
+msgstr "Inclua os objetos no arquivo `.keep` durante o reempacotamento.  Observe que nós anda não excluímos os pacotes `.keep` depois da finalização dos objetos empacotados (`pack-objects`).  Significa que podemos duplicar os objetos, porém isso torna a opção segura para ser utilizada quando existem impulsionamentos ou buscas simultâneos.  Esta opção geralmente é útil apenas caso esteja escrevendo bitmaps com `-b` ou `repack.writeBitmaps`, pois garante que o pacote de bitmap tenha os objetos necessários."
 
 #. type: Plain text
 #: en/git-repack.txt:149
 #, priority:100
 msgid "Exclude the given pack from repacking. This is the equivalent of having `.keep` file on the pack. `<pack-name>` is the pack file name without leading directory (e.g. `pack-123.pack`).  The option could be specified multiple times to keep multiple packs."
-msgstr ""
-"Exclua o pacote informado do reempacotamento. Isso equivale a ter o arquivo `"
-".keep` no pacote. O `<nome-do-pacote>` é o nome do arquivo do pacote sem o "
-"diretório principal (como por exemplo, `pack-123.pack`).  A opção pode ser "
-"utilizada várias vezes para manter os vários pacotes."
+msgstr "Exclua o pacote informado do reempacotamento. Isso equivale a ter o arquivo `.keep` no pacote. O `<nome-do-pacote>` é o nome do arquivo do pacote sem o diretório principal (como por exemplo, `pack-123.pack`).  A opção pode ser utilizada várias vezes para manter os vários pacotes."
 
 #. type: Labeled list
 #: en/git-repack.txt:150
@@ -50212,21 +43915,13 @@ msgstr "--unpack-unreachable=<quando>"
 #: en/git-repack.txt:155
 #, priority:100
 msgid "When loosening unreachable objects, do not bother loosening any objects older than `<when>`. This can be used to optimize out the write of any objects that would be immediately pruned by a follow-up `git prune`."
-msgstr ""
-"Ao afrouxar os objetos inacessíveis, não se preocupe em afrouxar os objetos "
-"anteriores a `<quando>`. Pode ser utilizado para otimizar a gravação de "
-"quaisquer objetos que seriam removidos imediatamente através de um comando "
-"de acompanhamento `git prune`."
+msgstr "Ao afrouxar os objetos inacessíveis, não se preocupe em afrouxar os objetos anteriores a `<quando>`. Pode ser utilizado para otimizar a gravação de quaisquer objetos que seriam removidos imediatamente através de um comando de acompanhamento `git prune`."
 
 #. type: Plain text
 #: en/git-repack.txt:162
 #, priority:100
 msgid "When used with `-ad`, any unreachable objects from existing packs will be appended to the end of the packfile instead of being removed. In addition, any unreachable loose objects will be packed (and their loose counterparts removed)."
-msgstr ""
-"Quando utilizado com `-ad`, todos os objetos inacessíveis dos pacotes "
-"existentes serão anexados ao final do arquivo de pacotes em vez de serem "
-"removidos. Além disso, todos os objetos soltos inacessíveis serão "
-"empacotados (e as suas contrapartes soltas removidas)."
+msgstr "Quando utilizado com `-ad`, todos os objetos inacessíveis dos pacotes existentes serão anexados ao final do arquivo de pacotes em vez de serem removidos. Além disso, todos os objetos soltos inacessíveis serão empacotados (e as suas contrapartes soltas removidas)."
 
 #. type: Plain text
 #: en/git-repack.txt:167
@@ -50244,16 +43939,7 @@ msgstr "Configuração"
 #: en/git-repack.txt:180
 #, priority:100
 msgid "By default, the command passes `--delta-base-offset` option to 'git pack-objects'; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of Git older than version 1.4.4. If you need to share your repository with such ancient Git versions, either directly or via the dumb http protocol, then you need to set the configuration variable `repack.UseDeltaBaseOffset` to \"false\" and repack. Access from old Git versions over the native protocol is unaffected by this option as the conversion is performed on the fly as needed in that case."
-msgstr ""
-"É predefinido que o comando passe a opção `--delta-base-offset` para o "
-"comando 'git pack-objects'; isso normalmente resulta em pacotes um pouco "
-"menores, porém os pacotes gerados são incompatíveis com as versões do Git "
-"anteriores à versão 1.4.4. Caso precise compartilhar o seu repositório com "
-"as versões mais antigas do Git de forma direta ou através do protocolo http "
-"burro, será necessário definir a variável de configuração `repack."
-"UseDeltaBaseOffset` como 'false' e fazer o reempacotamento. O acesso das "
-"versões antigas do Git pelo protocolo nativo não é afetado por esta opção, "
-"pois a conversão é realizada em tempo real, conforme seja necessário."
+msgstr "É predefinido que o comando passe a opção `--delta-base-offset` para o comando 'git pack-objects'; isso normalmente resulta em pacotes um pouco menores, porém os pacotes gerados são incompatíveis com as versões do Git anteriores à versão 1.4.4. Caso precise compartilhar o seu repositório com as versões mais antigas do Git de forma direta ou através do protocolo http burro, será necessário definir a variável de configuração `repack.UseDeltaBaseOffset` como 'false' e fazer o reempacotamento. O acesso das versões antigas do Git pelo protocolo nativo não é afetado por esta opção, pois a conversão é realizada em tempo real, conforme seja necessário."
 
 #. type: Plain text
 #: en/git-repack.txt:185
@@ -50295,66 +43981,49 @@ msgstr ""
 #: en/git-replace.txt:21
 #, priority:100
 msgid "Adds a 'replace' reference in `refs/replace/` namespace."
-msgstr ""
-"Adiciona uma referência 'replace' (substituir) no espaço de nomes `refs/"
-"replace/`."
+msgstr "Adiciona uma referência 'replace' (substituir) no espaço de nomes `refs/replace/`."
 
 #. type: Plain text
 #: en/git-replace.txt:25
 #, priority:100
 msgid "The name of the 'replace' reference is the SHA-1 of the object that is replaced. The content of the 'replace' reference is the SHA-1 of the replacement object."
-msgstr ""
-"O nome da referência 'replace' é o SHA-1 do objeto que é substituído. O "
-"conteúdo da referência 'replace' é o SHA-1 do objeto de reposição."
+msgstr "O nome da referência 'replace' é o SHA-1 do objeto que é substituído. O conteúdo da referência 'replace' é o SHA-1 do objeto de reposição."
 
 #. type: Plain text
 #: en/git-replace.txt:28
 #, priority:100
 msgid "The replaced object and the replacement object must be of the same type.  This restriction can be bypassed using `-f`."
-msgstr ""
-"O objeto substituído e o objeto de reposição devem ser do mesmo tipo.  Esta "
-"restrição pode ser contornada utilizando a opção `-f`."
+msgstr "O objeto substituído e o objeto de reposição devem ser do mesmo tipo.  Esta restrição pode ser contornada utilizando a opção `-f`."
 
 #. type: Plain text
 #: en/git-replace.txt:30
 #, priority:100
 msgid "Unless `-f` is given, the 'replace' reference must not yet exist."
-msgstr ""
-"A menos que '-f' seja utilizado, a referência 'replace' ainda não deve "
-"existir."
+msgstr "A menos que '-f' seja utilizado, a referência 'replace' ainda não deve existir."
 
 #. type: Plain text
 #: en/git-replace.txt:33
 #, priority:100
 msgid "There is no other restriction on the replaced and replacement objects.  Merge commits can be replaced by non-merge commits and vice versa."
-msgstr ""
-"Não há outra restrição nos objetos substituídos e os objetos de reposição.  "
-"Os commits mesclados podem ser substituídos por commits sem mesclagem e vice-"
-"versa."
+msgstr "Não há outra restrição nos objetos substituídos e os objetos de reposição.  Os commits mesclados podem ser substituídos por commits sem mesclagem e vice-versa."
 
 #. type: Plain text
 #: en/git-replace.txt:37
 #, priority:100
 msgid "Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck)."
-msgstr ""
-"É predefinido que as referências de reposição seja utilizadas por todos os "
-"comandos do Git, exceto aqueles que executem o percurso de acessibilidade ("
-"remoção \"prune\", transferência de pacotes \"pack transfer\" e \"fsck\")."
+msgstr "É predefinido que as referências de reposição seja utilizadas por todos os comandos do Git, exceto aqueles que executem o percurso de acessibilidade (remoção \"prune\", transferência de pacotes \"pack transfer\" e \"fsck\")."
 
 #. type: Plain text
 #: en/git-replace.txt:40
 #, priority:100
 msgid "It is possible to disable use of replacement references for any command using the `--no-replace-objects` option just after 'git'."
-msgstr ""
-"É possível desativar o uso do rearranjo das referências para qualquer "
-"comando utilizando a opção `--no-replace-objects` logo após o 'git'."
+msgstr "É possível desativar o uso do rearranjo das referências para qualquer comando utilizando a opção `--no-replace-objects` logo após o 'git'."
 
 #. type: Plain text
 #: en/git-replace.txt:42
 #, priority:100
 msgid "For example if commit 'foo' has been replaced by commit 'bar':"
-msgstr ""
-"Como por exemplo, caso o commit 'foo' foi substituído pelo commit 'bar':"
+msgstr "Como por exemplo, caso o commit 'foo' foi substituído pelo commit 'bar':"
 
 #. type: delimited block -
 #: en/git-replace.txt:45
@@ -50384,17 +44053,13 @@ msgstr "exibe as informações sobre o commit 'bar'."
 #: en/git-replace.txt:57
 #, priority:100
 msgid "The `GIT_NO_REPLACE_OBJECTS` environment variable can be set to achieve the same effect as the `--no-replace-objects` option."
-msgstr ""
-"A variável de ambiente `GIT_NO_REPLACE_OBJECTS` pode ser configurada para "
-"obter o mesmo efeito que a opção `--no-replace-objects`."
+msgstr "A variável de ambiente `GIT_NO_REPLACE_OBJECTS` pode ser configurada para obter o mesmo efeito que a opção `--no-replace-objects`."
 
 #. type: Plain text
 #: en/git-replace.txt:64
 #, priority:100
 msgid "If an existing replace ref for the same object exists, it will be overwritten (instead of failing)."
-msgstr ""
-"Caso exista uma \"ref\" de reposição existente para o mesmo objeto, ela será "
-"substituída (em vez de falhar)."
+msgstr "Caso exista uma \"ref\" de reposição existente para o mesmo objeto, ela será substituída (em vez de falhar)."
 
 #. type: Plain text
 #: en/git-replace.txt:68
@@ -50412,25 +44077,13 @@ msgstr "--edit <objeto>"
 #: en/git-replace.txt:77
 #, priority:100
 msgid "Edit an object's content interactively. The existing content for <object> is pretty-printed into a temporary file, an editor is launched on the file, and the result is parsed to create a new object of the same type as <object>. A replacement ref is then created to replace <object> with the newly created object. See linkgit:git-var[1] for details about how the editor will be chosen."
-msgstr ""
-"Edita o conteúdo de um objeto interativamente. O conteúdo existente para "
-"`<objeto>` é impresso em um arquivo temporário, um editor é iniciado no "
-"arquivo e o resultado é analisado para criar um novo objeto do mesmo tipo "
-"que `<objeto>`. Um `ref` de reposição é criado para substituir `<objeto>` "
-"com um objeto recém-criado. Para mais detalhes de como o editor será "
-"selecionado, consulte linkgit:git-var[1]."
+msgstr "Edita o conteúdo de um objeto interativamente. O conteúdo existente para `<objeto>` é impresso em um arquivo temporário, um editor é iniciado no arquivo e o resultado é analisado para criar um novo objeto do mesmo tipo que `<objeto>`. Um `ref` de reposição é criado para substituir `<objeto>` com um objeto recém-criado. Para mais detalhes de como o editor será selecionado, consulte linkgit:git-var[1]."
 
 #. type: Plain text
 #: en/git-replace.txt:85
 #, priority:100
 msgid "When editing, provide the raw object contents rather than pretty-printed ones. Currently this only affects trees, which will be shown in their binary form. This is harder to work with, but can help when repairing a tree that is so corrupted it cannot be pretty-printed. Note that you may need to configure your editor to cleanly read and write binary data."
-msgstr ""
-"Ao editar, forneça o conteúdo do objeto bruto, em vez do impresso bonito. "
-"Atualmente afeta apenas as árvores que serão exibidas na sua forma binária. "
-"É mais difícil trabalhar com isso, porém pode ajudar durante o reparo de uma "
-"árvore que está tão corrompida que não pode ser bem impressa. Observe que "
-"pode ser necessário configurar o seu editor para ler e gravar os dados "
-"binários de forma limpa."
+msgstr "Ao editar, forneça o conteúdo do objeto bruto, em vez do impresso bonito. Atualmente afeta apenas as árvores que serão exibidas na sua forma binária. É mais difícil trabalhar com isso, porém pode ajudar durante o reparo de uma árvore que está tão corrompida que não pode ser bem impressa. Observe que pode ser necessário configurar o seu editor para ler e gravar os dados binários de forma limpa."
 
 #. type: Labeled list
 #: en/git-replace.txt:86
@@ -50442,12 +44095,7 @@ msgstr "--graft <commit> [<origem>...]"
 #: en/git-replace.txt:93
 #, ignore-ellipsis, priority:100
 msgid "Create a graft commit. A new commit is created with the same content as <commit> except that its parents will be [<parent>...] instead of <commit>'s parents. A replacement ref is then created to replace <commit> with the newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/grafts` file and use replace refs instead."
-msgstr ""
-"Cria um commit com enxerto. Um novo commit é criado com o mesmo conteúdo de "
-"`<commit>` exceto que as suas origens serão [<origem>...] em vez do <commit> "
-"das origens. Uma ref de reposição é então criada para substituir o `<commit>`"
-" pelo commit recém-criado. Utilize `--convert-graft-file` para converter um "
-"arquivo `$GIT_DIR/info/grafts` e utilize as refs de reposição em seu lugar."
+msgstr "Cria um commit com enxerto. Um novo commit é criado com o mesmo conteúdo de `<commit>` exceto que as suas origens serão [<origem>...] em vez do <commit> das origens. Uma ref de reposição é então criada para substituir o `<commit>` pelo commit recém-criado. Utilize `--convert-graft-file` para converter um arquivo `$GIT_DIR/info/grafts` e utilize as refs de reposição em seu lugar."
 
 #. type: Labeled list
 #: en/git-replace.txt:94
@@ -50459,10 +44107,7 @@ msgstr "--convert-graft-file"
 #: en/git-replace.txt:98
 #, priority:100
 msgid "Creates graft commits for all entries in `$GIT_DIR/info/grafts` and deletes that file upon success. The purpose is to help users with transitioning off of the now-deprecated graft file."
-msgstr ""
-"Cria commits com enxertos para todas as entradas em `$GIT_DIR/info/grafts` e "
-"exclui este arquivo quando for bem sucedido. O objetivo é ajudar os usuários "
-"a fazer a transição do arquivo de enxerto agora, obsoleto."
+msgstr "Cria commits com enxertos para todas as entradas em `$GIT_DIR/info/grafts` e exclui este arquivo quando for bem sucedido. O objetivo é ajudar os usuários a fazer a transição do arquivo de enxerto agora, obsoleto."
 
 #. type: Labeled list
 #: en/git-replace.txt:99
@@ -50480,19 +44125,13 @@ msgstr "--list <padrão>"
 #: en/git-replace.txt:105
 #, priority:100
 msgid "List replace refs for objects that match the given pattern (or all if no pattern is given).  Typing \"git replace\" without arguments, also lists all replace refs."
-msgstr ""
-"A lista substitui as refs para os objetos que coincidam ao padrão informado ("
-"ou todos caso nenhum seja informado).  Digitar \"git replace\" sem "
-"argumentos, também lista todos as refs de reposição."
+msgstr "A lista substitui as refs para os objetos que coincidam ao padrão informado (ou todos caso nenhum seja informado).  Digitar \"git replace\" sem argumentos, também lista todos as refs de reposição."
 
 #. type: Plain text
 #: en/git-replace.txt:110
 #, priority:100
 msgid "When listing, use the specified <format>, which can be one of 'short', 'medium' and 'long'. When omitted, the format defaults to 'short'."
-msgstr ""
-"Ao listar, utilize o <formato> informado, que pode ser 'short' (curto), "
-"'medium' (médio) e 'long' (longo). Quando omitido, a predefinição retorna "
-"para o formato 'short'."
+msgstr "Ao listar, utilize o <formato> informado, que pode ser 'short' (curto), 'medium' (médio) e 'long' (longo). Quando omitido, a predefinição retorna para o formato 'short'."
 
 #. type: Title -
 #: en/git-replace.txt:112
@@ -50540,9 +44179,7 @@ msgstr "'long':"
 #: en/git-replace.txt:122
 #, priority:100
 msgid "<replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>)"
-msgstr ""
-"<sha1 substituído> (<tipo substituído>) -> <sha1 substituído> (<tipo "
-"substituído>)"
+msgstr "<sha1 substituído> (<tipo substituído>) -> <sha1 substituído> (<tipo substituído>)"
 
 #. type: Title -
 #: en/git-replace.txt:124
@@ -50554,40 +44191,25 @@ msgstr "CRIANDO OBJETOS DE SUBSTITUIÇÃO"
 #: en/git-replace.txt:131
 #, priority:100
 msgid "linkgit:git-hash-object[1], linkgit:git-rebase[1], and https://github.com/newren/git-filter-repo[git-filter-repo], among other git commands, can be used to create replacement objects from existing objects. The `--edit` option can also be used with 'git replace' to create a replacement object by editing an existing object."
-msgstr ""
-"O linkgit:git-hash-object[1], linkgit:git-rebase[1], e https://github.com/"
-"newren/git-filter-repo[git-filter-repo], dentre outros comandos git podem "
-"ser utilizados para criar a reposição dos objetos a partir dos objetos já "
-"existentes. A opção `--edit` também pode ser usada com 'git replace' para "
-"criar a reposição de um objeto editando um objeto já existente."
+msgstr "O linkgit:git-hash-object[1], linkgit:git-rebase[1], e https://github.com/newren/git-filter-repo[git-filter-repo], dentre outros comandos git podem ser utilizados para criar a reposição dos objetos a partir dos objetos já existentes. A opção `--edit` também pode ser usada com 'git replace' para criar a reposição de um objeto editando um objeto já existente."
 
 #. type: Plain text
 #: en/git-replace.txt:137
 #, priority:100
 msgid "If you want to replace many blobs, trees or commits that are part of a string of commits, you may just want to create a replacement string of commits and then only replace the commit at the tip of the target string of commits with the commit at the tip of the replacement string of commits."
-msgstr ""
-"Caso queira substituir várias bolhas, árvores ou commits que fazem parte de "
-"uma cadência de commits, você pode apenas criar uma cadência de reposição "
-"dos commits e então substituir apenas o commit no topo da cadeia alvo dos "
-"commits pelos commits do topo da cadência de substituições dos commits."
+msgstr "Caso queira substituir várias bolhas, árvores ou commits que fazem parte de uma cadência de commits, você pode apenas criar uma cadência de reposição dos commits e então substituir apenas o commit no topo da cadeia alvo dos commits pelos commits do topo da cadência de substituições dos commits."
 
 #. type: Plain text
 #: en/git-replace.txt:144
 #, priority:100
 msgid "Comparing blobs or trees that have been replaced with those that replace them will not work properly. And using `git reset --hard` to go back to a replaced commit will move the branch to the replacement commit instead of the replaced commit."
-msgstr ""
-"Comparando as bolhas ou as árvores que foram substituídos por aqueles que os "
-"substituem, não funcionará de forma correta. E utilizar o comando `git reset "
-"--hard` para voltar para um commit que foi reposto, moverá o ramo para o "
-"commit que foi substituído em vez do commit que foi resposto."
+msgstr "Comparando as bolhas ou as árvores que foram substituídos por aqueles que os substituem, não funcionará de forma correta. E utilizar o comando `git reset --hard` para voltar para um commit que foi reposto, moverá o ramo para o commit que foi substituído em vez do commit que foi resposto."
 
 #. type: Plain text
 #: en/git-replace.txt:147
 #, priority:100
 msgid "There may be other problems when using 'git rev-list' related to pending objects."
-msgstr ""
-"Pode haver outros problemas durante a utilização do comando 'git rev-list' "
-"relacionadas com objetos pendentes."
+msgstr "Pode haver outros problemas durante a utilização do comando 'git rev-list' relacionadas com objetos pendentes."
 
 #. type: Plain text
 #: en/git-replace.txt:158
@@ -50605,8 +44227,7 @@ msgstr "git-request-pull(1)"
 #: en/git-request-pull.txt:7
 #, priority:100
 msgid "git-request-pull - Generates a summary of pending changes"
-msgstr ""
-"git-request-pull - Gera um resumo das alterações que ainda estão pendentes"
+msgstr "git-request-pull - Gera um resumo das alterações que ainda estão pendentes"
 
 #. type: Plain text
 #: en/git-request-pull.txt:12
@@ -50618,20 +44239,13 @@ msgstr "'git request-pull' [-p] <início> <url> [<fim>]\n"
 #: en/git-request-pull.txt:20
 #, priority:100
 msgid "Generate a request asking your upstream project to pull changes into their tree.  The request, printed to the standard output, begins with the branch description, summarizes the changes and indicates from where they can be pulled."
-msgstr ""
-"Gere um pedido solicitando ao seu projeto na upstream que capture as "
-"alterações na árvore deles.  A solicitação, é impressa na saída padrão, "
-"começa com o descritivo do ramo, resume as alterações e indica de onde elas "
-"podem ser extraídas."
+msgstr "Gere um pedido solicitando ao seu projeto na upstream que capture as alterações na árvore deles.  A solicitação, é impressa na saída padrão, começa com o descritivo do ramo, resume as alterações e indica de onde elas podem ser extraídas."
 
 #. type: Plain text
 #: en/git-request-pull.txt:25
 #, priority:100
 msgid "The upstream project is expected to have the commit named by `<start>` and the output asks it to integrate the changes you made since that commit, up to the commit named by `<end>`, by visiting the repository named by `<url>`."
-msgstr ""
-"Espera-se que o projeto \"upstream\" tenha o commit nomeado pelo `<inicio>` "
-"e a saída solicite a integração das alterações feitas até este commit, até o "
-"commit nomeado por `<fim>`, visitando o repositório nomeado por `<url>`."
+msgstr "Espera-se que o projeto \"upstream\" tenha o commit nomeado pelo `<inicio>` e a saída solicite a integração das alterações feitas até este commit, até o commit nomeado por `<fim>`, visitando o repositório nomeado por `<url>`."
 
 #. type: Plain text
 #: en/git-request-pull.txt:31
@@ -50649,9 +44263,7 @@ msgstr "<inicio>"
 #: en/git-request-pull.txt:35
 #, priority:100
 msgid "Commit to start at.  This names a commit that is already in the upstream history."
-msgstr ""
-"Faça o commit para iniciar em.  Isso informa um commit que já está no "
-"histórico upstream."
+msgstr "Faça o commit para iniciar em.  Isso informa um commit que já está no histórico upstream."
 
 #. type: Labeled list
 #: en/git-request-pull.txt:36
@@ -50675,30 +44287,19 @@ msgstr "<fim>"
 #: en/git-request-pull.txt:42
 #, priority:100
 msgid "Commit to end at (defaults to HEAD).  This names the commit at the tip of the history you are asking to be pulled."
-msgstr ""
-"Faça o commit para terminar em (a predefinição retorna para `HEAD`).  Isso "
-"informa o commit no topo do histórico que você está pedindo para ser "
-"capturado."
+msgstr "Faça o commit para terminar em (a predefinição retorna para `HEAD`).  Isso informa o commit no topo do histórico que você está pedindo para ser capturado."
 
 #. type: Plain text
 #: en/git-request-pull.txt:47
 #, priority:100
 msgid "When the repository named by `<url>` has the commit at a tip of a ref that is different from the ref you have locally, you can use the `<local>:<remote>` syntax, to have its local name, a colon `:`, and its remote name."
-msgstr ""
-"Quando o repositório nomeado por `<url>` tem o commit no cume de uma \"ref\" "
-"diferente da \"ref\" que você possui localmente, é possíve utilizar a "
-"sintaxe `<local>:<remoto>`, para ter o seu nome local, dois pontos `:` e o "
-"nome do seu ramo remoto."
+msgstr "Quando o repositório nomeado por `<url>` tem o commit no cume de uma \"ref\" diferente da \"ref\" que você possui localmente, é possíve utilizar a sintaxe `<local>:<remoto>`, para ter o seu nome local, dois pontos `:` e o nome do seu ramo remoto."
 
 #. type: Plain text
 #: en/git-request-pull.txt:56
 #, priority:100
 msgid "Imagine that you built your work on your `master` branch on top of the `v1.0` release, and want it to be integrated to the project.  First you push that change to your public repository for others to see:"
-msgstr ""
-"Imagine que você construiu o seu trabalho no seu ramo `master` em cima da "
-"versão `v1.0` e queira que ele seja integrado ao projeto.  Primeiro, você "
-"envia esta alteração ao seu repositório público para que as outras pessoas "
-"vejam:"
+msgstr "Imagine que você construiu o seu trabalho no seu ramo `master` em cima da versão `v1.0` e queira que ele seja integrado ao projeto.  Primeiro, você envia esta alteração ao seu repositório público para que as outras pessoas vejam:"
 
 #. type: Plain text
 #: en/git-request-pull.txt:58
@@ -50722,18 +44323,13 @@ msgstr "\tgit request-pull v1.0 https://git.ko.xz/project master\n"
 #: en/git-request-pull.txt:66
 #, priority:100
 msgid "which will produce a request to the upstream, summarizing the changes between the `v1.0` release and your `master`, to pull it from your public repository."
-msgstr ""
-"que produzirá uma solicitação para o \"upstream\", resumindo as alterações "
-"entre o \"release\" `v1.0` e o seu `master`, para retirá-lo do seu "
-"repositório público."
+msgstr "que produzirá uma solicitação para o \"upstream\", resumindo as alterações entre o \"release\" `v1.0` e o seu `master`, para retirá-lo do seu repositório público."
 
 #. type: Plain text
 #: en/git-request-pull.txt:69
 #, priority:100
 msgid "If you pushed your change to a branch whose name is different from the one you have locally, e.g."
-msgstr ""
-"Caso impulsione a sua alteração para um ramo cujo nome seja diferente "
-"daquele que você possui localmente, por exemplo."
+msgstr "Caso impulsione a sua alteração para um ramo cujo nome seja diferente daquele que você possui localmente, por exemplo."
 
 #. type: Plain text
 #: en/git-request-pull.txt:71
@@ -50763,54 +44359,37 @@ msgstr "git-rerere(1)"
 #: en/git-rerere.txt:7
 #, priority:100
 msgid "git-rerere - Reuse recorded resolution of conflicted merges"
-msgstr ""
-"git-rerere - Reutilize a resolução registrada das mesclagens conflitantes"
+msgstr "git-rerere - Reutilize a resolução registrada das mesclagens conflitantes"
 
 #. type: Plain text
 #: en/git-rerere.txt:12
 #, no-wrap, priority:100
 msgid "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
-msgstr ""
-"'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
+msgstr "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
 
 #. type: Plain text
 #: en/git-rerere.txt:20
 #, priority:100
 msgid "In a workflow employing relatively long lived topic branches, the developer sometimes needs to resolve the same conflicts over and over again until the topic branches are done (either merged to the \"release\" branch, or sent out and accepted upstream)."
-msgstr ""
-"Em um fluxo de trabalho que utiliza ramificações do tópico com vida útil "
-"relativamente longa, o desenvolvedor às vezes precisa resolver os mesmos "
-"conflitos de forma repetida até que o tópico das ramificações sejam "
-"concluídas (entre mesclagem no ramo \"release\" ou enviadas e aceitas na "
-"upstream)."
+msgstr "Em um fluxo de trabalho que utiliza ramificações do tópico com vida útil relativamente longa, o desenvolvedor às vezes precisa resolver os mesmos conflitos de forma repetida até que o tópico das ramificações sejam concluídas (entre mesclagem no ramo \"release\" ou enviadas e aceitas na upstream)."
 
 #. type: Plain text
 #: en/git-rerere.txt:25
 #, priority:100
 msgid "This command assists the developer in this process by recording conflicted automerge results and corresponding hand resolve results on the initial manual merge, and applying previously recorded hand resolutions to their corresponding automerge results."
-msgstr ""
-"Este comando auxilia o desenvolvedor neste processo, registrando os "
-"resultados conflitantes do \"automerge\" e os resultados correspondentes da "
-"resolução manual na mesclagem manual inicial e aplicando as resoluções "
-"práticas gravadas anteriormente aos resultados correspondentes do \"automerge"
-"\"."
+msgstr "Este comando auxilia o desenvolvedor neste processo, registrando os resultados conflitantes do \"automerge\" e os resultados correspondentes da resolução manual na mesclagem manual inicial e aplicando as resoluções práticas gravadas anteriormente aos resultados correspondentes do \"automerge\"."
 
 #. type: Plain text
 #: en/git-rerere.txt:29
 #, priority:100
 msgid "You need to set the configuration variable `rerere.enabled` in order to enable this command."
-msgstr ""
-"Você precisa definir a variável de configuração `rerere.enabled` para ativar "
-"este comando."
+msgstr "Você precisa definir a variável de configuração `rerere.enabled` para ativar este comando."
 
 #. type: Plain text
 #: en/git-rerere.txt:37
 #, priority:100
 msgid "Normally, 'git rerere' is run without arguments or user-intervention.  However, it has several commands that allow it to interact with its working state."
-msgstr ""
-"Normalmente, o comando 'git rerere' é executado sem argumentos ou sem a "
-"intervenção do usuário.  No entanto, ele possui vários comandos que permitem "
-"interagir com a sua condição de trabalho."
+msgstr "Normalmente, o comando 'git rerere' é executado sem argumentos ou sem a intervenção do usuário.  No entanto, ele possui vários comandos que permitem interagir com a sua condição de trabalho."
 
 #. type: Labeled list
 #: en/git-rerere.txt:38
@@ -50822,10 +44401,7 @@ msgstr "'clear'"
 #: en/git-rerere.txt:43
 #, priority:100
 msgid "Reset the metadata used by rerere if a merge resolution is to be aborted.  Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]' will automatically invoke this command."
-msgstr ""
-"Redefina os metadados utilizados pela \"rerere\" caso uma resolução da "
-"mesclagem seja interrompida.  Executando o comando 'git am [--skip|--abort]' "
-"ou 'git rebase [--skip|--abort]' automaticamente invocará este comando."
+msgstr "Redefina os metadados utilizados pela \"rerere\" caso uma resolução da mesclagem seja interrompida.  Executando o comando 'git am [--skip|--abort]' ou 'git rebase [--skip|--abort]' automaticamente invocará este comando."
 
 #. type: Labeled list
 #: en/git-rerere.txt:44
@@ -50837,9 +44413,7 @@ msgstr "'forget' <pathspec>"
 #: en/git-rerere.txt:48
 #, priority:100
 msgid "Reset the conflict resolutions which rerere has recorded for the current conflict in <pathspec>."
-msgstr ""
-"Redefina as resoluções de conflito que a rerere registrou para o conflito "
-"atual em <pathspec>."
+msgstr "Redefina as resoluções de conflito que a rerere registrou para o conflito atual em <pathspec>."
 
 #. type: Labeled list
 #: en/git-rerere.txt:49
@@ -50851,11 +44425,7 @@ msgstr "'diff'"
 #: en/git-rerere.txt:55
 #, priority:100
 msgid "Display diffs for the current state of the resolution.  It is useful for tracking what has changed while the user is resolving conflicts.  Additional arguments are passed directly to the system 'diff' command installed in PATH."
-msgstr ""
-"Exibe os diffs para a condição atual da resolução.  É útil para monitorar o "
-"que mudou enquanto o usuário está resolvendo os conflitos.  Os argumentos "
-"adicionais são passados diretamente para o comando 'diff' do sistema "
-"instalado no PATH."
+msgstr "Exibe os diffs para a condição atual da resolução.  É útil para monitorar o que mudou enquanto o usuário está resolvendo os conflitos.  Os argumentos adicionais são passados diretamente para o comando 'diff' do sistema instalado no PATH."
 
 #. type: Labeled list
 #: en/git-rerere.txt:56
@@ -50867,9 +44437,7 @@ msgstr "'status'"
 #: en/git-rerere.txt:59
 #, priority:100
 msgid "Print paths with conflicts whose merge resolution rerere will record."
-msgstr ""
-"Imprima os caminhos com conflitos cuja resolução da mesclagem \"rerere\" "
-"será registrada novamente."
+msgstr "Imprima os caminhos com conflitos cuja resolução da mesclagem \"rerere\" será registrada novamente."
 
 #. type: Labeled list
 #: en/git-rerere.txt:60
@@ -50881,10 +44449,7 @@ msgstr "'remaining'"
 #: en/git-rerere.txt:65
 #, priority:100
 msgid "Print paths with conflicts that have not been autoresolved by rerere.  This includes paths whose resolutions cannot be tracked by rerere, such as conflicting submodules."
-msgstr ""
-"Imprima os caminhos com conflitos que ainda não foram resolvidos "
-"automaticamente pela \"rerere\".  Isso inclui os caminhos cujas resoluções "
-"não podem ser rastreadas por \"rerere\", como os submódulos conflitantes."
+msgstr "Imprima os caminhos com conflitos que ainda não foram resolvidos automaticamente pela \"rerere\".  Isso inclui os caminhos cujas resoluções não podem ser rastreadas por \"rerere\", como os submódulos conflitantes."
 
 #. type: Labeled list
 #: en/git-rerere.txt:66 en/git-svn.txt:511
@@ -50896,22 +44461,13 @@ msgstr "'gc'"
 #: en/git-rerere.txt:74
 #, priority:100
 msgid "Prune records of conflicted merges that occurred a long time ago.  By default, unresolved conflicts older than 15 days and resolved conflicts older than 60 days are pruned.  These defaults are controlled via the `gc.rerereUnresolved` and `gc.rerereResolved` configuration variables respectively."
-msgstr ""
-"Remova os registros das mesclagens conflitantes que ocorreram há muito "
-"tempo.  É predefinido que, serão removidos todos os conflitos não resolvidos "
-"com mais que 15 dias e os conflitos que já foram resolvidos com mais de 60 "
-"dias.  Estas predefinições são controlados pelas variáveis de configuração "
-"`gc.rerereUnresolved` e `gc.rerereResolved`, respectivamente."
+msgstr "Remova os registros das mesclagens conflitantes que ocorreram há muito tempo.  É predefinido que, serão removidos todos os conflitos não resolvidos com mais que 15 dias e os conflitos que já foram resolvidos com mais de 60 dias.  Estas predefinições são controlados pelas variáveis de configuração `gc.rerereUnresolved` e `gc.rerereResolved`, respectivamente."
 
 #. type: Plain text
 #: en/git-rerere.txt:83
 #, priority:100
 msgid "When your topic branch modifies an overlapping area that your master branch (or upstream) touched since your topic branch forked from it, you may want to test it with the latest master, even before your topic branch is ready to be pushed upstream:"
-msgstr ""
-"Quando o tópico do seu ramo altera uma área sobreposta onde o ramo principal "
-"(ou \"upstream\") tocou desde que o tópico do ramo foi extraído, é possível "
-"testá-lo com o \"master\" mais recente, mesmo antes do tópico do ramo estar "
-"pronto para ser impulsionado na \"upstream\":"
+msgstr "Quando o tópico do seu ramo altera uma área sobreposta onde o ramo principal (ou \"upstream\") tocou desde que o tópico do ramo foi extraído, é possível testá-lo com o \"master\" mais recente, mesmo antes do tópico do ramo estar pronto para ser impulsionado na \"upstream\":"
 
 #. type: delimited block -
 #: en/git-rerere.txt:88
@@ -50929,10 +44485,7 @@ msgstr ""
 #: en/git-rerere.txt:92
 #, priority:100
 msgid "For such a test, you need to merge master and topic somehow.  One way to do it is to pull master into the topic branch:"
-msgstr ""
-"Para tal teste, é necessário mesclar o 'master' (mestre) e o 'topic' (tópico)"
-" de alguma maneira.  Uma maneira de fazer isso é capturar o 'master' para o "
-"ramo 'topic':"
+msgstr "Para tal teste, é necessário mesclar o 'master' (mestre) e o 'topic' (tópico) de alguma maneira.  Uma maneira de fazer isso é capturar o 'master' para o ramo 'topic':"
 
 #. type: delimited block -
 #: en/git-rerere.txt:96
@@ -50960,24 +44513,13 @@ msgstr ""
 #: en/git-rerere.txt:106
 #, priority:100
 msgid "The commits marked with `*` touch the same area in the same file; you need to resolve the conflicts when creating the commit marked with `+`.  Then you can test the result to make sure your work-in-progress still works with what is in the latest master."
-msgstr ""
-"Os commits marcados com `*` tocam na mesma área no mesmo arquivo; é preciso "
-"resolver os conflitos durante a criação do commit marcado com `+`.  Em "
-"seguida, é possível testar o resultado garantindo que o seu trabalho em "
-"andamento ainda funcione com o que está no \"master\" mais recente."
+msgstr "Os commits marcados com `*` tocam na mesma área no mesmo arquivo; é preciso resolver os conflitos durante a criação do commit marcado com `+`.  Em seguida, é possível testar o resultado garantindo que o seu trabalho em andamento ainda funcione com o que está no \"master\" mais recente."
 
 #. type: Plain text
 #: en/git-rerere.txt:114
 #, priority:100
 msgid "After this test merge, there are two ways to continue your work on the topic.  The easiest is to build on top of the test merge commit `+`, and when your work in the topic branch is finally ready, pull the topic branch into master, and/or ask the upstream to pull from you.  By that time, however, the master or the upstream might have been advanced since the test merge `+`, in which case the final commit graph would look like this:"
-msgstr ""
-"Após a mesclagem deste teste, há duas maneiras de continuar o tópico do seu "
-"trabalho.  A mais fácil é construir sobre o commit da mesclagem de teste `+`"
-", quando o seu trabalho no ramo dos tópicos estiver finalmente pronto, "
-"capture o tópico do ramo no 'master' e/ou solicite que a upstream retire "
-"você.  Naquele momento no entanto, o 'master' ou a upstream poderiam ter "
-"sido avançadas desde a mesclagem do teste `+`; nesse caso, o grafo do commit "
-"final ficaria assim:"
+msgstr "Após a mesclagem deste teste, há duas maneiras de continuar o tópico do seu trabalho.  A mais fácil é construir sobre o commit da mesclagem de teste `+`, quando o seu trabalho no ramo dos tópicos estiver finalmente pronto, capture o tópico do ramo no 'master' e/ou solicite que a upstream retire você.  Naquele momento no entanto, o 'master' ou a upstream poderiam ter sido avançadas desde a mesclagem do teste `+`; nesse caso, o grafo do commit final ficaria assim:"
 
 #. type: delimited block -
 #: en/git-rerere.txt:121
@@ -51011,22 +44553,13 @@ msgstr ""
 #: en/git-rerere.txt:133
 #, priority:100
 msgid "When your topic branch is long-lived, however, your topic branch would end up having many such \"Merge from master\" commits on it, which would unnecessarily clutter the development history.  Readers of the Linux kernel mailing list may remember that Linus complained about such too frequent test merges when a subsystem maintainer asked to pull from a branch full of \"useless merges\"."
-msgstr ""
-"Quando o tópico do ramo é longo, no entanto, o seu tópico do ramo acabaria "
-"com muitos commits como \"Mesclar do mestre\" nele, o que desorganizaria de "
-"forma desnecessária o histórico de desenvolvimento.  Os leitores da lista de "
-"discussão do kernel do Linux podem se lembrar que Linus se queixou das "
-"mesclagens de teste tão frequentes quando um mantenedor do subsistema pediu "
-"para capturar de um ramo cheio de \"mesclagens inúteis\"."
+msgstr "Quando o tópico do ramo é longo, no entanto, o seu tópico do ramo acabaria com muitos commits como \"Mesclar do mestre\" nele, o que desorganizaria de forma desnecessária o histórico de desenvolvimento.  Os leitores da lista de discussão do kernel do Linux podem se lembrar que Linus se queixou das mesclagens de teste tão frequentes quando um mantenedor do subsistema pediu para capturar de um ramo cheio de \"mesclagens inúteis\"."
 
 #. type: Plain text
 #: en/git-rerere.txt:137
 #, priority:100
 msgid "As an alternative, to keep the topic branch clean of test merges, you could blow away the test merge, and keep building on top of the tip before the test merge:"
-msgstr ""
-"Como uma alternativa, para manter o tópico do ramo limpo das mesclagens de "
-"teste, você pode afastar a mesclagem de teste e continuar construindo sobre "
-"o cume antes da mesclagem de teste:"
+msgstr "Como uma alternativa, para manter o tópico do ramo limpo das mesclagens de teste, você pode afastar a mesclagem de teste e continuar construindo sobre o cume antes da mesclagem de teste:"
 
 #. type: delimited block -
 #: en/git-rerere.txt:145
@@ -51062,74 +44595,37 @@ msgstr ""
 #: en/git-rerere.txt:159
 #, priority:100
 msgid "This would leave only one merge commit when your topic branch is finally ready and merged into the master branch.  This merge would require you to resolve the conflict, introduced by the commits marked with `*`.  However, this conflict is often the same conflict you resolved when you created the test merge you blew away.  'git rerere' helps you resolve this final conflicted merge using the information from your earlier hand resolve."
-msgstr ""
-"Isso deixaria apenas um commit mesclado quando o ramo do tópico estiver "
-"finalmente pronto e mesclado no ramo \"master\".  Esta mesclagem exigiria "
-"que você resolvesse o conflito, introduzido pelos commits marcados com `*`.  "
-"No entanto, este conflito geralmente é o mesmo que você resolveu quando "
-"criou a mesclagem de teste que desapareceu.  O comando 'git rerere' ajuda a "
-"resolver esta mesclagem conflitante final usando as informações da sua "
-"resolução manual anterior."
+msgstr "Isso deixaria apenas um commit mesclado quando o ramo do tópico estiver finalmente pronto e mesclado no ramo \"master\".  Esta mesclagem exigiria que você resolvesse o conflito, introduzido pelos commits marcados com `*`.  No entanto, este conflito geralmente é o mesmo que você resolveu quando criou a mesclagem de teste que desapareceu.  O comando 'git rerere' ajuda a resolver esta mesclagem conflitante final usando as informações da sua resolução manual anterior."
 
 #. type: Plain text
 #: en/git-rerere.txt:167
 #, priority:100
 msgid "Running the 'git rerere' command immediately after a conflicted automerge records the conflicted working tree files, with the usual conflict markers `<<<<<<<`, `=======`, and `>>>>>>>` in them.  Later, after you are done resolving the conflicts, running 'git rerere' again will record the resolved state of these files.  Suppose you did this when you created the test merge of master into the topic branch."
-msgstr ""
-"A execução do comando 'git rerere' imediatamente após um conflito de "
-"mesclagem automática, registra os arquivos da árvore de trabalho em "
-"conflito, com os marcadores de conflito usuais `<<<<<<<`, `=======`, e "
-"`>>>>>>>` neles.  Mais tarde, depois de ter terminado de resolver os "
-"conflitos, executando o comando 'git rerere' novamente registrará o a "
-"condição resolvida destes arquivos.  Suponha que tenha sido feito isso ao "
-"criar o teste de mesclagem do \"master\" no tópico do ramo."
+msgstr "A execução do comando 'git rerere' imediatamente após um conflito de mesclagem automática, registra os arquivos da árvore de trabalho em conflito, com os marcadores de conflito usuais `<<<<<<<`, `=======`, e `>>>>>>>` neles.  Mais tarde, depois de ter terminado de resolver os conflitos, executando o comando 'git rerere' novamente registrará o a condição resolvida destes arquivos.  Suponha que tenha sido feito isso ao criar o teste de mesclagem do \"master\" no tópico do ramo."
 
 #. type: Plain text
 #: en/git-rerere.txt:177
 #, priority:100
 msgid "Next time, after seeing the same conflicted automerge, running 'git rerere' will perform a three-way merge between the earlier conflicted automerge, the earlier manual resolution, and the current conflicted automerge.  If this three-way merge resolves cleanly, the result is written out to your working tree file, so you do not have to manually resolve it.  Note that 'git rerere' leaves the index file alone, so you still need to do the final sanity checks with `git diff` (or `git diff -c`) and 'git add' when you are satisfied."
-msgstr ""
-"Da próxima vez, depois de ver o mesmo surgimento automático dos conflitos, a "
-"execução do comando 'git rerere' executará uma mesclagem de três vias entre "
-"o surgimento automático dos conflitos anterior, a resolução manual anterior "
-"e o surgimento dos conflitos atuais.  Caso essa mesclagem de três vias for "
-"resolvida corretamente, o resultado será gravado no arquivo da árvore de "
-"trabalho, para que você não precise resolvê-lo manualmente.  Note que o "
-"comando 'git rerere' não altera o arquivo do índice, então ainda é preciso "
-"fazer as verificações finais de sanidade com o comando `git diff` (ou `git "
-"diff -c`) e o 'git add' quando estiver satisfeito."
+msgstr "Da próxima vez, depois de ver o mesmo surgimento automático dos conflitos, a execução do comando 'git rerere' executará uma mesclagem de três vias entre o surgimento automático dos conflitos anterior, a resolução manual anterior e o surgimento dos conflitos atuais.  Caso essa mesclagem de três vias for resolvida corretamente, o resultado será gravado no arquivo da árvore de trabalho, para que você não precise resolvê-lo manualmente.  Note que o comando 'git rerere' não altera o arquivo do índice, então ainda é preciso fazer as verificações finais de sanidade com o comando `git diff` (ou `git diff -c`) e o 'git add' quando estiver satisfeito."
 
 #. type: Plain text
 #: en/git-rerere.txt:185
 #, priority:100
 msgid "As a convenience measure, 'git merge' automatically invokes 'git rerere' upon exiting with a failed automerge and 'git rerere' records the hand resolve when it is a new conflict, or reuses the earlier hand resolve when it is not.  'git commit' also invokes 'git rerere' when committing a merge result.  What this means is that you do not have to do anything special yourself (besides enabling the rerere.enabled config variable)."
-msgstr ""
-"Como medida de pura conveniência, o comando 'git merge' invoca "
-"automaticamente o 'git rerere' ao encerrar com uma falha automática e o 'git "
-"rerere' registra a solução quando se trata de um novo conflito ou reutiliza "
-"a solução anterior quando não for.  O comando 'git commit' também invoca o "
-"'git rerere' quando o commit feito resultar numa mesclagem.  Isso significa "
-"que você não precisa fazer nada de especial (além de ativar a variável de "
-"configuração `rerere.enabled`)."
+msgstr "Como medida de pura conveniência, o comando 'git merge' invoca automaticamente o 'git rerere' ao encerrar com uma falha automática e o 'git rerere' registra a solução quando se trata de um novo conflito ou reutiliza a solução anterior quando não for.  O comando 'git commit' também invoca o 'git rerere' quando o commit feito resultar numa mesclagem.  Isso significa que você não precisa fazer nada de especial (além de ativar a variável de configuração `rerere.enabled`)."
 
 #. type: Plain text
 #: en/git-rerere.txt:190
 #, priority:100
 msgid "In our example, when you do the test merge, the manual resolution is recorded, and it will be reused when you do the actual merge later with the updated master and topic branch, as long as the recorded resolution is still applicable."
-msgstr ""
-"No nosso exemplo, quando você faz a mesclagem de teste, a resolução manual é "
-"gravada e será reutilizada quando fizer a mesclagem real posteriormente com "
-"'master' e o tópico do ramo atualizados, desde que a resolução gravada ainda "
-"seja aplicável."
+msgstr "No nosso exemplo, quando você faz a mesclagem de teste, a resolução manual é gravada e será reutilizada quando fizer a mesclagem real posteriormente com 'master' e o tópico do ramo atualizados, desde que a resolução gravada ainda seja aplicável."
 
 #. type: Plain text
 #: en/git-rerere.txt:194
 #, priority:100
 msgid "The information 'git rerere' records is also used when running 'git rebase'.  After blowing away the test merge and continuing development on the topic branch:"
-msgstr ""
-"As informações 'git rerere' também são usadas ao executar 'git rebase'.  "
-"Depois de acabar com a mesclagem de teste e o desenvolvimento contínuo no "
-"ramo do tópico:"
+msgstr "As informações 'git rerere' também são usadas ao executar 'git rebase'.  Depois de acabar com a mesclagem de teste e o desenvolvimento contínuo no ramo do tópico:"
 
 #. type: delimited block -
 #: en/git-rerere.txt:199
@@ -51165,25 +44661,13 @@ msgstr ""
 #: en/git-rerere.txt:213
 #, priority:100
 msgid "you could run `git rebase master topic`, to bring yourself up to date before your topic is ready to be sent upstream.  This would result in falling back to a three-way merge, and it would conflict the same way as the test merge you resolved earlier.  'git rerere' will be run by 'git rebase' to help you resolve this conflict."
-msgstr ""
-"você pode executar o comando `git rebase master topic`, para se atualizar "
-"antes que o seu tópico esteja pronto para ser enviado para a upstream.  Isso "
-"resultaria no retorno para uma mesclagem de três vias e entraria em conflito "
-"da mesma maneira que o teste de mesclagem que você resolveu anteriormente.  "
-"O comando 'git rerere' será executado através do 'git rebase' para ajudá-lo "
-"a resolver este conflito."
+msgstr "você pode executar o comando `git rebase master topic`, para se atualizar antes que o seu tópico esteja pronto para ser enviado para a upstream.  Isso resultaria no retorno para uma mesclagem de três vias e entraria em conflito da mesma maneira que o teste de mesclagem que você resolveu anteriormente.  O comando 'git rerere' será executado através do 'git rebase' para ajudá-lo a resolver este conflito."
 
 #. type: Plain text
 #: en/git-rerere.txt:219
 #, priority:100
 msgid "[NOTE] 'git rerere' relies on the conflict markers in the file to detect the conflict.  If the file already contains lines that look the same as lines with conflict markers, 'git rerere' may fail to record a conflict resolution.  To work around this, the `conflict-marker-size` setting in linkgit:gitattributes[5] can be used."
-msgstr ""
-"[Observação] o comando 'git rerere' conta com os marcadores de conflito no "
-"arquivo para detectar o conflito.  Caso o arquivo já contenha as linhas que "
-"parecem iguais às linhas dos marcadores de conflito, o comando 'git rerere' "
-"pode falhar durante o registro de uma resolução de conflito.  Para contornar "
-"isso, a configuração `conflict-marker-size` no linkgit:gitattributes[5] pode "
-"ser utilizada."
+msgstr "[Observação] o comando 'git rerere' conta com os marcadores de conflito no arquivo para detectar o conflito.  Caso o arquivo já contenha as linhas que parecem iguais às linhas dos marcadores de conflito, o comando 'git rerere' pode falhar durante o registro de uma resolução de conflito.  Para contornar isso, a configuração `conflict-marker-size` no linkgit:gitattributes[5] pode ser utilizada."
 
 #. type: Title =
 #: en/git-reset.txt:2
@@ -51207,22 +44691,15 @@ msgid ""
 "'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
 msgstr ""
 "'git reset' [-q] [<tree-ish>] [--] <pathspec>...\n"
-"'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] "
-"[<tree-ish>]\n"
+"'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] [<tree-ish>]\n"
 "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]\n"
-"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] "
-"[<commit>]\n"
+"'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]\n"
 
 #. type: Plain text
 #: en/git-reset.txt:22
 #, priority:280
 msgid "In the first three forms, copy entries from `<tree-ish>` to the index.  In the last form, set the current branch head (`HEAD`) to `<commit>`, optionally modifying index and working tree to match.  The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms."
-msgstr ""
-"Nos três primeiros formulários, copie as entradas de `<tree-ish>` para o "
-"índice.  No último formulário, defina o cabeçalho do ramo atual (`HEAD`) "
-"como `<commit>`, opcionalmente modificando o índice e a árvore de trabalho "
-"para que coincidam.  A predefinição `<tree-ish>`/`<commit>` retorna para "
-"`HEAD` em todas as formas."
+msgstr "Nos três primeiros formulários, copie as entradas de `<tree-ish>` para o índice.  No último formulário, defina o cabeçalho do ramo atual (`HEAD`) como `<commit>`, opcionalmente modificando o índice e a árvore de trabalho para que coincidam.  A predefinição `<tree-ish>`/`<commit>` retorna para `HEAD` em todas as formas."
 
 #. type: Labeled list
 #: en/git-reset.txt:23
@@ -51234,9 +44711,7 @@ msgstr "'git reset' [-q] [<tree-ish>] [--] <pathspec>..."
 #: en/git-reset.txt:24
 #, no-wrap, priority:280
 msgid "'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]"
-msgstr ""
-"'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] "
-"[<tree-ish>]"
+msgstr "'git reset' [-q] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] [<tree-ish>]"
 
 #. type: Plain text
 #: en/git-reset.txt:28
@@ -51266,10 +44741,7 @@ msgstr "'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]"
 #: en/git-reset.txt:44
 #, priority:280
 msgid "Interactively select hunks in the difference between the index and `<tree-ish>` (defaults to `HEAD`).  The chosen hunks are applied in reverse to the index."
-msgstr ""
-"Interativamente, selecione os pedaços na diferença entre o índice e o `<tree-"
-"ish>` (a predefinição retorna para `HEAD`).  Os pedaços selecionados são "
-"aplicados no sentido inverso ao índice."
+msgstr "Interativamente, selecione os pedaços na diferença entre o índice e o `<tree-ish>` (a predefinição retorna para `HEAD`).  Os pedaços selecionados são aplicados no sentido inverso ao índice."
 
 #. type: Plain text
 #: en/git-reset.txt:48
@@ -51287,12 +44759,7 @@ msgstr "'git reset' [<modo>] [<commit>]"
 #: en/git-reset.txt:54
 #, priority:280
 msgid "This form resets the current branch head to `<commit>` and possibly updates the index (resetting it to the tree of `<commit>`) and the working tree depending on `<mode>`. If `<mode>` is omitted, defaults to `--mixed`. The `<mode>` must be one of the following:"
-msgstr ""
-"Esse formulário redefine o cabeçalho de ramificação atual para `<commit>` e "
-"possivelmente atualiza o índice (redefinindo-o para a árvore de `<commit>`) "
-"e a árvore de trabalho, dependendo do `<modo>`. Caso o `<modo>` seja "
-"omitido, a predefinição retorna para a opção `--mixed`. O `<modo>` deve ser "
-"um dos seguintes:"
+msgstr "Esse formulário redefine o cabeçalho de ramificação atual para `<commit>` e possivelmente atualiza o índice (redefinindo-o para a árvore de `<commit>`) e a árvore de trabalho, dependendo do `<modo>`. Caso o `<modo>` seja omitido, a predefinição retorna para a opção `--mixed`. O `<modo>` deve ser um dos seguintes:"
 
 #. type: Labeled list
 #: en/git-reset.txt:56
@@ -51560,10 +45027,7 @@ msgstr ""
 #: en/git-reset.txt:223
 #, priority:280
 msgid "Try to update from the upstream resulted in a lot of conflicts; you were not ready to spend a lot of time merging right now, so you decide to do that later."
-msgstr ""
-"Tente atualizar a partir do upstream responsável pelos diversos conflitos; "
-"você não estava pronto para perder muito tempo mesclando agora, então decide "
-"fazer isso mais tarde."
+msgstr "Tente atualizar a partir do upstream responsável pelos diversos conflitos; você não estava pronto para perder muito tempo mesclando agora, então decide fazer isso mais tarde."
 
 #. type: Plain text
 #: en/git-reset.txt:226
@@ -52081,39 +45545,27 @@ msgid ""
 "'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]\n"
 "'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]\n"
 msgstr ""
-"'git restore' [<opções>] [--source=<árvore>] [--staged] [--worktree] [--] "
-"<pathspec>...\n"
-"'git restore' [<opções>] [--source=<árvore>] [--staged] [--worktree] "
-"--pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
-"'git restore' (-p|--patch) [<opções>] [--source=<árvore>] [--staged] "
-"[--worktree] [--] [<pathspec>...]\n"
+"'git restore' [<opções>] [--source=<árvore>] [--staged] [--worktree] [--] <pathspec>...\n"
+"'git restore' [<opções>] [--source=<árvore>] [--staged] [--worktree] --pathspec-from-file=<arquivo> [--pathspec-file-nul]\n"
+"'git restore' (-p|--patch) [<opções>] [--source=<árvore>] [--staged] [--worktree] [--] [<pathspec>...]\n"
 
 #. type: Plain text
 #: en/git-restore.txt:20
 #, priority:100
 msgid "Restore specified paths in the working tree with some contents from a restore source. If a path is tracked but does not exist in the restore source, it will be removed to match the source."
-msgstr ""
-"Restaure os caminhos definidos na árvore de trabalho com algum conteúdo de "
-"uma fonte de restauração. Se um caminho for monitorado, porém não existir na "
-"fonte de restauração, ele será removido para coincidir com a fonte."
+msgstr "Restaure os caminhos definidos na árvore de trabalho com algum conteúdo de uma fonte de restauração. Se um caminho for monitorado, porém não existir na fonte de restauração, ele será removido para coincidir com a fonte."
 
 #. type: Plain text
 #: en/git-restore.txt:24
 #, priority:100
 msgid "The command can also be used to restore the content in the index with `--staged`, or restore both the working tree and the index with `--staged --worktree`."
-msgstr ""
-"O comando também pode ser usado para restaurar o conteúdo no índice com a "
-"opção `--staged`, ou para restaurar a árvore de trabalho e o índice com `--"
-"staged --worktree`."
+msgstr "O comando também pode ser usado para restaurar o conteúdo no índice com a opção `--staged`, ou para restaurar a árvore de trabalho e o índice com `--staged --worktree`."
 
 #. type: Plain text
 #: en/git-restore.txt:27
 #, priority:100
 msgid "By default, if `--staged` is given, the contents are restored from `HEAD`, otherwise from the index. Use `--source` to restore from a different commit."
-msgstr ""
-"É predefinido que caso `--staged` seja utilizado, o conteúdo será restaurado "
-"a partir do `HEAD`, caso contrário, a partir do índice. Utilize a opção "
-"`--source` para restaurar a partir de um commit diferente."
+msgstr "É predefinido que caso `--staged` seja utilizado, o conteúdo será restaurado a partir do `HEAD`, caso contrário, a partir do índice. Utilize a opção `--source` para restaurar a partir de um commit diferente."
 
 #. type: Plain text
 #: en/git-restore.txt:32 en/git-switch.txt:33
@@ -52143,10 +45595,7 @@ msgstr "Restaure arquivos da árvore de trabalho com o conteúdo da árvore info
 #: en/git-restore.txt:43
 #, priority:100
 msgid "If not specified, the contents are restored from `HEAD` if `--staged` is given, otherwise from the index."
-msgstr ""
-"Caso não seja definido, o conteúdo será restaurado a partir de `HEAD` caso "
-"`--staged` seja informado, caso contrário, a restauração será a partir do "
-"índice."
+msgstr "Caso não seja definido, o conteúdo será restaurado a partir de `HEAD` caso `--staged` seja informado, caso contrário, a restauração será a partir do índice."
 
 #. type: Plain text
 #: en/git-restore.txt:50
@@ -52218,25 +45667,13 @@ msgstr "Não aborte a operação ao restaurar os arquivos no índice da árvore
 #: en/git-restore.txt:106
 #, priority:100
 msgid "In sparse checkout mode, by default is to only update entries matched by `<pathspec>` and sparse patterns in $GIT_DIR/info/sparse-checkout. This option ignores the sparse patterns and unconditionally restores any files in `<pathspec>`."
-msgstr ""
-"É predefinido que no modo de averiguação esparsa, apenas atualize as "
-"entradas que coincidam com `<pathspec>` e os padrões esparsos no `$GIT_DIR/"
-"info/sparse-checkout`. Esta opção ignora os padrões esparsos e restaura "
-"incondicionalmente todos os arquivos que estejam no `<pathspec>`."
+msgstr "É predefinido que no modo de averiguação esparsa, apenas atualize as entradas que coincidam com `<pathspec>` e os padrões esparsos no `$GIT_DIR/info/sparse-checkout`. Esta opção ignora os padrões esparsos e restaura incondicionalmente todos os arquivos que estejam no `<pathspec>`."
 
 #. type: Plain text
 #: en/git-restore.txt:117
 #, priority:100
 msgid "If `<pathspec>` names an active submodule and the restore location includes the working tree, the submodule will only be updated if this option is given, in which case its working tree will be restored to the commit recorded in the superproject, and any local modifications overwritten. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-checkout[1], this will detach `HEAD` of the submodule."
-msgstr ""
-"Caso o `<pathspec>` nomeie um submódulo ativo e o local da restauração "
-"incluir a árvore de trabalho, o submódulo será atualizado apenas caso esta "
-"opção seja utilizada. Neste caso, a sua árvore de trabalho será restaurada "
-"para o commit registrado no superprojeto e quaisquer alterações locais serão "
-"substituídas. Caso nada (ou a opção `--no-recurse-submodules`) seja "
-"utilizado, os submódulos que trabalham nas árvores não serão atualizados. "
-"Assim como linkgit:git-submodule[1], isso faz com que o `HEAD` seja "
-"desanexando do submódulo."
+msgstr "Caso o `<pathspec>` nomeie um submódulo ativo e o local da restauração incluir a árvore de trabalho, o submódulo será atualizado apenas caso esta opção seja utilizada. Neste caso, a sua árvore de trabalho será restaurada para o commit registrado no superprojeto e quaisquer alterações locais serão substituídas. Caso nada (ou a opção `--no-recurse-submodules`) seja utilizado, os submódulos que trabalham nas árvores não serão atualizados. Assim como linkgit:git-submodule[1], isso faz com que o `HEAD` seja desanexando do submódulo."
 
 #. type: Plain text
 #: en/git-restore.txt:124
@@ -52380,11 +45817,7 @@ msgstr ""
 #: en/git-revert.txt:21
 #, priority:100
 msgid "Given one or more existing commits, revert the changes that the related patches introduce, and record some new commits that record them.  This requires your working tree to be clean (no modifications from the HEAD commit)."
-msgstr ""
-"Dado um ou mais commits já existentes, reverta as alterações introduzidas "
-"pelos patches relacionados e registre alguns novos commits que registram "
-"neles.  Isso requer que a sua árvore de trabalho esteja limpa (nenhuma "
-"alteração a partir do commit `HEAD`)."
+msgstr "Dado um ou mais commits já existentes, reverta as alterações introduzidas pelos patches relacionados e registre alguns novos commits que registram neles.  Isso requer que a sua árvore de trabalho esteja limpa (nenhuma alteração a partir do commit `HEAD`)."
 
 #. type: Plain text
 #: en/git-revert.txt:30
@@ -52396,78 +45829,49 @@ msgstr "Nota: 'git revert' é utilizado para registrar alguns commits novos para
 #: en/git-revert.txt:43
 #, priority:100
 msgid "Commits to revert.  For a more complete list of ways to spell commit names, see linkgit:gitrevisions[7].  Sets of commits can also be given but no traversal is done by default, see linkgit:git-rev-list[1] and its `--no-walk` option."
-msgstr ""
-"Commits que serão revertidos.  Para obter uma lista mais completa das "
-"maneiras de como soletrar os nomes dos commits, consulte "
-"linkgit:gitrevisions[7]  Um conjunto de commits também podem ser informados "
-"porém nenhuma travessia é feita por padrão, consulte linkgit:git-rev-list[1] "
-"e a sua opção `--no-walk`."
+msgstr "Commits que serão revertidos.  Para obter uma lista mais completa das maneiras de como soletrar os nomes dos commits, consulte linkgit:gitrevisions[7]  Um conjunto de commits também podem ser informados porém nenhuma travessia é feita por padrão, consulte linkgit:git-rev-list[1] e a sua opção `--no-walk`."
 
 #. type: Plain text
 #: en/git-revert.txt:49
 #, priority:100
 msgid "With this option, 'git revert' will let you edit the commit message prior to committing the revert. This is the default if you run the command from a terminal."
-msgstr ""
-"Com esta opção, o comando 'git revert' permitirá a edição da mensagem do "
-"commit antes de fazer a reversão do commit. Esta é a predefinição caso "
-"execute o comando em um terminal."
+msgstr "Com esta opção, o comando 'git revert' permitirá a edição da mensagem do commit antes de fazer a reversão do commit. Esta é a predefinição caso execute o comando em um terminal."
 
 #. type: Plain text
 #: en/git-revert.txt:57
 #, priority:100
 msgid "Usually you cannot revert a merge because you do not know which side of the merge should be considered the mainline.  This option specifies the parent number (starting from 1) of the mainline and allows revert to reverse the change relative to the specified parent."
-msgstr ""
-"Geralmente, você não pode reverter uma mesclagem porque não sabe qual o lado "
-"da mesclagem deve ser considerado a linha principal.  Esta opção determina o "
-"número do pai (começando em 1) da linha principal e permite que a reversão "
-"reverta a alteração em relação ao pai informado."
+msgstr "Geralmente, você não pode reverter uma mesclagem porque não sabe qual o lado da mesclagem deve ser considerado a linha principal.  Esta opção determina o número do pai (começando em 1) da linha principal e permite que a reversão reverta a alteração em relação ao pai informado."
 
 #. type: Plain text
 #: en/git-revert.txt:62
 #, priority:100
 msgid "Reverting a merge commit declares that you will never want the tree changes brought in by the merge.  As a result, later merges will only bring in tree changes introduced by commits that are not ancestors of the previously reverted merge.  This may or may not be what you want."
-msgstr ""
-"A reversão da mesclagem de um commit declara que você nunca vai querer que "
-"as alterações na árvore sejam trazidas pela mesclagem.  Como resultado, as "
-"mesclagens posteriores trarão apenas as alterações na árvore introduzidas "
-"pelos commits que não sejam os ancestrais da mesclagem revertida "
-"anteriormente.  Isso pode ou não ser o que você queira."
+msgstr "A reversão da mesclagem de um commit declara que você nunca vai querer que as alterações na árvore sejam trazidas pela mesclagem.  Como resultado, as mesclagens posteriores trarão apenas as alterações na árvore introduzidas pelos commits que não sejam os ancestrais da mesclagem revertida anteriormente.  Isso pode ou não ser o que você queira."
 
 #. type: Plain text
 #: en/git-revert.txt:65
 #, priority:100
 msgid "See the link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for more details."
-msgstr ""
-"Consulte o link:howto/revert-a-faulty-merge.html[Como fazer um 'revert-a"
-"-faulty-merge'] para mais detalhes."
+msgstr "Consulte o link:howto/revert-a-faulty-merge.html[Como fazer um 'revert-a-faulty-merge'] para mais detalhes."
 
 #. type: Plain text
 #: en/git-revert.txt:69
 #, priority:100
 msgid "With this option, 'git revert' will not start the commit message editor."
-msgstr ""
-"Com esta opção, o comando 'git revert' não iniciará o editor das mensagens "
-"do commit."
+msgstr "Com esta opção, o comando 'git revert' não iniciará o editor das mensagens do commit."
 
 #. type: Plain text
 #: en/git-revert.txt:87
 #, priority:100
 msgid "Usually the command automatically creates some commits with commit log messages stating which commits were reverted.  This flag applies the changes necessary to revert the named commits to your working tree and the index, but does not make the commits.  In addition, when this option is used, your index does not have to match the HEAD commit.  The revert is done against the beginning state of your index."
-msgstr ""
-"Geralmente, o comando cria automaticamente alguns commits com mensagens no "
-"registro log informando quais commits foram revertidos.  Esta opção aplica "
-"as alterações necessárias para reverter os commits informados para a sua "
-"árvore de trabalho e o índice, mas não faz os commits.  Além disso, quando "
-"esta opção é utilizada, o seu índice não precisa coincidir ao HEAD do "
-"commit.  A reversão é feita na condição inicial do seu índice."
+msgstr "Geralmente, o comando cria automaticamente alguns commits com mensagens no registro log informando quais commits foram revertidos.  Esta opção aplica as alterações necessárias para reverter os commits informados para a sua árvore de trabalho e o índice, mas não faz os commits.  Além disso, quando esta opção é utilizada, o seu índice não precisa coincidir ao HEAD do commit.  A reversão é feita na condição inicial do seu índice."
 
 #. type: Plain text
 #: en/git-revert.txt:90
 #, priority:100
 msgid "This is useful when reverting more than one commits' effect to your index in a row."
-msgstr ""
-"Isso é útil durante ao reverter o efeito de um ou mais commits no seu "
-"índice, em uma linha."
+msgstr "Isso é útil durante ao reverter o efeito de um ou mais commits no seu índice, em uma linha."
 
 #. type: Labeled list
 #: en/git-revert.txt:126
@@ -52479,9 +45883,7 @@ msgstr "`git revert HEAD~3`"
 #: en/git-revert.txt:130
 #, priority:100
 msgid "Revert the changes specified by the fourth last commit in HEAD and create a new commit with the reverted changes."
-msgstr ""
-"Reverta as alterações informadas pelo quarto último commit no HEAD e crie um "
-"novo commit com as alterações revertidas."
+msgstr "Reverta as alterações informadas pelo quarto último commit no HEAD e crie um novo commit com as alterações revertidas."
 
 #. type: Labeled list
 #: en/git-revert.txt:131
@@ -52493,11 +45895,7 @@ msgstr "`git revert -n master~5..master~2`"
 #: en/git-revert.txt:138
 #, priority:100
 msgid "Revert the changes done by commits from the fifth last commit in master (included) to the third last commit in master (included), but do not create any commit with the reverted changes. The revert only modifies the working tree and the index."
-msgstr ""
-"Reverta as alterações feitas pelos commits do quinto último commit no master "
-"(incluso) para o terceiro último commit no master (incluso), porém não crie "
-"nenhum commit com as alterações revertidas. A reversão altera apenas a "
-"árvore de trabalho e o índice."
+msgstr "Reverta as alterações feitas pelos commits do quinto último commit no master (incluso) para o terceiro último commit no master (incluso), porém não crie nenhum commit com as alterações revertidas. A reversão altera apenas a árvore de trabalho e o índice."
 
 #. type: Title =
 #: en/git-rev-list.txt:2
@@ -52509,8 +45907,7 @@ msgstr "git-rev-list(1)"
 #: en/git-rev-list.txt:7
 #, priority:100
 msgid "git-rev-list - Lists commit objects in reverse chronological order"
-msgstr ""
-"git-rev-list - Lista os objetos commits em ordem reversa cronologicamente"
+msgstr "git-rev-list - Lista os objetos commits em ordem reversa cronologicamente"
 
 #. type: Plain text
 #: en/git-rev-list.txt:13
@@ -52522,24 +45919,13 @@ msgstr "'git rev-list' [<opções>] <commit>... [[--] <caminho>...]\n"
 #: en/git-rev-list.txt:21
 #, priority:100
 msgid "List commits that are reachable by following the `parent` links from the given commit(s), but exclude commits that are reachable from the one(s)  given with a '{caret}' in front of them.  The output is given in reverse chronological order by default."
-msgstr ""
-"Liste os commits que podem ser acessadas seguindo os links `parent` de "
-"determinados commits, porém exclua os commits acessíveis das que receberam "
-"um '{caret}' na frente deles.  Por predefinição, a saída é informada em "
-"ordem cronológica reversa."
+msgstr "Liste os commits que podem ser acessadas seguindo os links `parent` de determinados commits, porém exclua os commits acessíveis das que receberam um '{caret}' na frente deles.  Por predefinição, a saída é informada em ordem cronológica reversa."
 
 #. type: Plain text
 #: en/git-rev-list.txt:28
 #, priority:100
 msgid "You can think of this as a set operation.  Commits given on the command line form a set of commits that are reachable from any of them, and then commits reachable from any of the ones given with '{caret}' in front are subtracted from that set.  The remaining commits are what comes out in the command's output.  Various other options and paths parameters can be used to further limit the result."
-msgstr ""
-"É possível pensar nisso como uma operação em conjunto.  Os commits "
-"utilizados na linha de comando formam um conjunto de commits acessíveis a "
-"partir de qualquer uma delas e, em seguida, os commits acessíveis a partir "
-"de qualquer uma das que são informadas na frente com '{caret}' são "
-"subtraídas desse conjunto.  Os commits restantes são o que são gerados pelo "
-"comando.  Várias outras opções e parâmetros de caminho podem ser usados para "
-"limitar ainda mais o resultado."
+msgstr "É possível pensar nisso como uma operação em conjunto.  Os commits utilizados na linha de comando formam um conjunto de commits acessíveis a partir de qualquer uma delas e, em seguida, os commits acessíveis a partir de qualquer uma das que são informadas na frente com '{caret}' são subtraídas desse conjunto.  Os commits restantes são o que são gerados pelo comando.  Várias outras opções e parâmetros de caminho podem ser usados para limitar ainda mais o resultado."
 
 #. type: Plain text
 #: en/git-rev-list.txt:30
@@ -52557,18 +45943,13 @@ msgstr "\t$ git rev-list foo bar ^baz\n"
 #: en/git-rev-list.txt:37
 #, priority:100
 msgid "means \"list all the commits which are reachable from 'foo' or 'bar', but not from 'baz'\"."
-msgstr ""
-"significa \"listar todos os commits acessíveis a partir do 'foo' ou 'bar', "
-"porém não de 'baz'\"."
+msgstr "significa \"listar todos os commits acessíveis a partir do 'foo' ou 'bar', porém não de 'baz'\"."
 
 #. type: Plain text
 #: en/git-rev-list.txt:41
 #, priority:100
 msgid "A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following may be used interchangeably:"
-msgstr ""
-"Uma notação especial \"'<commit1>'..'<commit2>'\" pode ser utilizada como "
-"uma abreviação para \"{caret}'<commit1>' '<commit2>'\". Qualquer um dos "
-"seguintes pode ser usado de forma intercambiável, por exemplo:"
+msgstr "Uma notação especial \"'<commit1>'..'<commit2>'\" pode ser utilizada como uma abreviação para \"{caret}'<commit1>' '<commit2>'\". Qualquer um dos seguintes pode ser usado de forma intercambiável, por exemplo:"
 
 #. type: delimited block -
 #: en/git-rev-list.txt:45
@@ -52584,10 +45965,7 @@ msgstr ""
 #: en/git-rev-list.txt:50
 #, ignore-ellipsis, priority:100
 msgid "Another special notation is \"'<commit1>'...'<commit2>'\" which is useful for merges.  The resulting set of commits is the symmetric difference between the two operands.  The following two commands are equivalent:"
-msgstr ""
-"Outra notação especial é \"'<commit1>'...'<commit2>'\", útil para "
-"mesclagens.  O conjunto resultante dos commits é a diferença simétrica entre "
-"dois operandos.  Os dois comandos a seguir são equivalentes:"
+msgstr "Outra notação especial é \"'<commit1>'...'<commit2>'\", útil para mesclagens.  O conjunto resultante dos commits é a diferença simétrica entre dois operandos.  Os dois comandos a seguir são equivalentes:"
 
 #. type: delimited block -
 #: en/git-rev-list.txt:54
@@ -52603,11 +45981,7 @@ msgstr ""
 #: en/git-rev-list.txt:61
 #, priority:100
 msgid "'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and 'git repack'."
-msgstr ""
-"O 'rev-list' é um comando Git muito essencial, pois fornece a capacidade de "
-"construir e transpor os grafos de ancestralidade de um commit. Por este "
-"motivo, ele possui muitas opções diferentes que permitem a sua utilização "
-"por comandos tão diferentes como 'git bisect' e 'git repack'."
+msgstr "O 'rev-list' é um comando Git muito essencial, pois fornece a capacidade de construir e transpor os grafos de ancestralidade de um commit. Por este motivo, ele possui muitas opções diferentes que permitem a sua utilização por comandos tão diferentes como 'git bisect' e 'git repack'."
 
 #. type: Title =
 #: en/git-rev-parse.txt:2
@@ -52631,12 +46005,7 @@ msgstr "'git rev-parse' [<opções>] <args>...\n"
 #: en/git-rev-parse.txt:23
 #, priority:100
 msgid "Many Git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for the underlying 'git rev-list' command they use internally and flags and parameters for the other commands they use downstream of 'git rev-list'.  This command is used to distinguish between them."
-msgstr ""
-"Muitos comandos porcelana do Git utilizam uma mistura de opções (ou seja, "
-"parâmetros que começam com um traço '-') e os parâmetros destinados ao "
-"comando 'git rev-list' subjacente que eles utilizam internamente, as opções "
-"e os parâmetros para os outros comandos que utilizam na produção final do "
-"'git rev-list '.  Este comando é utilizado para se distinguir entre eles."
+msgstr "Muitos comandos porcelana do Git utilizam uma mistura de opções (ou seja, parâmetros que começam com um traço '-') e os parâmetros destinados ao comando 'git rev-list' subjacente que eles utilizam internamente, as opções e os parâmetros para os outros comandos que utilizam na produção final do 'git rev-list '.  Este comando é utilizado para se distinguir entre eles."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:29
@@ -52660,9 +46029,7 @@ msgstr "--parseopt"
 #: en/git-rev-parse.txt:35
 #, priority:100
 msgid "Use 'git rev-parse' in option parsing mode (see PARSEOPT section below)."
-msgstr ""
-"Utilize o comando 'git rev-parse' no modo de análise de opções (consulte a "
-"seção \"PARSEOPT\" abaixo)."
+msgstr "Utilize o comando 'git rev-parse' no modo de análise de opções (consulte a seção \"PARSEOPT\" abaixo)."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:36
@@ -52674,10 +46041,7 @@ msgstr "--sq-quote"
 #: en/git-rev-parse.txt:40
 #, priority:100
 msgid "Use 'git rev-parse' in shell quoting mode (see SQ-QUOTE section below). In contrast to the `--sq` option below, this mode does only quoting. Nothing else is done to command input."
-msgstr ""
-"Utilize o comando 'git rev-parse' em modo de citação shell (consulte a seção "
-"\"SQ-QUOTE\" abaixo). Ao contrário da opção `--sq` abaixo, este modo apenas "
-"cita. Nada mais é feito para comandar a entrada."
+msgstr "Utilize o comando 'git rev-parse' em modo de citação shell (consulte a seção \"SQ-QUOTE\" abaixo). Ao contrário da opção `--sq` abaixo, este modo apenas cita. Nada mais é feito para comandar a entrada."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:42
@@ -52695,9 +46059,7 @@ msgstr "--keep-dashdash"
 #: en/git-rev-parse.txt:47
 #, priority:100
 msgid "Only meaningful in `--parseopt` mode. Tells the option parser to echo out the first `--` met instead of skipping it."
-msgstr ""
-"Apenas faz sentido no modo `--parseopt`. Informa ao analisador das opções "
-"para ecoar o primeiro `--` encontrado em vez de ignorá-lo."
+msgstr "Apenas faz sentido no modo `--parseopt`. Informa ao analisador das opções para ecoar o primeiro `--` encontrado em vez de ignorá-lo."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:48
@@ -52709,10 +46071,7 @@ msgstr "--stop-at-non-option"
 #: en/git-rev-parse.txt:52
 #, priority:100
 msgid "Only meaningful in `--parseopt` mode.  Lets the option parser stop at the first non-option argument.  This can be used to parse sub-commands that take options themselves."
-msgstr ""
-"Apenas faz sentido no modo `--parseopt`.  Permite que o analisador de opções "
-"pare no primeiro argumento sem opção.  Pode ser usado para analisar os "
-"subcomandos que aceitam essas opções."
+msgstr "Apenas faz sentido no modo `--parseopt`.  Permite que o analisador de opções pare no primeiro argumento sem opção.  Pode ser usado para analisar os subcomandos que aceitam essas opções."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:53
@@ -52724,9 +46083,7 @@ msgstr "--stuck-long"
 #: en/git-rev-parse.txt:56
 #, priority:100
 msgid "Only meaningful in `--parseopt` mode. Output the options in their long form if available, and with their arguments stuck."
-msgstr ""
-"Apenas faz sentido no modo `--parseopt`. Gere as opções em sua forma longa, "
-"caso estejam disponíveis, e com os seus argumentos bloqueados."
+msgstr "Apenas faz sentido no modo `--parseopt`. Gere as opções em sua forma longa, caso estejam disponíveis, e com os seus argumentos bloqueados."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:58
@@ -52744,8 +46101,7 @@ msgstr "--revs-only"
 #: en/git-rev-parse.txt:63
 #, priority:100
 msgid "Do not output flags and parameters not meant for 'git rev-list' command."
-msgstr ""
-"Não produza opções e parâmetros não destinados ao comando 'git rev-list'."
+msgstr "Não produza opções e parâmetros não destinados ao comando 'git rev-list'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:64
@@ -52799,9 +46155,7 @@ msgstr "--default <arg>"
 #: en/git-rev-parse.txt:80
 #, priority:100
 msgid "If there is no parameter given by the user, use `<arg>` instead."
-msgstr ""
-"Caso não haja nenhum parâmetro informado pelo usuário, em vez disso utilize "
-"`<arg>`."
+msgstr "Caso não haja nenhum parâmetro informado pelo usuário, em vez disso utilize `<arg>`."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:81
@@ -52813,11 +46167,7 @@ msgstr "--prefix <arg>"
 #: en/git-rev-parse.txt:86
 #, priority:100
 msgid "Behave as if 'git rev-parse' was invoked from the `<arg>` subdirectory of the working tree.  Any relative filenames are resolved as if they are prefixed by `<arg>` and will be printed in that form."
-msgstr ""
-"Comporte-se como se o comando 'git rev-parse' fosse invocado no subdiretório "
-"`<arg>` da árvore de trabalho.  Quaisquer nomes dos arquivos relativos são "
-"resolvidos como se fossem prefixados através do `<arg>` e serão impressos "
-"neste formulário."
+msgstr "Comporte-se como se o comando 'git rev-parse' fosse invocado no subdiretório `<arg>` da árvore de trabalho.  Quaisquer nomes dos arquivos relativos são resolvidos como se fossem prefixados através do `<arg>` e serão impressos neste formulário."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:90
@@ -52843,35 +46193,19 @@ msgstr ""
 #: en/git-rev-parse.txt:103
 #, priority:100
 msgid "Verify that exactly one parameter is provided, and that it can be turned into a raw 20-byte SHA-1 that can be used to access the object database. If so, emit it to the standard output; otherwise, error out."
-msgstr ""
-"Verifique que exatamente um parâmetro seja informado e se pode ser "
-"transformado em um SHA-1 com 20 bytes brutos, que possa ser utilizado para "
-"acessar o banco de dados do objeto. Em caso positivo, emita-o para a saída "
-"padrão; caso contrário, gere um erro."
+msgstr "Verifique que exatamente um parâmetro seja informado e se pode ser transformado em um SHA-1 com 20 bytes brutos, que possa ser utilizado para acessar o banco de dados do objeto. Em caso positivo, emita-o para a saída padrão; caso contrário, gere um erro."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:112
 #, priority:100
 msgid "If you want to make sure that the output actually names an object in your object database and/or can be used as a specific type of object you require, you can add the `^{type}` peeling operator to the parameter.  For example, `git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing object that is a commit-ish (i.e. a commit, or an annotated tag that points at a commit).  To make sure that `$VAR` names an existing object of any type, `git rev-parse \"$VAR^{object}\"` can be used."
-msgstr ""
-"Caso queira garantir que a saída realmente nomeie um objeto no banco de "
-"dados dos objetos e/ou possam ser utilizados como um tipo específico que "
-"você precisa, é possível adicionar o operador de remoção `^{type}` ao "
-"parâmetro.  Por exemplo, `git rev-parse\" $VAR^{commit}\"` garantirá que "
-"`$VAR` nomeie um objeto já existente que seja um \"commit-ish\" (ou seja, um "
-"commit ou uma tag anotada que aponte para um commit).  Para garantir que o "
-"'$VAR` nomeie um objeto já existente de qualquer tipo, `git rev-parse \""
-"$VAR^{object}\"` pode ser utilizado."
+msgstr "Caso queira garantir que a saída realmente nomeie um objeto no banco de dados dos objetos e/ou possam ser utilizados como um tipo específico que você precisa, é possível adicionar o operador de remoção `^{type}` ao parâmetro.  Por exemplo, `git rev-parse\" $VAR^{commit}\"` garantirá que `$VAR` nomeie um objeto já existente que seja um \"commit-ish\" (ou seja, um commit ou uma tag anotada que aponte para um commit).  Para garantir que o '$VAR` nomeie um objeto já existente de qualquer tipo, `git rev-parse \"$VAR^{object}\"` pode ser utilizado."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:119
 #, priority:100
 msgid "Only meaningful in `--verify` mode. Do not output an error message if the first argument is not a valid object name; instead exit with non-zero status silently.  SHA-1s for valid object names are printed to stdout on success."
-msgstr ""
-"Apenas faz sentido no modo `--verify`. Não produza uma mensagem de erro caso "
-"o primeiro argumento não for um nome válido do objeto; em vez disso, encerre "
-"com uma condição diferente de zero silenciosamente.  O SHA-1 para os objetos "
-"com nomes válidos que são impressos com êxito no stdout."
+msgstr "Apenas faz sentido no modo `--verify`. Não produza uma mensagem de erro caso o primeiro argumento não for um nome válido do objeto; em vez disso, encerre com uma condição diferente de zero silenciosamente.  O SHA-1 para os objetos com nomes válidos que são impressos com êxito no stdout."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:120
@@ -52883,13 +46217,7 @@ msgstr "--sq"
 #: en/git-rev-parse.txt:128
 #, priority:100
 msgid "Usually the output is made one line per flag and parameter.  This option makes output a single line, properly quoted for consumption by shell.  Useful when you expect your parameter to contain whitespaces and newlines (e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the `--sq-quote` option, the command input is still interpreted as usual."
-msgstr ""
-"Normalmente, a saída é feita uma linha por opção e parâmetro.  Esta opção "
-"gera a saída em uma única linha, devidamente citada para utilização do "
-"shell.  Útil quando você espera que o seu parâmetro contenha espaços e novas "
-"linhas (como, por exemplo, ao utilizar a picareta `S` com 'git "
-"diff-{asterisk}'). Ao contrário da opção `--sq-quote`, a entrada do comando "
-"ainda é interpretada como de costume."
+msgstr "Normalmente, a saída é feita uma linha por opção e parâmetro.  Esta opção gera a saída em uma única linha, devidamente citada para utilização do shell.  Útil quando você espera que o seu parâmetro contenha espaços e novas linhas (como, por exemplo, ao utilizar a picareta `S` com 'git diff-{asterisk}'). Ao contrário da opção `--sq-quote`, a entrada do comando ainda é interpretada como de costume."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:129
@@ -52901,19 +46229,13 @@ msgstr "--short[=comprimento]"
 #: en/git-rev-parse.txt:134
 #, priority:100
 msgid "Same as `--verify` but shortens the object name to a unique prefix with at least `length` characters. The minimum length is 4, the default is the effective value of the `core.abbrev` configuration variable (see linkgit:git-config[1])."
-msgstr ""
-"O mesmo que `--verify` porém encurta o nome do objeto para um prefixo único "
-"com pelo menos um`comprimento` determinado de caracteres. A quantidade "
-"mínima é de 4 caracteres, o valor é predefinido na variável de configuração "
-"`core.abbrev` (consulte linkgit:git-config[1])."
+msgstr "O mesmo que `--verify` porém encurta o nome do objeto para um prefixo único com pelo menos um`comprimento` determinado de caracteres. A quantidade mínima é de 4 caracteres, o valor é predefinido na variável de configuração `core.abbrev` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:139
 #, priority:100
 msgid "When showing object names, prefix them with '{caret}' and strip '{caret}' prefix from the object names that already have one."
-msgstr ""
-"Ao exibir os nomes dos objetos, prefixe-os com '{caret}' e retire o prefixo "
-"'{caret}' dos nomes dos objetos que já possuam um."
+msgstr "Ao exibir os nomes dos objetos, prefixe-os com '{caret}' e retire o prefixo '{caret}' dos nomes dos objetos que já possuam um."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:140
@@ -52937,10 +46259,7 @@ msgstr "--symbolic"
 #: en/git-rev-parse.txt:149
 #, priority:100
 msgid "Usually the object names are output in SHA-1 form (with possible '{caret}' prefix); this option makes them output in a form as close to the original input as possible."
-msgstr ""
-"Normalmente, os nomes dos objetos são emitidos em formato SHA-1 (com "
-"possível prefixo '{caret}'); essa opção faz com que eles sejam impressos o "
-"mais próximo possíveis da entrada original."
+msgstr "Normalmente, os nomes dos objetos são emitidos em formato SHA-1 (com possível prefixo '{caret}'); essa opção faz com que eles sejam impressos o mais próximo possíveis da entrada original."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:150
@@ -52952,12 +46271,7 @@ msgstr "--symbolic-full-name"
 #: en/git-rev-parse.txt:157
 #, priority:100
 msgid "This is similar to --symbolic, but it omits input that are not refs (i.e. branch or tag names; or more explicitly disambiguating \"heads/master\" form, when you want to name the \"master\" branch when there is an unfortunately named tag \"master\"), and show them as full refnames (e.g. \"refs/heads/master\")."
-msgstr ""
-"É semelhante ao `--symbolic`, porém omite a entrada que não seja uma refs ("
-"como, por exemplo, os nomes dos ramos ou tags; ou de uma forma "
-"explicitamente desambiguante \"heads/master\", quando você quer nomear a o "
-"ramo \"master\" quando houver uma tag com o nome \"master\") e mostre-os "
-"como \"refnames\" completos (como, por exemplo, \"refs/heads/master\")."
+msgstr "É semelhante ao `--symbolic`, porém omite a entrada que não seja uma refs (como, por exemplo, os nomes dos ramos ou tags; ou de uma forma explicitamente desambiguante \"heads/master\", quando você quer nomear a o ramo \"master\" quando houver uma tag com o nome \"master\") e mostre-os como \"refnames\" completos (como, por exemplo, \"refs/heads/master\")."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:159
@@ -52993,20 +46307,13 @@ msgstr "--remotes[=padrão]"
 #: en/git-rev-parse.txt:170
 #, priority:100
 msgid "Show all branches, tags, or remote-tracking branches, respectively (i.e., refs found in `refs/heads`, `refs/tags`, or `refs/remotes`, respectively)."
-msgstr ""
-"Exibe todos as ramificações, tags ou ramificações monitoradas remotamente, "
-"respectivamente (ou seja, as refs encontradas respectivamente em `refs/heads`"
-", `refs/tags` ou `refs/remotes`)."
+msgstr "Exibe todos as ramificações, tags ou ramificações monitoradas remotamente, respectivamente (ou seja, as refs encontradas respectivamente em `refs/heads`, `refs/tags` ou `refs/remotes`)."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:174
 #, priority:100
 msgid "If a `pattern` is given, only refs matching the given shell glob are shown.  If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
-msgstr ""
-"Caso um `padrão` seja informado, apenas as refs coincidentes com o \"shell "
-"glob\" são exibidos.  Caso o padrão não contenha um caractere curinga (`?`, "
-"`*` ou `[`), este será transformado em um prefixo correspondente ao "
-"acrescentar `/*`."
+msgstr "Caso um `padrão` seja informado, apenas as refs coincidentes com o \"shell glob\" são exibidos.  Caso o padrão não contenha um caractere curinga (`?`, `*` ou `[`), este será transformado em um prefixo correspondente ao acrescentar `/*`."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:175
@@ -53018,11 +46325,7 @@ msgstr "--glob=pattern"
 #: en/git-rev-parse.txt:181
 #, priority:100
 msgid "Show all refs matching the shell glob pattern `pattern`. If the pattern does not start with `refs/`, this is automatically prepended.  If the pattern does not contain a globbing character (`?`, `*`, or `[`), it is turned into a prefix match by appending `/*`."
-msgstr ""
-"Exiba todos os árbitros que coincidam com o `padrão` (pattern) do \"glob\". "
-"Caso o padrão não comece com `refs /`, isto será anexado automaticamente.  "
-"Caso o padrão não contenha um caractere curinga (`?`, `*` ou `[`), este será "
-"transformado em um prefixo correspondente ao acrescentar `/*`."
+msgstr "Exiba todos os árbitros que coincidam com o `padrão` (pattern) do \"glob\". Caso o padrão não comece com `refs /`, isto será anexado automaticamente.  Caso o padrão não contenha um caractere curinga (`?`, `*` ou `[`), este será transformado em um prefixo correspondente ao acrescentar `/*`."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:182 en/rev-list-options.txt:166
@@ -53034,23 +46337,13 @@ msgstr "--exclude=<glob-pattern>"
 #: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
 #, priority:260
 msgid "Do not include refs matching '<glob-pattern>' that the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. Repetitions of this option accumulate exclusion patterns up to the next `--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options or arguments do not clear accumulated patterns)."
-msgstr ""
-"Não inclua as refs que coincidam com `<glob-pattern>` em que as próximas "
-"opções `--all`, `--branches`, `--tags`, `--remotes` ou `--glob` "
-"considerariam de outra forma. As repetições destas opções acumulam padrões "
-"de exclusão até a próxima opção `--all`, `--branches`, `--tags`, `--remotes` "
-"ou `--glob` (outras opções ou argumentos não limpam os padrões acumulados)."
+msgstr "Não inclua as refs que coincidam com `<glob-pattern>` em que as próximas opções `--all`, `--branches`, `--tags`, `--remotes` ou `--glob` considerariam de outra forma. As repetições destas opções acumulam padrões de exclusão até a próxima opção `--all`, `--branches`, `--tags`, `--remotes` ou `--glob` (outras opções ou argumentos não limpam os padrões acumulados)."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:195 en/rev-list-options.txt:180
 #, priority:260
 msgid "The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, respectively, and they must begin with `refs/` when applied to `--glob` or `--all`. If a trailing '/{asterisk}' is intended, it must be given explicitly."
-msgstr ""
-"Os padrões informados não devem começar com `refs/heads`, `refs/tags`, ou `"
-"refs/remotes` quando aplicadas as opções `--branches`, `--tags`, ou "
-"`--remotes` respectivamente, e devem começar com `refs/` quando for aplicado "
-"ao `--glob` ou `--all`. Se a intenção for um delimitador '/{asterisco}', "
-"este deve ser utilizado de forma explicita."
+msgstr "Os padrões informados não devem começar com `refs/heads`, `refs/tags`, ou `refs/remotes` quando aplicadas as opções `--branches`, `--tags`, ou `--remotes` respectivamente, e devem começar com `refs/` quando for aplicado ao `--glob` ou `--all`. Se a intenção for um delimitador '/{asterisco}', este deve ser utilizado de forma explicita."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:196
@@ -53062,10 +46355,7 @@ msgstr "--disambiguate=<prefixo>"
 #: en/git-rev-parse.txt:201
 #, priority:100
 msgid "Show every object whose name begins with the given prefix.  The <prefix> must be at least 4 hexadecimal digits long to avoid listing each and every object in the repository by mistake."
-msgstr ""
-"Exiba todos os objetos cujo nome começa com o prefixo informado.  O "
-"`<prefixo>` deve ter pelo menos 4 dígitos hexadecimais para evitar ter que "
-"listar por engano todos os objetos no repositório."
+msgstr "Exiba todos os objetos cujo nome começa com o prefixo informado.  O `<prefixo>` deve ter pelo menos 4 dígitos hexadecimais para evitar ter que listar por engano todos os objetos no repositório."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:203
@@ -53083,11 +46373,7 @@ msgstr "--local-env-vars"
 #: en/git-rev-parse.txt:210
 #, priority:100
 msgid "List the GIT_* environment variables that are local to the repository (e.g. GIT_DIR or GIT_WORK_TREE, but not GIT_EDITOR).  Only the names of the variables are listed, not their value, even if they are set."
-msgstr ""
-"Liste as variável de ambiente do GIT_* que são locais no repositório "
-"(`GIT_DIR` ou `GIT_WORK_TREE`, mas não o `GIT_EDITOR` por exemplo).  Somente "
-"os nomes das variáveis são listadas, não o seu valor, mesmo que estejam "
-"definidos."
+msgstr "Liste as variável de ambiente do GIT_* que são locais no repositório (`GIT_DIR` ou `GIT_WORK_TREE`, mas não o `GIT_EDITOR` por exemplo).  Somente os nomes das variáveis são listadas, não o seu valor, mesmo que estejam definidos."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:211
@@ -53099,19 +46385,13 @@ msgstr "--git-dir"
 #: en/git-rev-parse.txt:215
 #, priority:100
 msgid "Show `$GIT_DIR` if defined. Otherwise show the path to the .git directory. The path shown, when relative, is relative to the current working directory."
-msgstr ""
-"Exibe o `$GIT_DIR` caso seja definido. Caso contrário, exibe o caminho para "
-"o diretório .git. O caminho exibido, quando relativo, é relativo ao "
-"diretório de trabalho atual."
+msgstr "Exibe o `$GIT_DIR` caso seja definido. Caso contrário, exibe o caminho para o diretório .git. O caminho exibido, quando relativo, é relativo ao diretório de trabalho atual."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:219
 #, priority:100
 msgid "If `$GIT_DIR` is not defined and the current directory is not detected to lie in a Git repository or work tree print a message to stderr and exit with nonzero status."
-msgstr ""
-"Caso o `$GIT_DIR` não esteja definido e o diretório atual não for detectado "
-"como estando em um repositório Git ou na árvore de trabalho, imprima uma "
-"mensagem para stderr e encere com uma condição diferente de zero."
+msgstr "Caso o `$GIT_DIR` não esteja definido e o diretório atual não for detectado como estando em um repositório Git ou na árvore de trabalho, imprima uma mensagem para stderr e encere com uma condição diferente de zero."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:220
@@ -53123,8 +46403,7 @@ msgstr "--absolute-git-dir"
 #: en/git-rev-parse.txt:223
 #, priority:100
 msgid "Like `--git-dir`, but its output is always the canonicalized absolute path."
-msgstr ""
-"Como `--git-dir`, porém sua saída é sempre o caminho absoluto canonizado."
+msgstr "Como `--git-dir`, porém sua saída é sempre o caminho absoluto canonizado."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:224
@@ -53148,9 +46427,7 @@ msgstr "--is-inside-git-dir"
 #: en/git-rev-parse.txt:230
 #, priority:100
 msgid "When the current working directory is below the repository directory print \"true\", otherwise \"false\"."
-msgstr ""
-"Quando o diretório de trabalho atual estiver abaixo do diretório do "
-"repositório, imprima 'true', caso contrário, 'false'."
+msgstr "Quando o diretório de trabalho atual estiver abaixo do diretório do repositório, imprima 'true', caso contrário, 'false'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:231
@@ -53162,9 +46439,7 @@ msgstr "--is-inside-work-tree"
 #: en/git-rev-parse.txt:234
 #, priority:100
 msgid "When the current working directory is inside the work tree of the repository print \"true\", otherwise \"false\"."
-msgstr ""
-"Quando o diretório de trabalho atual estiver dentro da árvore de trabalho do "
-"repositório, imprima 'true', caso contrário, 'false'."
+msgstr "Quando o diretório de trabalho atual estiver dentro da árvore de trabalho do repositório, imprima 'true', caso contrário, 'false'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:235
@@ -53176,8 +46451,7 @@ msgstr "--is-bare-repository"
 #: en/git-rev-parse.txt:237
 #, priority:100
 msgid "When the repository is bare print \"true\", otherwise \"false\"."
-msgstr ""
-"Quando o repositório for simples imprima 'true', caso contrário 'false'."
+msgstr "Quando o repositório for simples imprima 'true', caso contrário 'false'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:238
@@ -53201,11 +46475,7 @@ msgstr "--resolve-git-dir <caminho>"
 #: en/git-rev-parse.txt:246
 #, priority:100
 msgid "Check if <path> is a valid repository or a gitfile that points at a valid repository, and print the location of the repository.  If <path> is a gitfile then the resolved path to the real repository is printed."
-msgstr ""
-"Verifique se o <caminho> é um repositório válido ou um 'gitfile' que aponte "
-"para um repositório válido e imprima o local do repositório.  Caso o "
-"<caminho> seja um gitfile, o caminho resolvido para o repositório real será "
-"impresso."
+msgstr "Verifique se o <caminho> é um repositório válido ou um 'gitfile' que aponte para um repositório válido e imprima o local do repositório.  Caso o <caminho> seja um gitfile, o caminho resolvido para o repositório real será impresso."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:247
@@ -53217,12 +46487,7 @@ msgstr "--git-path <caminho>"
 #: en/git-rev-parse.txt:253
 #, ignore-ellipsis, priority:100
 msgid "Resolve \"$GIT_DIR/<path>\" and takes other path relocation variables such as $GIT_OBJECT_DIRECTORY, $GIT_INDEX_FILE... into account. For example, if $GIT_OBJECT_DIRECTORY is set to /foo/bar then \"git rev-parse --git-path objects/abc\" returns /foo/bar/abc."
-msgstr ""
-"Resolva \"$GIT_DIR/<caminho>\" e leve em consideração as outras variáveis de "
-"realocação do caminho, como `$GIT_OBJECT_DIRECTORY`, `$GIT_INDEX_FILE`, etc. "
-"Caso `$GIT_OBJECT_DIRECTORY` seja definido para '/foo/bar' por exemplo, "
-"então o comando \"git rev-parse --git-path objects/abc\" returna '/foo/bar/"
-"abc'."
+msgstr "Resolva \"$GIT_DIR/<caminho>\" e leve em consideração as outras variáveis de realocação do caminho, como `$GIT_OBJECT_DIRECTORY`, `$GIT_INDEX_FILE`, etc. Caso `$GIT_OBJECT_DIRECTORY` seja definido para '/foo/bar' por exemplo, então o comando \"git rev-parse --git-path objects/abc\" returna '/foo/bar/abc'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:254
@@ -53234,10 +46499,7 @@ msgstr "--show-cdup"
 #: en/git-rev-parse.txt:258
 #, priority:100
 msgid "When the command is invoked from a subdirectory, show the path of the top-level directory relative to the current directory (typically a sequence of \"../\", or an empty string)."
-msgstr ""
-"Quando o comando é chamado a partir de um subdiretório, exiba o caminho do "
-"diretório do nível mais alto em relação ao diretório atual (geralmente uma "
-"sequência de \"../\" ou uma sequência vazia)."
+msgstr "Quando o comando é chamado a partir de um subdiretório, exiba o caminho do diretório do nível mais alto em relação ao diretório atual (geralmente uma sequência de \"../\" ou uma sequência vazia)."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:259
@@ -53249,9 +46511,7 @@ msgstr "--show-prefix"
 #: en/git-rev-parse.txt:263
 #, priority:100
 msgid "When the command is invoked from a subdirectory, show the path of the current directory relative to the top-level directory."
-msgstr ""
-"Quando o comando é invocado a partir de um subdiretório, exiba o caminho do "
-"diretório atual em relação ao nível mais alto do diretório."
+msgstr "Quando o comando é invocado a partir de um subdiretório, exiba o caminho do diretório atual em relação ao nível mais alto do diretório."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:264
@@ -53263,9 +46523,7 @@ msgstr "--show-toplevel"
 #: en/git-rev-parse.txt:267
 #, priority:100
 msgid "Show the absolute path of the top-level directory of the working tree. If there is no working tree, report an error."
-msgstr ""
-"Exibe o caminho absoluto do diretório no nível mais da árvore de trabalho. "
-"Caso não haja uma árvore em funcionamento, relate um erro."
+msgstr "Exibe o caminho absoluto do diretório no nível mais da árvore de trabalho. Caso não haja uma árvore em funcionamento, relate um erro."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:268
@@ -53277,11 +46535,7 @@ msgstr "--show-superproject-working-tree"
 #: en/git-rev-parse.txt:273
 #, priority:100
 msgid "Show the absolute path of the root of the superproject's working tree (if exists) that uses the current repository as its submodule.  Outputs nothing if the current repository is not used as a submodule by any project."
-msgstr ""
-"Exibe o caminho absoluto da raiz da árvore de trabalho do superprojeto (caso "
-"exista) que usa o repositório atual como sendo o seu submódulo.  Não produz "
-"nada caso o repositório atual não eja usado como um submódulo por nenhum "
-"projeto."
+msgstr "Exibe o caminho absoluto da raiz da árvore de trabalho do superprojeto (caso exista) que usa o repositório atual como sendo o seu submódulo.  Não produz nada caso o repositório atual não eja usado como um submódulo por nenhum projeto."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:274
@@ -53293,9 +46547,7 @@ msgstr "--shared-index-path"
 #: en/git-rev-parse.txt:277
 #, priority:100
 msgid "Show the path to the shared index file in split index mode, or empty if not in split-index mode."
-msgstr ""
-"Exibe o caminho para o arquivo do índice compartilhado no modo de índice "
-"dividido ou vazio caso não esteja no modo do índice dividido."
+msgstr "Exibe o caminho para o arquivo do índice compartilhado no modo de índice dividido ou vazio caso não esteja no modo do índice dividido."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:278
@@ -53307,11 +46559,7 @@ msgstr "--show-object-format[=(storage|input|output)]"
 #: en/git-rev-parse.txt:283
 #, priority:100
 msgid "Show the object format (hash algorithm) used for the repository for storage inside the `.git` directory, input, or output. For input, multiple algorithms may be printed, space-separated.  If not specified, the default is \"storage\"."
-msgstr ""
-"Exiba o formato do objeto (algoritmo hash) usado no repositório para o "
-"armazenamento dentro do diretório `.git`, entrada ou saída. Para a entrada, "
-"vários algoritmos podem ser impressos, separados por espaço.  Caso não seja "
-"definido, a predefinição retorna para \"storage\"."
+msgstr "Exiba o formato do objeto (algoritmo hash) usado no repositório para o armazenamento dentro do diretório `.git`, entrada ou saída. Para a entrada, vários algoritmos podem ser impressos, separados por espaço.  Caso não seja definido, a predefinição retorna para \"storage\"."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:286
@@ -53335,9 +46583,7 @@ msgstr "--after=datestring"
 #: en/git-rev-parse.txt:292
 #, priority:100
 msgid "Parse the date string, and output the corresponding --max-age= parameter for 'git rev-list'."
-msgstr ""
-"Analise a cadeia de caracteres da data e exiba o parâmetro --max-age= "
-"correspondente para 'git rev-list'."
+msgstr "Analise a cadeia de caracteres da data e exiba o parâmetro --max-age= correspondente para 'git rev-list'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:293
@@ -53355,9 +46601,7 @@ msgstr "--before=datestring"
 #: en/git-rev-parse.txt:297
 #, priority:100
 msgid "Parse the date string, and output the corresponding --min-age= parameter for 'git rev-list'."
-msgstr ""
-"Analise a cadeia de caracteres da data e exiba o parâmetro `--max-age=` que "
-"corresponda para o 'git rev-list'."
+msgstr "Analise a cadeia de caracteres da data e exiba o parâmetro `--max-age=` que corresponda para o 'git rev-list'."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:298
@@ -53381,29 +46625,19 @@ msgstr "PARSEOPT"
 #: en/git-rev-parse.txt:310
 #, priority:100
 msgid "In `--parseopt` mode, 'git rev-parse' helps massaging options to bring to shell scripts the same facilities C builtins have. It works as an option normalizer (e.g. splits single switches aggregate values), a bit like `getopt(1)` does."
-msgstr ""
-"No modo `--parseopt`, o comando 'git rev-parse' ajuda no processamento das "
-"opções trazendo aos scripts shell as mesmas facilidades integradas que o 'C' "
-"possuí. Funciona como um normalizador das opções (como por exemplo, divide "
-"trocas únicas com valores agregados), quase como o que o `getopt(1)` faz."
+msgstr "No modo `--parseopt`, o comando 'git rev-parse' ajuda no processamento das opções trazendo aos scripts shell as mesmas facilidades integradas que o 'C' possuí. Funciona como um normalizador das opções (como por exemplo, divide trocas únicas com valores agregados), quase como o que o `getopt(1)` faz."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:315
 #, priority:100
 msgid "It takes on the standard input the specification of the options to parse and understand, and echoes on the standard output a string suitable for `sh(1)` `eval` to replace the arguments with normalized ones.  In case of error, it outputs usage on the standard error stream, and exits with code 129."
-msgstr ""
-"Ele assume na entrada padrão a definição das opções para analisar e "
-"entender, e ecoa na saída uma sequência adequada para o `sh(1)` `eval` para "
-"substituir os argumentos por argumentos normalizados.  Em caso de erro, ele "
-"gera a utilização do fluxo de erros predefinidos e encerra com o código 129."
+msgstr "Ele assume na entrada padrão a definição das opções para analisar e entender, e ecoa na saída uma sequência adequada para o `sh(1)` `eval` para substituir os argumentos por argumentos normalizados.  Em caso de erro, ele gera a utilização do fluxo de erros predefinidos e encerra com o código 129."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:318
 #, priority:100
 msgid "Note: Make sure you quote the result when passing it to `eval`.  See below for an example."
-msgstr ""
-"Observação: Certifique-se de citar o resultado ao encaminhá-lo para o `eval`"
-".  Consulte um exemplo abaixo."
+msgstr "Observação: Certifique-se de citar o resultado ao encaminhá-lo para o `eval`.  Consulte um exemplo abaixo."
 
 #. type: Title ~
 #: en/git-rev-parse.txt:320
@@ -53415,11 +46649,7 @@ msgstr "Formato de Entrada"
 #: en/git-rev-parse.txt:326
 #, priority:100
 msgid "'git rev-parse --parseopt' input format is fully text based. It has two parts, separated by a line that contains only `--`. The lines before the separator (should be one or more) are used for the usage.  The lines after the separator describe the options."
-msgstr ""
-"O formato da entrada do comando 'git rev-parse --parseopt' é texto puro. "
-"Possui duas partes, separadas por uma linha que contém apenas `--`. As "
-"linhas antes do separador (devem ser uma ou mais) são utilizadas para o "
-"uso.  As linhas após o separador definem as opções."
+msgstr "O formato da entrada do comando 'git rev-parse --parseopt' é texto puro. Possui duas partes, separadas por uma linha que contém apenas `--`. As linhas antes do separador (devem ser uma ou mais) são utilizadas para o uso.  As linhas após o separador definem as opções."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:328
@@ -53443,11 +46673,7 @@ msgstr "`<opt-spec>`"
 #: en/git-rev-parse.txt:338
 #, priority:100
 msgid "its format is the short option character, then the long option name separated by a comma. Both parts are not required, though at least one is necessary. May not contain any of the `<flags>` characters.  `h,help`, `dry-run` and `f` are examples of correct `<opt-spec>`."
-msgstr ""
-"o seu formato é o caractere curto da opção e, em seguida, o nome da opção "
-"longa, separado por vírgula. Ambas as partes não são necessárias, embora "
-"pelo menos uma seja necessária. Não pode conter nenhum dos caracteres "
-"`<flags>`.  `h,help`, `dry-run` e `f` são exemplos corretos do `<opt-spec>`."
+msgstr "o seu formato é o caractere curto da opção e, em seguida, o nome da opção longa, separado por vírgula. Ambas as partes não são necessárias, embora pelo menos uma seja necessária. Não pode conter nenhum dos caracteres `<flags>`.  `h,help`, `dry-run` e `f` são exemplos corretos do `<opt-spec>`."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:339
@@ -53471,27 +46697,19 @@ msgstr "Utilize `=` caso a opção receba um argumento."
 #: en/git-rev-parse.txt:346
 #, priority:100
 msgid "Use `?` to mean that the option takes an optional argument. You probably want to use the `--stuck-long` mode to be able to unambiguously parse the optional argument."
-msgstr ""
-"Utilize `?` para dar sentido que a opção aceita um argumento opcional. Você "
-"provavelmente quer utilzar o modo `--stuck-long` para poder analisar de "
-"forma inequívoca o argumento opcional."
+msgstr "Utilize `?` para dar sentido que a opção aceita um argumento opcional. Você provavelmente quer utilzar o modo `--stuck-long` para poder analisar de forma inequívoca o argumento opcional."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:350
 #, priority:100
 msgid "Use `*` to mean that this option should not be listed in the usage generated for the `-h` argument. It's shown for `--help-all` as documented in linkgit:gitcli[7]."
-msgstr ""
-"Utilize `*` para indicar que esta opção não deve ser listada no uso gerado "
-"para a opção `-h`. É exibido para `--help-all` conforme documentado em "
-"linkgit:gitcli[7]."
+msgstr "Utilize `*` para indicar que esta opção não deve ser listada no uso gerado para a opção `-h`. É exibido para `--help-all` conforme documentado em linkgit:gitcli[7]."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:352
 #, priority:100
 msgid "Use `!` to not make the corresponding negated long option available."
-msgstr ""
-"Utilize `!` para não fazer com que a opção longa que foi negada esteja "
-"disponível."
+msgstr "Utilize `!` para não fazer com que a opção longa que foi negada esteja disponível."
 
 #. type: Labeled list
 #: en/git-rev-parse.txt:353
@@ -53503,28 +46721,19 @@ msgstr "`<arg-hint>`"
 #: en/git-rev-parse.txt:358
 #, priority:100
 msgid "`<arg-hint>`, if specified, is used as a name of the argument in the help output, for options that take arguments. `<arg-hint>` is terminated by the first whitespace.  It is customary to use a dash to separate words in a multi-word argument hint."
-msgstr ""
-"Caso `<arg-hint>` seja definido, é usado como um nome do argumento na saída "
-"da ajuda, para as opções que aceitem os argumentos. O `<arg-hint>` é "
-"finalizado através do primeiro espaço.  É habitual utilizar um traço para "
-"separar as palavras em uma dica de um argumento com várias palavras."
+msgstr "Caso `<arg-hint>` seja definido, é usado como um nome do argumento na saída da ajuda, para as opções que aceitem os argumentos. O `<arg-hint>` é finalizado através do primeiro espaço.  É habitual utilizar um traço para separar as palavras em uma dica de um argumento com várias palavras."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:361
 #, priority:100
 msgid "The remainder of the line, after stripping the spaces, is used as the help associated to the option."
-msgstr ""
-"O restante da linha, depois dos espaços removidos, é usado como ajuda "
-"associada à opção."
+msgstr "O restante da linha, depois dos espaços removidos, é usado como ajuda associada à opção."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:365
 #, priority:100
 msgid "Blank lines are ignored, and lines that don't match this specification are used as option group headers (start the line with a space to create such lines on purpose)."
-msgstr ""
-"As linhas em branco são ignoradas e as linhas que não coincidam com esta "
-"especificação são utilizadas como cabeçalhos dos grupos das opções (inicie a "
-"linha com um espaço para criar essas linhas de propósito)."
+msgstr "As linhas em branco são ignoradas e as linhas que não coincidam com esta especificação são utilizadas como cabeçalhos dos grupos das opções (inicie a linha com um espaço para criar essas linhas de propósito)."
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:372
@@ -53564,8 +46773,7 @@ msgstr ""
 "foo       alguma opção bonita --foo\n"
 "bar=      alguma opção bacana --bar com um argumento\n"
 "baz=arg   outra opção bacana --baz com um argumento definido\n"
-"qux?path  qux talvez tenha um caminho como argumento porém significa ele "
-"mesmo\n"
+"qux?path  qux talvez tenha um caminho como argumento porém significa ele mesmo\n"
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:384
@@ -53581,9 +46789,7 @@ msgstr ""
 #: en/git-rev-parse.txt:386
 #, no-wrap, priority:100
 msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
-msgstr ""
-"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
-"exit $?)\"\n"
+msgstr "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
 
 #. type: Title ~
 #: en/git-rev-parse.txt:390
@@ -53595,9 +46801,7 @@ msgstr "Texto de uso"
 #: en/git-rev-parse.txt:394
 #, priority:100
 msgid "When `\"$@\"` is `-h` or `--help` in the above example, the following usage text would be shown:"
-msgstr ""
-"Quando `\"$@\"` is `-h` ou `--help` no exemplo acima, o seguinte texto de "
-"utilização será exibido:"
+msgstr "Quando `\"$@\"` is `-h` ou `--help` no exemplo acima, o seguinte texto de utilização será exibido:"
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:397
@@ -53624,10 +46828,8 @@ msgstr ""
 "    -h, --help            exibe a ajuda\n"
 "    --foo                 alguma opção bacana --foo\n"
 "    --bar ...             alguma opção legal --bar com um argumento\n"
-"    --baz <arg>           outra opção legal --baz com um determinado "
-"argumento\n"
-"    --qux[=<caminho>]     o qux pode utilizar um argumento para o caminho "
-"mas significa ele mesmo\n"
+"    --baz <arg>           outra opção legal --baz com um determinado argumento\n"
+"    --qux[=<caminho>]     o qux pode utilizar um argumento para o caminho mas significa ele mesmo\n"
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:408
@@ -53649,20 +46851,13 @@ msgstr "SQ-QUOTE"
 #: en/git-rev-parse.txt:417
 #, priority:100
 msgid "In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single line suitable for `sh(1)` `eval`. This line is made by normalizing the arguments following `--sq-quote`. Nothing other than quoting the arguments is done."
-msgstr ""
-"No modo `--sq-quote`, o comando 'git rev-parse' ecoa na saída padrão uma "
-"única linha adequada para `sh (1)` `eval`. Esta linha é feita normalizando "
-"os argumentos após a opção `--sq-quote`. Nada mais é feito além de citar os "
-"argumentos."
+msgstr "No modo `--sq-quote`, o comando 'git rev-parse' ecoa na saída padrão uma única linha adequada para `sh (1)` `eval`. Esta linha é feita normalizando os argumentos após a opção `--sq-quote`. Nada mais é feito além de citar os argumentos."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:421
 #, priority:100
 msgid "If you want command input to still be interpreted as usual by 'git rev-parse' before the output is shell quoted, see the `--sq` option."
-msgstr ""
-"Caso queira que o comando de entrada ainda seja interpretada como de costume "
-"pelo comando `git rev-parse` antes da saída ser citada pela shell, consulte "
-"a opção `--sq`."
+msgstr "Caso queira que o comando de entrada ainda seja interpretada como de costume pelo comando `git rev-parse` antes da saída ser citada pela shell, consulte a opção `--sq`."
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:433
@@ -53678,8 +46873,7 @@ msgid ""
 msgstr ""
 "$ cat >your-git-script.sh <<\\EOF\n"
 "#!/bin/sh\n"
-"args=$(git rev-parse --sq-quote \"$@\")   # cita os argumentos utilizados "
-"pelo usuário\n"
+"args=$(git rev-parse --sq-quote \"$@\")   # cita os argumentos utilizados pelo usuário\n"
 "command=\"git frotz -n24 $args\"          # e utilize-o dentro de uma\n"
 "\t\t\t\t\t# linha de comando artesanal\n"
 "eval \"$command\"\n"
@@ -53707,9 +46901,7 @@ msgstr "$ git rev-parse --verify HEAD\n"
 #: en/git-rev-parse.txt:447
 #, priority:100
 msgid "Print the commit object name from the revision in the $REV shell variable:"
-msgstr ""
-"Imprima o nome do objeto do commit a partir da revisão na variável shell "
-"'$REV':"
+msgstr "Imprima o nome do objeto do commit a partir da revisão na variável shell '$REV':"
 
 #. type: delimited block -
 #: en/git-rev-parse.txt:450
@@ -53721,8 +46913,7 @@ msgstr "$ git rev-parse --verify $REV^{commit}\n"
 #: en/git-rev-parse.txt:453
 #, priority:100
 msgid "This will error out if $REV is empty or not a valid revision."
-msgstr ""
-"Isso causará um erro caso '$REV' esteja vazio ou não seja uma revisão válida."
+msgstr "Isso causará um erro caso '$REV' esteja vazio ou não seja uma revisão válida."
 
 #. type: Plain text
 #: en/git-rev-parse.txt:455
@@ -53740,9 +46931,7 @@ msgstr "$ git rev-parse --default master --verify $REV\n"
 #: en/git-rev-parse.txt:461
 #, priority:100
 msgid "but if $REV is empty, the commit object name from master will be printed."
-msgstr ""
-"porém caso '$REV' esteja vazia, o nome do objeto do commit vindo do \"master"
-"\" será impresso."
+msgstr "porém caso '$REV' esteja vazia, o nome do objeto do commit vindo do \"master\" será impresso."
 
 #. type: Title =
 #: en/git-rm.txt:2
@@ -53808,9 +46997,7 @@ msgstr "Na verdade, não remova nenhum arquivo.  Em vez disso, exiba apenas se e
 #: en/git-rm.txt:59
 #, priority:280
 msgid "Allow recursive removal when a leading directory name is given."
-msgstr ""
-"Permita a remoção recursiva quando um nome do diretório principal for "
-"informado."
+msgstr "Permita a remoção recursiva quando um nome do diretório principal for informado."
 
 #. type: Plain text
 #: en/git-rm.txt:69
@@ -53942,11 +47129,7 @@ msgstr "Um submódulo é considerado atualizado quando `HEAD` for o mesmo que o
 #: en/git-rm.txt:165
 #, priority:280
 msgid "If you only want to remove the local checkout of a submodule from your work tree without committing the removal, use linkgit:git-submodule[1] `deinit` instead. Also see linkgit:gitsubmodules[7] for details on submodule removal."
-msgstr ""
-"Caso queira remover apenas a averiguação local de um submódulo vindo da sua "
-"árvore de trabalho sem fazer o commit de remoção, em vez disso utilize o "
-"linkgit:git-submodule[1] `deinit`. Para obter mais detalhes sobre a remoção "
-"do submódulo, veja também linkgit:gitsubmodules[7]."
+msgstr "Caso queira remover apenas a averiguação local de um submódulo vindo da sua árvore de trabalho sem fazer o commit de remoção, em vez disso utilize o linkgit:git-submodule[1] `deinit`. Para obter mais detalhes sobre a remoção do submódulo, veja também linkgit:gitsubmodules[7]."
 
 #. type: Labeled list
 #: en/git-rm.txt:168
@@ -54010,22 +47193,13 @@ msgstr ""
 #: en/git-send-email.txt:23
 #, priority:100
 msgid "Takes the patches given on the command line and emails them out.  Patches can be specified as files, directories (which will send all files in the directory), or directly as a revision list.  In the last case, any format accepted by linkgit:git-format-patch[1] can be passed to git send-email."
-msgstr ""
-"Toma as correções informadas na linha de comando e as envia por e-mail.  Os "
-"patches podem ser utilizados como arquivos, diretórios (que enviarão todos "
-"os arquivos no diretório) ou diretamente como uma lista de revisão.  No "
-"último caso, qualquer formato aceito pelo linkgit:git-format-patch[1] pode "
-"ser passado para o git-send-email."
+msgstr "Toma as correções informadas na linha de comando e as envia por e-mail.  Os patches podem ser utilizados como arquivos, diretórios (que enviarão todos os arquivos no diretório) ou diretamente como uma lista de revisão.  No último caso, qualquer formato aceito pelo linkgit:git-format-patch[1] pode ser passado para o git-send-email."
 
 #. type: Plain text
 #: en/git-send-email.txt:27
 #, priority:100
 msgid "The header of the email is configurable via command-line options.  If not specified on the command line, the user will be prompted with a ReadLine enabled interface to provide the necessary information."
-msgstr ""
-"O cabeçalho do e-mail é configurável através das opções da linha de "
-"comando.  Se não utilizado na linha de comandos, o usuário será solicitado a "
-"informar uma interface ativada para o ReadLine que forneça as informações "
-"que forem necessárias."
+msgstr "O cabeçalho do e-mail é configurável através das opções da linha de comando.  Se não utilizado na linha de comandos, o usuário será solicitado a informar uma interface ativada para o ReadLine que forneça as informações que forem necessárias."
 
 #. type: Plain text
 #: en/git-send-email.txt:29
@@ -54043,25 +47217,19 @@ msgstr "arquivos no formato mbox"
 #: en/git-send-email.txt:34
 #, priority:100
 msgid "This is what linkgit:git-format-patch[1] generates.  Most headers and MIME formatting are ignored."
-msgstr ""
-"Isto é o que o linkgit:git-format-patch[1] gera.  Grande parte dos "
-"cabeçalhos e a formatação MIME são ignorados."
+msgstr "Isto é o que o linkgit:git-format-patch[1] gera.  Grande parte dos cabeçalhos e a formatação MIME são ignorados."
 
 #. type: Plain text
 #: en/git-send-email.txt:37
 #, priority:100
 msgid "The original format used by Greg Kroah-Hartman's 'send_lots_of_email.pl' script"
-msgstr ""
-"O formato original utilizado pelo script 'send_lots_of_email.pl' feito pelo "
-"Greg Kroah-Hartman's"
+msgstr "O formato original utilizado pelo script 'send_lots_of_email.pl' feito pelo Greg Kroah-Hartman's"
 
 #. type: Plain text
 #: en/git-send-email.txt:40
 #, priority:100
 msgid "This format expects the first line of the file to contain the \"Cc:\" value and the \"Subject:\" of the message as the second line."
-msgstr ""
-"Este formato espera que a primeira linha do arquivo tenha o valor \"Cc:\" e "
-"o \"Assunto:\" da mensagem como a segunda linha."
+msgstr "Este formato espera que a primeira linha do arquivo tenha o valor \"Cc:\" e o \"Assunto:\" da mensagem como a segunda linha."
 
 #. type: Title ~
 #: en/git-send-email.txt:46
@@ -54091,9 +47259,7 @@ msgstr "--bcc=<endereço>,..."
 #: en/git-send-email.txt:56
 #, priority:100
 msgid "Specify a \"Bcc:\" value for each email. Default is the value of `sendemail.bcc`."
-msgstr ""
-"Especifique um valor \"Cco:\" para cada e-mail. A predefinição é o valor do "
-"`sendemail.bcc`."
+msgstr "Especifique um valor \"Cco:\" para cada e-mail. A predefinição é o valor do `sendemail.bcc`."
 
 #. type: Plain text
 #: en/git-send-email.txt:58 en/git-send-email.txt:64 en/git-send-email.txt:126
@@ -54111,9 +47277,7 @@ msgstr "--cc=<endereço>,..."
 #: en/git-send-email.txt:62
 #, priority:100
 msgid "Specify a starting \"Cc:\" value for each email.  Default is the value of `sendemail.cc`."
-msgstr ""
-"Especifique um valor inicial \"Cc:\" para cada e-mail.  A predefinição é o "
-"valor do `sendemail.cc`."
+msgstr "Especifique um valor inicial \"Cc:\" para cada e-mail.  A predefinição é o valor do `sendemail.cc`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:65
@@ -54125,38 +47289,25 @@ msgstr "--compose"
 #: en/git-send-email.txt:68
 #, priority:100
 msgid "Invoke a text editor (see GIT_EDITOR in linkgit:git-var[1])  to edit an introductory message for the patch series."
-msgstr ""
-"Invoque um editor de texto (consulte `GIT_EDITOR` no linkgit:git-var[1]) "
-"para editar uma mensagem introdutória para a série de patches."
+msgstr "Invoque um editor de texto (consulte `GIT_EDITOR` no linkgit:git-var[1]) para editar uma mensagem introdutória para a série de patches."
 
 #. type: Plain text
 #: en/git-send-email.txt:74
 #, priority:100
 msgid "When `--compose` is used, git send-email will use the From, Subject, and In-Reply-To headers specified in the message. If the body of the message (what you type after the headers and a blank line) only contains blank (or Git: prefixed) lines, the summary won't be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed."
-msgstr ""
-"Quando a opção `--compose` é utilizada, o 'git send-email' utilizará os "
-"cabeçalhos `From` (De), `Subject` (Assunto), and `In-Reply-To` (Em resposta "
-"a) definidos na mensagem. Caso o corpo da mensagem (a parte onde você digita "
-"após os cabeçalhos e uma linha em branco) contenha apenas linhas em branco ("
-"ou Git: prefixadas), o resumo não será enviado, porém os cabeçalhos \"De\", "
-"\"Assunto\" e \"Em resposta a\" serão utilizados, a menos que sejam "
-"removidos."
+msgstr "Quando a opção `--compose` é utilizada, o 'git send-email' utilizará os cabeçalhos `From` (De), `Subject` (Assunto), and `In-Reply-To` (Em resposta a) definidos na mensagem. Caso o corpo da mensagem (a parte onde você digita após os cabeçalhos e uma linha em branco) contenha apenas linhas em branco (ou Git: prefixadas), o resumo não será enviado, porém os cabeçalhos \"De\", \"Assunto\" e \"Em resposta a\" serão utilizados, a menos que sejam removidos."
 
 #. type: Plain text
 #: en/git-send-email.txt:76
 #, priority:100
 msgid "Missing From or In-Reply-To headers will be prompted for."
-msgstr ""
-"Os cabeçalhos ausentes \"From\" ou \"In-Reply-To\" (em resposta a) serão "
-"solicitados."
+msgstr "Os cabeçalhos ausentes \"From\" ou \"In-Reply-To\" (em resposta a) serão solicitados."
 
 #. type: Plain text
 #: en/git-send-email.txt:78
 #, priority:100
 msgid "See the CONFIGURATION section for `sendemail.multiEdit`."
-msgstr ""
-"Consulte a seção CONFIGURAÇÃO para a opção de configuração `sendemail."
-"multiEdit`."
+msgstr "Consulte a seção CONFIGURAÇÃO para a opção de configuração `sendemail.multiEdit`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:79
@@ -54168,14 +47319,7 @@ msgstr "--from=<endereço>"
 #: en/git-send-email.txt:86
 #, priority:100
 msgid "Specify the sender of the emails.  If not specified on the command line, the value of the `sendemail.from` configuration option is used.  If neither the command-line option nor `sendemail.from` are set, then the user will be prompted for the value.  The default for the prompt will be the value of GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by \"git var -l\"."
-msgstr ""
-"Especifique o destinatário dos e-mails.  Caso não seja definido na linha de "
-"comando, o valor da opção de configuração `sendemail.from` é utilizado.  "
-"Caso nem a opção da linha de comando nem a opção de configuração `sendemail."
-"from` estejam definidos, então o usuário será avisado para informar o "
-"valor.  O valor predefinido para o prompt será o valor do `GIT_AUTHOR_IDENT` "
-"ou `GIT_COMMITTER_IDENT` caso isso não esteja definido, conforme retornado "
-"pelo `git var -l`."
+msgstr "Especifique o destinatário dos e-mails.  Caso não seja definido na linha de comando, o valor da opção de configuração `sendemail.from` é utilizado.  Caso nem a opção da linha de comando nem a opção de configuração `sendemail.from` estejam definidos, então o usuário será avisado para informar o valor.  O valor predefinido para o prompt será o valor do `GIT_AUTHOR_IDENT` ou `GIT_COMMITTER_IDENT` caso isso não esteja definido, conforme retornado pelo `git var -l`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:87
@@ -54187,10 +47331,7 @@ msgstr "--reply-to=<endereço>"
 #: en/git-send-email.txt:91
 #, priority:100
 msgid "Specify the address where replies from recipients should go to.  Use this if replies to messages should go to another address than what is specified with the --from parameter."
-msgstr ""
-"Define o endereço para onde as respostas dos destinatários devem ir.  Use "
-"isso se as respostas às mensagens forem para outro endereço além do "
-"especificado com o parâmetro `--from`."
+msgstr "Define o endereço para onde as respostas dos destinatários devem ir.  Use isso se as respostas às mensagens forem para outro endereço além do especificado com o parâmetro `--from`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:92
@@ -54202,22 +47343,13 @@ msgstr "--in-reply-to=<identificador>"
 #: en/git-send-email.txt:98
 #, priority:100
 msgid "Make the first mail (or all the mails with `--no-thread`) appear as a reply to the given Message-Id, which avoids breaking threads to provide a new patch series.  The second and subsequent emails will be sent as replies according to the `--[no-]chain-reply-to` setting."
-msgstr ""
-"Faça o primeiro e-mail (ou todos os e-mails com `--no-thread`) aparecer como "
-"uma resposta ao ID da mensagem informada, o que evita as quebras dos "
-"encadeamentos provendo uma nova série de patches.  O segundo e-mail e os "
-"seguintes serão enviados como resposta de acordo com a configuração `--[no"
-"-]chain-reply-to`."
+msgstr "Faça o primeiro e-mail (ou todos os e-mails com `--no-thread`) aparecer como uma resposta ao ID da mensagem informada, o que evita as quebras dos encadeamentos provendo uma nova série de patches.  O segundo e-mail e os seguintes serão enviados como resposta de acordo com a configuração `--[no-]chain-reply-to`."
 
 #. type: Plain text
 #: en/git-send-email.txt:102
 #, priority:100
 msgid "So for example when `--thread` and `--no-chain-reply-to` are specified, the second and subsequent patches will be replies to the first one like in the illustration below where `[PATCH v2 0/3]` is in reply to `[PATCH 0/2]`:"
-msgstr ""
-"Assim, por exemplo, quando `--thread` e `--no-chain-reply-to` sejam "
-"utilizados, o segundo e os patches subsequentes serão as respostas para o "
-"primeiro, como na ilustração abaixo, onde `[PATCH v2 0/3]` está como "
-"resposta para `[PATCH 0/2]`:"
+msgstr "Assim, por exemplo, quando `--thread` e `--no-chain-reply-to` sejam utilizados, o segundo e os patches subsequentes serão as respostas para o primeiro, como na ilustração abaixo, onde `[PATCH v2 0/3]` está como resposta para `[PATCH 0/2]`:"
 
 #. type: Plain text
 #: en/git-send-email.txt:110
@@ -54243,9 +47375,7 @@ msgstr ""
 #: en/git-send-email.txt:113
 #, priority:100
 msgid "Only necessary if --compose is also set.  If --compose is not set, this will be prompted for."
-msgstr ""
-"Somente é necessário caso `--compose` seja definido.  Caso `--compose` não "
-"seja definido, será solicitado ao usuário para informar um."
+msgstr "Somente é necessário caso `--compose` seja definido.  Caso `--compose` não seja definido, será solicitado ao usuário para informar um."
 
 #. type: Labeled list
 #: en/git-send-email.txt:114
@@ -54257,10 +47387,7 @@ msgstr "--subject=<texto>"
 #: en/git-send-email.txt:118
 #, priority:100
 msgid "Specify the initial subject of the email thread.  Only necessary if --compose is also set.  If --compose is not set, this will be prompted for."
-msgstr ""
-"Informe o assunto inicial do encadeamento do e-mail.  Somente é necessário "
-"caso `--compose` seja definido.  Caso `--compose` não seja definido, será "
-"solicitado ao usuário para informar um."
+msgstr "Informe o assunto inicial do encadeamento do e-mail.  Somente é necessário caso `--compose` seja definido.  Caso `--compose` não seja definido, será solicitado ao usuário para informar um."
 
 #. type: Labeled list
 #: en/git-send-email.txt:119
@@ -54272,11 +47399,7 @@ msgstr "--to=<endereço>,..."
 #: en/git-send-email.txt:124
 #, priority:100
 msgid "Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. Default is the value of the `sendemail.to` configuration value; if that is unspecified, and --to-cmd is not specified, this will be prompted for."
-msgstr ""
-"Define o destinatário principal dos e-mails que forem gerados. Em geral, "
-"este será o mantenedor \"upstream\" do projeto envolvido. A predefinição é o "
-"valor da opção de configuração `sendemail.transferEncoding`; caso isso não "
-"seja definido, a predefinição retorna para `auto`."
+msgstr "Define o destinatário principal dos e-mails que forem gerados. Em geral, este será o mantenedor \"upstream\" do projeto envolvido. A predefinição é o valor da opção de configuração `sendemail.transferEncoding`; caso isso não seja definido, a predefinição retorna para `auto`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:127
@@ -54288,12 +47411,7 @@ msgstr "--8bit-encoding=<codificação>"
 #: en/git-send-email.txt:133
 #, priority:100
 msgid "When encountering a non-ASCII message or subject that does not declare its encoding, add headers/quoting to indicate it is encoded in <encoding>.  Default is the value of the 'sendemail.assume8bitEncoding'; if that is unspecified, this will be prompted for if any non-ASCII files are encountered."
-msgstr ""
-"Quando encontrar uma mensagem não ASCII ou um assunto que não declare a sua "
-"codificação, adicione os cabeçalhos/citações para indicar que estão "
-"codificados com <codificação>.  A predefinição é o valor do 'sendemail."
-"assume8bitEncoding'; caso não esteja definido, o usuário será questionado "
-"caso qualquer arquivo não ASCII seja encontrado."
+msgstr "Quando encontrar uma mensagem não ASCII ou um assunto que não declare a sua codificação, adicione os cabeçalhos/citações para indicar que estão codificados com <codificação>.  A predefinição é o valor do 'sendemail.assume8bitEncoding'; caso não esteja definido, o usuário será questionado caso qualquer arquivo não ASCII seja encontrado."
 
 #. type: Plain text
 #: en/git-send-email.txt:135
@@ -54311,10 +47429,7 @@ msgstr "--compose-encoding=<codificação>"
 #: en/git-send-email.txt:139
 #, priority:100
 msgid "Specify encoding of compose message. Default is the value of the 'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
-msgstr ""
-"Define a codificação da mensagem que será escrita. A predefinição é o valor "
-"da opção de configuração 'sendemail.composeencoding'; caso não esteja "
-"definido, assume-se o UTF-8."
+msgstr "Define a codificação da mensagem que será escrita. A predefinição é o valor da opção de configuração 'sendemail.composeencoding'; caso não esteja definido, assume-se o UTF-8."
 
 #. type: Labeled list
 #: en/git-send-email.txt:140
@@ -54326,23 +47441,13 @@ msgstr "--transfer-encoding=(7bit|8bit|quoted-printable|base64|auto)"
 #: en/git-send-email.txt:148
 #, priority:100
 msgid "Specify the transfer encoding to be used to send the message over SMTP.  7bit will fail upon encountering a non-ASCII message.  quoted-printable can be useful when the repository contains files that contain carriage returns, but makes the raw patch email file (as saved from a MUA) much harder to inspect manually.  base64 is even more fool proof, but also even more opaque.  auto will use 8bit when possible, and quoted-printable otherwise."
-msgstr ""
-"Define a codificação da transferência que será utilizada para enviar a "
-"mensagem através do SMTP.  O 7bit falhará caso encontre uma mensagem não "
-"ASCII.  a citação para impressão pode ser útil quando o repositório contém "
-"arquivos que contenham retornos de carro, porém dificulta muito a inspeção "
-"manual do arquivo de e-mail do patch bruto (com é gravado através de um MUA)"
-".  a base64 é ainda mais à prova de idiotas, porém também é ainda mais "
-"estúpido.  auto utilizará 8bit quando for possível e, caso contrário, será "
-"citado para impressão."
+msgstr "Define a codificação da transferência que será utilizada para enviar a mensagem através do SMTP.  O 7bit falhará caso encontre uma mensagem não ASCII.  a citação para impressão pode ser útil quando o repositório contém arquivos que contenham retornos de carro, porém dificulta muito a inspeção manual do arquivo de e-mail do patch bruto (com é gravado através de um MUA).  a base64 é ainda mais à prova de idiotas, porém também é ainda mais estúpido.  auto utilizará 8bit quando for possível e, caso contrário, será citado para impressão."
 
 #. type: Plain text
 #: en/git-send-email.txt:151
 #, priority:100
 msgid "Default is the value of the `sendemail.transferEncoding` configuration value; if that is unspecified, default to `auto`."
-msgstr ""
-"A predefinição é o valor da configuração `sendemail.transferEncoding`; caso "
-"isso não seja definido, a predefinição retorna para `auto`."
+msgstr "A predefinição é o valor da configuração `sendemail.transferEncoding`; caso isso não seja definido, a predefinição retorna para `auto`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:152
@@ -54360,10 +47465,7 @@ msgstr "--no-xmailer"
 #: en/git-send-email.txt:157
 #, priority:100
 msgid "Add (or prevent adding) the \"X-Mailer:\" header.  By default, the header is added, but it can be turned off by setting the `sendemail.xmailer` configuration variable to `false`."
-msgstr ""
-"Adicione (ou evite adicionar) o cabeçalho \"X-Mailer:\".  A predefinição é "
-"que o cabeçalho seja adicionado, porém pode ser desligado redefinindo a "
-"variável de configuração `sendemail.xmailer` como `false`."
+msgstr "Adicione (ou evite adicionar) o cabeçalho \"X-Mailer:\".  A predefinição é que o cabeçalho seja adicionado, porém pode ser desligado redefinindo a variável de configuração `sendemail.xmailer` como `false`."
 
 #. type: Title ~
 #: en/git-send-email.txt:159
@@ -54381,14 +47483,7 @@ msgstr "--envelope-sender=<endereço>"
 #: en/git-send-email.txt:169
 #, priority:100
 msgid "Specify the envelope sender used to send the emails.  This is useful if your default address is not the address that is subscribed to a list. In order to use the 'From' address, set the value to \"auto\". If you use the sendmail binary, you must have suitable privileges for the -f parameter.  Default is the value of the `sendemail.envelopeSender` configuration variable; if that is unspecified, choosing the envelope sender is left to your MTA."
-msgstr ""
-"Define o envelope do remetente utilizado para enviar os e-mails.  É útil "
-"caso o seu endereço predefinido não seja o endereço registrado em uma lista. "
-"Para usar o endereço 'De', defina o valor para \"auto\". Caso utilize o "
-"binário do 'sendmail', você deverá ter privilégios adequados para poder "
-"utilizar o parâmetro `-f`.  A predefinição é o valor da variável de "
-"configuração `sendemail.envelopeSender`; caso não esteja definido, a escolha "
-"do envelope do remetente é deixada para o seu MTA."
+msgstr "Define o envelope do remetente utilizado para enviar os e-mails.  É útil caso o seu endereço predefinido não seja o endereço registrado em uma lista. Para usar o endereço 'De', defina o valor para \"auto\". Caso utilize o binário do 'sendmail', você deverá ter privilégios adequados para poder utilizar o parâmetro `-f`.  A predefinição é o valor da variável de configuração `sendemail.envelopeSender`; caso não esteja definido, a escolha do envelope do remetente é deixada para o seu MTA."
 
 #. type: Labeled list
 #: en/git-send-email.txt:170
@@ -54400,10 +47495,7 @@ msgstr "--smtp-encryption=<criptografia>"
 #: en/git-send-email.txt:174
 #, priority:100
 msgid "Specify the encryption to use, either 'ssl' or 'tls'.  Any other value reverts to plain SMTP.  Default is the value of `sendemail.smtpEncryption`."
-msgstr ""
-"Define a criptografia que será utilizada, 'ssl' ou 'tls'.  Qualquer outro "
-"valor é revertido para o SMTP simples.  A predefinição é o valor da opção de "
-"configuração `sendemail.smtpEncryption`."
+msgstr "Define a criptografia que será utilizada, 'ssl' ou 'tls'.  Qualquer outro valor é revertido para o SMTP simples.  A predefinição é o valor da opção de configuração `sendemail.smtpEncryption`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:175
@@ -54415,12 +47507,7 @@ msgstr "--smtp-domain=<FQDN>"
 #: en/git-send-email.txt:181
 #, priority:100
 msgid "Specifies the Fully Qualified Domain Name (FQDN) used in the HELO/EHLO command to the SMTP server.  Some servers require the FQDN to match your IP address.  If not set, git send-email attempts to determine your FQDN automatically.  Default is the value of `sendemail.smtpDomain`."
-msgstr ""
-"Define o Nome de Domínio Totalmente Qualificado (FQDN) utilizado no comando "
-"HELO/EHLO para o servidor SMTP.  Alguns servidores exigem que o FQDN "
-"corresponda ao seu endereço de IP.  Caso não esteja definido, o comando `git "
-"send-email` tenta determinar o seu FQDN de forma automática.  A predefinição "
-"é o valor da opção de configuração `sendemail.smtpDomain`."
+msgstr "Define o Nome de Domínio Totalmente Qualificado (FQDN) utilizado no comando HELO/EHLO para o servidor SMTP.  Alguns servidores exigem que o FQDN corresponda ao seu endereço de IP.  Caso não esteja definido, o comando `git send-email` tenta determinar o seu FQDN de forma automática.  A predefinição é o valor da opção de configuração `sendemail.smtpDomain`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:182
@@ -54444,15 +47531,7 @@ msgstr "$ git send-email --smtp-auth=\"PLAIN LOGIN GSSAPI\" ...\n"
 #: en/git-send-email.txt:196
 #, priority:100
 msgid "If at least one of the specified mechanisms matches the ones advertised by the SMTP server and if it is supported by the utilized SASL library, the mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--smtp-auth` is specified, all mechanisms supported by the SASL library can be used. The special value 'none' maybe specified to completely disable authentication independently of `--smtp-user`"
-msgstr ""
-"Caso pelo menos um dos mecanismos definidos coincidir com os anunciados "
-"através do servidor SMTP e caso seja compatível pela biblioteca SASL "
-"utilizada, o mecanismo será utilizado para a autenticação. Caso nem a opção "
-"de configuração 'sendemail.smtpAuth' nem a opção `--smtp-auth` forem "
-"utilizados, todos os mecanismos compatíveis através da biblioteca SASL "
-"poderão ser utilizados. O valor especial 'none' pode ser informado para "
-"desativar completamente a autenticação, independentemente da opção `--smtp-"
-"user`"
+msgstr "Caso pelo menos um dos mecanismos definidos coincidir com os anunciados através do servidor SMTP e caso seja compatível pela biblioteca SASL utilizada, o mecanismo será utilizado para a autenticação. Caso nem a opção de configuração 'sendemail.smtpAuth' nem a opção `--smtp-auth` forem utilizados, todos os mecanismos compatíveis através da biblioteca SASL poderão ser utilizados. O valor especial 'none' pode ser informado para desativar completamente a autenticação, independentemente da opção `--smtp-user`"
 
 #. type: Labeled list
 #: en/git-send-email.txt:197
@@ -54464,22 +47543,13 @@ msgstr "--smtp-pass[=<senha>]"
 #: en/git-send-email.txt:202
 #, priority:100
 msgid "Password for SMTP-AUTH. The argument is optional: If no argument is specified, then the empty string is used as the password. Default is the value of `sendemail.smtpPass`, however `--smtp-pass` always overrides this value."
-msgstr ""
-"A senha para o SMTP-AUTH. O argumento é opcional: Caso nenhum argumento seja "
-"definido, então um valor vazio é utilizado como uma senha. A predefinição é "
-"o valor da opção de configuração `sendemail.smtpPass`, no entanto, a opção "
-"`--smtp-pass` sempre substitui este valor."
+msgstr "A senha para o SMTP-AUTH. O argumento é opcional: Caso nenhum argumento seja definido, então um valor vazio é utilizado como uma senha. A predefinição é o valor da opção de configuração `sendemail.smtpPass`, no entanto, a opção `--smtp-pass` sempre substitui este valor."
 
 #. type: Plain text
 #: en/git-send-email.txt:208
 #, priority:100
 msgid "Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with `--smtp-user` or a `sendemail.smtpUser`), but no password has been specified (with `--smtp-pass` or `sendemail.smtpPass`), then a password is obtained using 'git-credential'."
-msgstr ""
-"Além disso, as senhas não precisam ser definidas nos arquivos de "
-"configuração ou na linha de comando. Caso um nome de usuário seja definido ("
-"com `--smtp-user` ou` `sendemail.smtpUser`), porém nenhuma senha seja "
-"definida (com `--smtp-pass` ou `sendemail.smtpPass`), uma senha é obtida "
-"utilizando o comando 'git-credential'."
+msgstr "Além disso, as senhas não precisam ser definidas nos arquivos de configuração ou na linha de comando. Caso um nome de usuário seja definido (com `--smtp-user` ou` `sendemail.smtpUser`), porém nenhuma senha seja definida (com `--smtp-pass` ou `sendemail.smtpPass`), uma senha é obtida utilizando o comando 'git-credential'."
 
 #. type: Labeled list
 #: en/git-send-email.txt:209
@@ -54503,15 +47573,7 @@ msgstr "--smtp-server=<host>"
 #: en/git-send-email.txt:221
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server to use (e.g.  `smtp.example.com` or a raw IP address).  Alternatively it can specify a full pathname of a sendmail-like program instead; the program must support the `-i` option.  Default value can be specified by the `sendemail.smtpServer` configuration option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such program is available, falling back to `localhost` otherwise."
-msgstr ""
-"Caso seja definido, define qual o servidor SMTP deve ser utilizado (como por "
-"exemplo, um domínio `smtp.example.com` ou um endereço IP).  Como "
-"alternativa, é possível definir um nome do caminho completo de um programa "
-"semelhante ao sendmail; o programa deve ser compatível com a opção `-i`.  O "
-"valor predefinido pode ser definido através da opção de configuração "
-"`sendemail.smtpServer`; a predefinição interna é procurar pelo `sendmail` em "
-"`/usr/sbin`, `/usr/lib` e `$PATH` caso este programa esteja disponível, caso "
-"contrário retorna ao `localhost`."
+msgstr "Caso seja definido, define qual o servidor SMTP deve ser utilizado (como por exemplo, um domínio `smtp.example.com` ou um endereço IP).  Como alternativa, é possível definir um nome do caminho completo de um programa semelhante ao sendmail; o programa deve ser compatível com a opção `-i`.  O valor predefinido pode ser definido através da opção de configuração `sendemail.smtpServer`; a predefinição interna é procurar pelo `sendmail` em `/usr/sbin`, `/usr/lib` e `$PATH` caso este programa esteja disponível, caso contrário retorna ao `localhost`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:222
@@ -54523,13 +47585,7 @@ msgstr "--smtp-server-port=<porta>"
 #: en/git-send-email.txt:229
 #, priority:100
 msgid "Specifies a port different from the default port (SMTP servers typically listen to smtp port 25, but may also listen to submission port 587, or the common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead of 587)  are also accepted. The port can also be set with the `sendemail.smtpServerPort` configuration variable."
-msgstr ""
-"Define uma porta diferente da porta predefinida (os servidores SMTP "
-"normalmente ouvem na porta 25 smtp, porém também podem ouvir na porta de "
-"envio ou a porta smtp SSL comum 465); os nomes das portas simbólicos (como, "
-"por exemplo, \"submission\" em vez do 587) também são aceitos. A porta "
-"também pode ser definida com a variável de configuração `sendemail."
-"smtpServerPort`."
+msgstr "Define uma porta diferente da porta predefinida (os servidores SMTP normalmente ouvem na porta 25 smtp, porém também podem ouvir na porta de envio ou a porta smtp SSL comum 465); os nomes das portas simbólicos (como, por exemplo, \"submission\" em vez do 587) também são aceitos. A porta também pode ser definida com a variável de configuração `sendemail.smtpServerPort`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:230
@@ -54541,19 +47597,13 @@ msgstr "--smtp-server-option=<opção>"
 #: en/git-send-email.txt:234
 #, priority:100
 msgid "If set, specifies the outgoing SMTP server option to use.  Default value can be specified by the `sendemail.smtpServerOption` configuration option."
-msgstr ""
-"Caso seja definido, define qual a opção da saída que será usada pelo "
-"servidor SMTP.  O valor predefinido pode ser definido pela opção de "
-"configuração `sendemail.smtpServerOption`."
+msgstr "Caso seja definido, define qual a opção da saída que será usada pelo servidor SMTP.  O valor predefinido pode ser definido pela opção de configuração `sendemail.smtpServerOption`."
 
 #. type: Plain text
 #: en/git-send-email.txt:238
 #, priority:100
 msgid "The --smtp-server-option option must be repeated for each option you want to pass to the server. Likewise, different lines in the configuration files must be used for each option."
-msgstr ""
-"A opção `--smtp-server-option` deve ser repetida para cada opção que você "
-"queira passar para o servidor. Da mesma forma, as linhas diferentes nos "
-"arquivos de configuração devem ser utilizadas para cada opção."
+msgstr "A opção `--smtp-server-option` deve ser repetida para cada opção que você queira passar para o servidor. Da mesma forma, as linhas diferentes nos arquivos de configuração devem ser utilizadas para cada opção."
 
 #. type: Labeled list
 #: en/git-send-email.txt:239
@@ -54577,16 +47627,7 @@ msgstr "--smtp-ssl-cert-path"
 #: en/git-send-email.txt:252
 #, priority:100
 msgid "Path to a store of trusted CA certificates for SMTP SSL/TLS certificate validation (either a directory that has been processed by 'c_rehash', or a single file containing one or more PEM format certificates concatenated together: see verify(1) -CAfile and -CApath for more information on these). Set it to an empty string to disable certificate verification. Defaults to the value of the `sendemail.smtpsslcertpath` configuration variable, if set, or the backing SSL library's compiled-in default otherwise (which should be the best choice on most platforms)."
-msgstr ""
-"O caminho para um armazenamento dos certificados CA confiáveis para a "
-"validação do certificado SMTP SSL/TLS (um diretório que foi processado pelo "
-"'c_rehash' ou um único arquivo contendo um ou mais certificados no formato "
-"'PEM' concatenados juntos: consulte 'verify(1)' '-CAfile' e '-CApath' para "
-"mais informações sobre eles). Defina-o como um texto vazio para desativar a "
-"verificação do certificado. A predefinição retorna para o valor da variável "
-"de configuração `sendemail.smtpsslcertpath`, caso seja definida, ou tenha a "
-"biblioteca de apoio SSL tenha sido compilada (o que deve ser a melhor opção "
-"na maioria das plataformas)."
+msgstr "O caminho para um armazenamento dos certificados CA confiáveis para a validação do certificado SMTP SSL/TLS (um diretório que foi processado pelo 'c_rehash' ou um único arquivo contendo um ou mais certificados no formato 'PEM' concatenados juntos: consulte 'verify(1)' '-CAfile' e '-CApath' para mais informações sobre eles). Defina-o como um texto vazio para desativar a verificação do certificado. A predefinição retorna para o valor da variável de configuração `sendemail.smtpsslcertpath`, caso seja definida, ou tenha a biblioteca de apoio SSL tenha sido compilada (o que deve ser a melhor opção na maioria das plataformas)."
 
 #. type: Labeled list
 #: en/git-send-email.txt:253
@@ -54598,11 +47639,7 @@ msgstr "--smtp-user=<usuário>"
 #: en/git-send-email.txt:257
 #, priority:100
 msgid "Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then authentication is not attempted."
-msgstr ""
-"O nome do usuário para o SMTP-AUTH. A predefinição é o valor da opção de "
-"configuração `sendemail.smtpUser`; caso um nome de usuário não tenha sido "
-"definido(com `--smtp-user` ou `sendemail.smtpUser`), a tentativa de "
-"autenticação não será realizada."
+msgstr "O nome do usuário para o SMTP-AUTH. A predefinição é o valor da opção de configuração `sendemail.smtpUser`; caso um nome de usuário não tenha sido definido(com `--smtp-user` ou `sendemail.smtpUser`), a tentativa de autenticação não será realizada."
 
 #. type: Labeled list
 #: en/git-send-email.txt:258
@@ -54614,10 +47651,7 @@ msgstr "--smtp-debug=0|1"
 #: en/git-send-email.txt:262
 #, priority:100
 msgid "Enable (1) or disable (0) debug output. If enabled, SMTP commands and replies will be printed. Useful to debug TLS connection and authentication problems."
-msgstr ""
-"Ative (1) ou desative (0) a geração da depuração. Se ativado, os comandos e "
-"respostas SMTP serão impressos. Útil para depurar problemas de conexão e a "
-"autenticação TLS."
+msgstr "Ative (1) ou desative (0) a geração da depuração. Se ativado, os comandos e respostas SMTP serão impressos. Útil para depurar problemas de conexão e a autenticação TLS."
 
 #. type: Labeled list
 #: en/git-send-email.txt:263
@@ -54629,16 +47663,7 @@ msgstr "--batch-size=<num>"
 #: en/git-send-email.txt:272
 #, priority:100
 msgid "Some email servers (e.g. smtp.163.com) limit the number emails to be sent per session (connection) and this will lead to a failure when sending many messages.  With this option, send-email will disconnect after sending $<num> messages and wait for a few seconds (see --relogin-delay)  and reconnect, to work around such a limit.  You may want to use some form of credential helper to avoid having to retype your password every time this happens.  Defaults to the `sendemail.smtpBatchSize` configuration variable."
-msgstr ""
-"Alguns servidores de e-mail (smtp.163.com por exemplo) limitam a quantidade "
-"de e-mails que podem ser enviados por sessão (conexão) e isso causa uma "
-"falha no envio de muitas mensagens.  Com esta opção, o \"send-email\" será "
-"desconectado após enviar a quantidade de `$<num>` mensagens e aguardará "
-"alguns segundos (consulte --relogin-delay) e fará a reconexão para contornar "
-"esse limite.  É possível utilizar alguma forma de auxiliar a credencial "
-"evitando a necessidade de redigitar a sua senha sempre que isso acontecer.  "
-"A predefinição retorna para o valor da variável de configuração `sendemail."
-"smtpBatchSize`."
+msgstr "Alguns servidores de e-mail (smtp.163.com por exemplo) limitam a quantidade de e-mails que podem ser enviados por sessão (conexão) e isso causa uma falha no envio de muitas mensagens.  Com esta opção, o \"send-email\" será desconectado após enviar a quantidade de `$<num>` mensagens e aguardará alguns segundos (consulte --relogin-delay) e fará a reconexão para contornar esse limite.  É possível utilizar alguma forma de auxiliar a credencial evitando a necessidade de redigitar a sua senha sempre que isso acontecer.  A predefinição retorna para o valor da variável de configuração `sendemail.smtpBatchSize`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:273
@@ -54650,10 +47675,7 @@ msgstr "--relogin-delay=<int>"
 #: en/git-send-email.txt:277
 #, priority:100
 msgid "Waiting $<int> seconds before reconnecting to SMTP server. Used together with --batch-size option.  Defaults to the `sendemail.smtpReloginDelay` configuration variable."
-msgstr ""
-"Aguardando `$<int>` segundos antes de se reconectar ao servidor SMTP. "
-"Utilizado em conjunto com a opção `--batch-size`.  A predefinição retorna "
-"para o valor da variável de configuração `sendemail.smtpReloginDelay`."
+msgstr "Aguardando `$<int>` segundos antes de se reconectar ao servidor SMTP. Utilizado em conjunto com a opção `--batch-size`.  A predefinição retorna para o valor da variável de configuração `sendemail.smtpReloginDelay`."
 
 #. type: Title ~
 #: en/git-send-email.txt:279
@@ -54671,9 +47693,7 @@ msgstr "--no-[to|cc|bcc]"
 #: en/git-send-email.txt:284
 #, priority:100
 msgid "Clears any list of \"To:\", \"Cc:\", \"Bcc:\" addresses previously set via config."
-msgstr ""
-"Limpa qualquer lista dos endereços \"Para:\", \"Cc:\", \"Cco:\" definidos "
-"anteriormente através da config."
+msgstr "Limpa qualquer lista dos endereços \"Para:\", \"Cc:\", \"Cco:\" definidos anteriormente através da config."
 
 #. type: Labeled list
 #: en/git-send-email.txt:285
@@ -54685,9 +47705,7 @@ msgstr "--no-identity"
 #: en/git-send-email.txt:288
 #, priority:100
 msgid "Clears the previously read value of `sendemail.identity` set via config, if any."
-msgstr ""
-"Limpa o valor lido anteriormente do `sendemail.identity` definido através da "
-"config, caso exista."
+msgstr "Limpa o valor lido anteriormente do `sendemail.identity` definido através da config, caso exista."
 
 #. type: Labeled list
 #: en/git-send-email.txt:289
@@ -54699,11 +47717,7 @@ msgstr "--to-cmd=<comando>"
 #: en/git-send-email.txt:294
 #, priority:100
 msgid "Specify a command to execute once per patch file which should generate patch file specific \"To:\" entries.  Output of this command must be single email address per line.  Default is the value of 'sendemail.tocmd' configuration value."
-msgstr ""
-"Define um comando que será executado um por vez no arquivo patch que deve "
-"gerar as entradas \"Para:\".  A saída deste comando deve ser um endereço de "
-"e-mail único por linha.  A predefinição é o valor da opção de configuração "
-"'sendemail.tocmd'."
+msgstr "Define um comando que será executado um por vez no arquivo patch que deve gerar as entradas \"Para:\".  A saída deste comando deve ser um endereço de e-mail único por linha.  A predefinição é o valor da opção de configuração 'sendemail.tocmd'."
 
 #. type: Labeled list
 #: en/git-send-email.txt:295
@@ -54715,11 +47729,7 @@ msgstr "--cc-cmd=<comando>"
 #: en/git-send-email.txt:300
 #, priority:100
 msgid "Specify a command to execute once per patch file which should generate patch file specific \"Cc:\" entries.  Output of this command must be single email address per line.  Default is the value of `sendemail.ccCmd` configuration value."
-msgstr ""
-"Define um comando que será executado um por vez no arquivo patch que deve "
-"gerar as entradas \"Cc:\".  A saída deste comando deve ser um endereço de e-"
-"mail único por linha.  A predefinição é o valor da opção de configuração "
-"`sendemail.ccCmd`."
+msgstr "Define um comando que será executado um por vez no arquivo patch que deve gerar as entradas \"Cc:\".  A saída deste comando deve ser um endereço de e-mail único por linha.  A predefinição é o valor da opção de configuração `sendemail.ccCmd`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:301
@@ -54731,14 +47741,7 @@ msgstr "--[no-]chain-reply-to"
 #: en/git-send-email.txt:308
 #, priority:100
 msgid "If this is set, each email will be sent as a reply to the previous email sent.  If disabled with \"--no-chain-reply-to\", all emails after the first will be sent as replies to the first email sent.  When using this, it is recommended that the first file given be an overview of the entire patch series. Disabled by default, but the `sendemail.chainReplyTo` configuration variable can be used to enable it."
-msgstr ""
-"Caso esteja definido, cada e-mail será enviado como uma resposta ao e-mail "
-"enviado anteriormente.  Caso esteja desativado com a opção \"--no-chain-"
-"reply-to\", todos os e-mails posteriores ao primeiro, serão enviados como "
-"respostas para o primeiro e-mail enviado.  Ao utilizar isso, é recomendável "
-"que o primeiro arquivo utilizado seja uma visão geral de toda a série de "
-"patches. É predefinido que esteja desativada, porém a variável de "
-"configuração `sendemail.chainReplyTo` pode ser utilizada para ativá-la."
+msgstr "Caso esteja definido, cada e-mail será enviado como uma resposta ao e-mail enviado anteriormente.  Caso esteja desativado com a opção \"--no-chain-reply-to\", todos os e-mails posteriores ao primeiro, serão enviados como respostas para o primeiro e-mail enviado.  Ao utilizar isso, é recomendável que o primeiro arquivo utilizado seja uma visão geral de toda a série de patches. É predefinido que esteja desativada, porém a variável de configuração `sendemail.chainReplyTo` pode ser utilizada para ativá-la."
 
 #. type: Labeled list
 #: en/git-send-email.txt:309
@@ -54750,11 +47753,7 @@ msgstr "--identity=<identidade>"
 #: en/git-send-email.txt:314
 #, priority:100
 msgid "A configuration identity. When given, causes values in the 'sendemail.<identity>' subsection to take precedence over values in the 'sendemail' section. The default identity is the value of `sendemail.identity`."
-msgstr ""
-"Uma identidade de configuração. Quando informado, faz com que os valores na "
-"subseção 'sendemail.<identidade>' tenham precedência sobre os valores na "
-"seção 'sendemail'. A identidade predefinida é o valor existente em `sendemail"
-".identity`."
+msgstr "Uma identidade de configuração. Quando informado, faz com que os valores na subseção 'sendemail.<identidade>' tenham precedência sobre os valores na seção 'sendemail'. A identidade predefinida é o valor existente em `sendemail.identity`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:315
@@ -54766,11 +47765,7 @@ msgstr "--[no-]signed-off-by-cc"
 #: en/git-send-email.txt:319
 #, priority:100
 msgid "If this is set, add emails found in Signed-off-by: or Cc: lines to the cc list. Default is the value of `sendemail.signedoffbycc` configuration value; if that is unspecified, default to --signed-off-by-cc."
-msgstr ""
-"Caso esteja definido, adicione os e-mails encontrados nas linhas 'Signed-off-"
-"by:' ou Cc: à lista cc. A predefinição é o valor da opção de configuração "
-"`sendemail.signedoffbycc`; caso não seja definido, a predefinição retorna "
-"para `--signed-off-by-cc`."
+msgstr "Caso esteja definido, adicione os e-mails encontrados nas linhas 'Signed-off-by:' ou Cc: à lista cc. A predefinição é o valor da opção de configuração `sendemail.signedoffbycc`; caso não seja definido, a predefinição retorna para `--signed-off-by-cc`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:320
@@ -54806,9 +47801,7 @@ msgstr "--suppress-cc=<categoria>"
 #: en/git-send-email.txt:335
 #, priority:100
 msgid "Specify an additional category of recipients to suppress the auto-cc of:"
-msgstr ""
-"Define uma categoria adicional dos destinatários para suprimir o 'auto-cc' "
-"do:"
+msgstr "Define uma categoria adicional dos destinatários para suprimir o 'auto-cc' do:"
 
 #. type: Plain text
 #: en/git-send-email.txt:338
@@ -54826,36 +47819,25 @@ msgstr "'self' evitará incluir o remetente."
 #: en/git-send-email.txt:341
 #, priority:100
 msgid "'cc' will avoid including anyone mentioned in Cc lines in the patch header except for self (use 'self' for that)."
-msgstr ""
-"'cc' irá evitar a inclusão de qualquer pessoa mencionada nas linhas Cc no "
-"cabeçalho do patch, exceto self (utilize 'self' para isso)."
+msgstr "'cc' irá evitar a inclusão de qualquer pessoa mencionada nas linhas Cc no cabeçalho do patch, exceto self (utilize 'self' para isso)."
 
 #. type: Plain text
 #: en/git-send-email.txt:343
 #, priority:100
 msgid "'bodycc' will avoid including anyone mentioned in Cc lines in the patch body (commit message) except for self (use 'self' for that)."
-msgstr ""
-"'bodycc' irá evitar a inclusão de qualquer pessoa mencionada nas linhas Cc "
-"no corpo do patch (mensagem do commit), exceto o 'self' (utilize 'self' para "
-"isso)."
+msgstr "'bodycc' irá evitar a inclusão de qualquer pessoa mencionada nas linhas Cc no corpo do patch (mensagem do commit), exceto o 'self' (utilize 'self' para isso)."
 
 #. type: Plain text
 #: en/git-send-email.txt:345
 #, priority:100
 msgid "'sob' will avoid including anyone mentioned in Signed-off-by lines except for self (use 'self' for that)."
-msgstr ""
-"O 'sob' evitará incluir qualquer pessoa mencionada nas linhas assinadas, "
-"exceto 'self' (utilize 'self' para isso)."
+msgstr "O 'sob' evitará incluir qualquer pessoa mencionada nas linhas assinadas, exceto 'self' (utilize 'self' para isso)."
 
 #. type: Plain text
 #: en/git-send-email.txt:348
 #, priority:100
 msgid "'misc-by' will avoid including anyone mentioned in Acked-by, Reviewed-by, Tested-by and other \"-by\" lines in the patch body, except Signed-off-by (use 'sob' for that)."
-msgstr ""
-"O 'misc-by' evitará incluir qualquer pessoa mencionada nas linhas 'Acked-by' "
-"(Reconhecido-por), 'Review-by' (Revisado-por), 'Tested-by' (Testado-por) e "
-"outras linhas \"by-by\" no corpo do patch, exceto o 'Signed-off-by' "
-"(Assinado-por) (utilize 'sob' para tanto)."
+msgstr "O 'misc-by' evitará incluir qualquer pessoa mencionada nas linhas 'Acked-by' (Reconhecido-por), 'Review-by' (Revisado-por), 'Tested-by' (Testado-por) e outras linhas \"by-by\" no corpo do patch, exceto o 'Signed-off-by' (Assinado-por) (utilize 'sob' para tanto)."
 
 #. type: Plain text
 #: en/git-send-email.txt:349
@@ -54879,10 +47861,7 @@ msgstr "'all' irá suprimir todos os valores cc de maneira automática."
 #: en/git-send-email.txt:356
 #, priority:100
 msgid "Default is the value of `sendemail.suppresscc` configuration value; if that is unspecified, default to 'self' if --suppress-from is specified, as well as 'body' if --no-signed-off-cc is specified."
-msgstr ""
-"A predefinição é o valor da configuração `sendemail.suppresscc`; caso isso "
-"não seja definido, a predefinição será `self` caso `--suppress-from` seja "
-"utilizado, bem como `body` caso `--no-selected-off-cc` seja utilizado."
+msgstr "A predefinição é o valor da configuração `sendemail.suppresscc`; caso isso não seja definido, a predefinição será `self` caso `--suppress-from` seja utilizado, bem como `body` caso `--no-selected-off-cc` seja utilizado."
 
 #. type: Labeled list
 #: en/git-send-email.txt:357
@@ -54894,10 +47873,7 @@ msgstr "--[no-]suppress-from"
 #: en/git-send-email.txt:361
 #, priority:100
 msgid "If this is set, do not add the From: address to the cc: list.  Default is the value of `sendemail.suppressFrom` configuration value; if that is unspecified, default to --no-suppress-from."
-msgstr ""
-"Caso esteja definido, não adicione o endereço From: à lista cc:.  A "
-"predefinição é o valor da opção de configuração `sendemail.suppressFrom`; "
-"caso não seja definido, a predefinição retorna para `--no-suppress-from`."
+msgstr "Caso esteja definido, não adicione o endereço From: à lista cc:.  A predefinição é o valor da opção de configuração `sendemail.suppressFrom`; caso não seja definido, a predefinição retorna para `--no-suppress-from`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:362
@@ -54909,32 +47885,19 @@ msgstr "--[no-]thread"
 #: en/git-send-email.txt:368
 #, priority:100
 msgid "If this is set, the In-Reply-To and References headers will be added to each email sent.  Whether each mail refers to the previous email (`deep` threading per 'git format-patch' wording) or to the first email (`shallow` threading) is governed by \"--[no-]chain-reply-to\"."
-msgstr ""
-"Caso esteja definido, os cabeçalhos 'In-Reply-To' e as Referências serão "
-"adicionadas em cada e-mail enviado.  Se cada e-mail se refere ao e-mail "
-"anterior (`deep` encadeado por 'git format-patch') ou ao primeiro e-mail ("
-"encadeamento `shallow`) é governado por \"--[no-]chain-reply-to\"."
+msgstr "Caso esteja definido, os cabeçalhos 'In-Reply-To' e as Referências serão adicionadas em cada e-mail enviado.  Se cada e-mail se refere ao e-mail anterior (`deep` encadeado por 'git format-patch') ou ao primeiro e-mail (encadeamento `shallow`) é governado por \"--[no-]chain-reply-to\"."
 
 #. type: Plain text
 #: en/git-send-email.txt:373
 #, priority:100
 msgid "If disabled with \"--no-thread\", those headers will not be added (unless specified with --in-reply-to).  Default is the value of the `sendemail.thread` configuration value; if that is unspecified, default to --thread."
-msgstr ""
-"Caso seja desativado com a opção \"--no-thread\", estes cabeçalhos não serão "
-"adicionados (a menos que seja especificado com a opção `--in-reply-to`).  A "
-"predefinição é o valor da opção de configuração `sendemail.thread`; caso não "
-"esteja definido, a predefinição retorna para `--thread`."
+msgstr "Caso seja desativado com a opção \"--no-thread\", estes cabeçalhos não serão adicionados (a menos que seja especificado com a opção `--in-reply-to`).  A predefinição é o valor da opção de configuração `sendemail.thread`; caso não esteja definido, a predefinição retorna para `--thread`."
 
 #. type: Plain text
 #: en/git-send-email.txt:379
 #, priority:100
 msgid "It is up to the user to ensure that no In-Reply-To header already exists when 'git send-email' is asked to add it (especially note that 'git format-patch' can be configured to do the threading itself).  Failure to do so may not produce the expected result in the recipient's MUA."
-msgstr ""
-"É responsabilidade do usuário garantir que já não exista um cabeçalho 'In-"
-"Reply-To' quando o comando 'git send-email' for solicitado para adicioná-lo ("
-"em especial, observe que o comando 'git format-patch' pode ser configurado "
-"para realizar o encadeamento ele mesmo).  Não fazer isso pode não produzir o "
-"resultado desejado no MUA do destinatário."
+msgstr "É responsabilidade do usuário garantir que já não exista um cabeçalho 'In-Reply-To' quando o comando 'git send-email' for solicitado para adicioná-lo (em especial, observe que o comando 'git format-patch' pode ser configurado para realizar o encadeamento ele mesmo).  Não fazer isso pode não produzir o resultado desejado no MUA do destinatário."
 
 #. type: Title ~
 #: en/git-send-email.txt:382
@@ -54970,17 +47933,13 @@ msgstr "O 'never' nunca irá confirmar antes do envio"
 #: en/git-send-email.txt:392
 #, priority:100
 msgid "'cc' will confirm before sending when send-email has automatically added addresses from the patch to the Cc list"
-msgstr ""
-"'cc' irá pedir uma confirmação antes do envio quando o \"send-email\" tiver "
-"adicionado de forma automática os endereços do patch à lista Cc"
+msgstr "'cc' irá pedir uma confirmação antes do envio quando o \"send-email\" tiver adicionado de forma automática os endereços do patch à lista Cc"
 
 #. type: Plain text
 #: en/git-send-email.txt:393
 #, priority:100
 msgid "'compose' will confirm before sending the first message when using --compose."
-msgstr ""
-"'compose' (compor) irá confirmar antes de enviar a primeira mensagem ao "
-"utilizar o `--compose`."
+msgstr "'compose' (compor) irá confirmar antes de enviar a primeira mensagem ao utilizar o `--compose`."
 
 #. type: Plain text
 #: en/git-send-email.txt:394
@@ -54992,10 +47951,7 @@ msgstr "'auto' é o equivalente a 'cc' + 'compose' (compor)"
 #: en/git-send-email.txt:399
 #, priority:100
 msgid "Default is the value of `sendemail.confirm` configuration value; if that is unspecified, default to 'auto' unless any of the suppress options have been specified, in which case default to 'compose'."
-msgstr ""
-"A predefinição é o valor da configuração `sendemail.confirm`; caso isso não "
-"seja definido, utilize a predefinição `auto`, a menos que alguma das opções "
-"da supressão tenha sido utilizada; nesse caso, a predefinição será `compose`."
+msgstr "A predefinição é o valor da configuração `sendemail.confirm`; caso isso não seja definido, utilize a predefinição `auto`, a menos que alguma das opções da supressão tenha sido utilizada; nesse caso, a predefinição será `compose`."
 
 #. type: Plain text
 #: en/git-send-email.txt:402
@@ -55013,19 +47969,13 @@ msgstr "--[no-]format-patch"
 #: en/git-send-email.txt:408
 #, priority:100
 msgid "When an argument may be understood either as a reference or as a file name, choose to understand it as a format-patch argument (`--format-patch`)  or as a file name (`--no-format-patch`). By default, when such a conflict occurs, git send-email will fail."
-msgstr ""
-"Quando um argumento pode ser entendido como uma referência ou como um nome "
-"do arquivo, entenda-o como um argumento do formato do patch (`--format-"
-"patch`) ou como um nome de arquivo (`--no-format-patch` ) É predefinido que "
-"quando este conflito ocorra, o 'git send-email' seja encerrado."
+msgstr "Quando um argumento pode ser entendido como uma referência ou como um nome do arquivo, entenda-o como um argumento do formato do patch (`--format-patch`) ou como um nome de arquivo (`--no-format-patch` ) É predefinido que quando este conflito ocorra, o 'git send-email' seja encerrado."
 
 #. type: Plain text
 #: en/git-send-email.txt:412
 #, priority:100
 msgid "Make git-send-email less verbose.  One line per email should be all that is output."
-msgstr ""
-"Torne o comando 'git-send-email' menos detalhado.  Deve ser gerado apenas "
-"uma linha por e-mail."
+msgstr "Torne o comando 'git-send-email' menos detalhado.  Deve ser gerado apenas uma linha por e-mail."
 
 #. type: Labeled list
 #: en/git-send-email.txt:413
@@ -55037,9 +47987,7 @@ msgstr "--[no-]validate"
 #: en/git-send-email.txt:416
 #, priority:100
 msgid "Perform sanity checks on patches.  Currently, validation means the following:"
-msgstr ""
-"Realize verificações de sanidade nos patches.  Atualmente, a validação "
-"significa o seguinte:"
+msgstr "Realize verificações de sanidade nos patches.  Atualmente, a validação significa o seguinte:"
 
 #. type: Plain text
 #: en/git-send-email.txt:419
@@ -55071,9 +48019,7 @@ msgstr ""
 #: en/git-send-email.txt:428
 #, priority:100
 msgid "Default is the value of `sendemail.validate`; if this is not set, default to `--validate`."
-msgstr ""
-"A predefinição é o valor do `sendemail.validate`; caso já não estiver "
-"definido, a predefinição retorna para `--validate`."
+msgstr "A predefinição é o valor do `sendemail.validate`; caso já não estiver definido, a predefinição retorna para `--validate`."
 
 #. type: Plain text
 #: en/git-send-email.txt:431
@@ -55097,12 +48043,7 @@ msgstr "--dump-aliases"
 #: en/git-send-email.txt:441
 #, priority:100
 msgid "Instead of the normal operation, dump the shorthand alias names from the configured alias file(s), one per line in alphabetical order. Note, this only includes the alias name and not its expanded email addresses.  See 'sendemail.aliasesfile' for more information about aliases."
-msgstr ""
-"Em vez da operação normal, despeje os nomes dos pseudônimos dos atalhos "
-"vindo do arquivo de configuração de pseudônimos, um por linha e em ordem "
-"alfabética. Observe que isso inclui apenas o pseudônimo e não os seus "
-"endereços de e-mail que foram expandidos.  Para obter mais informações sobre "
-"pseudônimos, consulte 'sendemail.aliasesfile'."
+msgstr "Em vez da operação normal, despeje os nomes dos pseudônimos dos atalhos vindo do arquivo de configuração de pseudônimos, um por linha e em ordem alfabética. Observe que isso inclui apenas o pseudônimo e não os seus endereços de e-mail que foram expandidos.  Para obter mais informações sobre pseudônimos, consulte 'sendemail.aliasesfile'."
 
 #. type: Labeled list
 #: en/git-send-email.txt:446
@@ -55114,10 +48055,7 @@ msgstr "sendemail.aliasesFile"
 #: en/git-send-email.txt:449
 #, priority:100
 msgid "To avoid typing long email addresses, point this to one or more email aliases files.  You must also supply `sendemail.aliasFileType`."
-msgstr ""
-"Para evitar a digitação dos longos endereços de e-mail, aponte para um ou "
-"mais arquivos aliases do e-mail.  Você também deve informar o `sendemail."
-"aliasFileType`."
+msgstr "Para evitar a digitação dos longos endereços de e-mail, aponte para um ou mais arquivos aliases do e-mail.  Você também deve informar o `sendemail.aliasFileType`."
 
 #. type: Labeled list
 #: en/git-send-email.txt:450
@@ -55129,18 +48067,13 @@ msgstr "sendemail.aliasFileType"
 #: en/git-send-email.txt:453
 #, priority:100
 msgid "Format of the file(s) specified in sendemail.aliasesFile. Must be one of 'mutt', 'mailrc', 'pine', 'elm', or 'gnus', or 'sendmail'."
-msgstr ""
-"Formato do(s) arquivo(s) definidos(s) em `sendemail.aliasesFile`. Deve ser "
-"'mutt', 'mailrc', 'pine', 'elm', 'gnus' ou 'sendmail'."
+msgstr "Formato do(s) arquivo(s) definidos(s) em `sendemail.aliasesFile`. Deve ser 'mutt', 'mailrc', 'pine', 'elm', 'gnus' ou 'sendmail'."
 
 #. type: Plain text
 #: en/git-send-email.txt:458
 #, priority:100
 msgid "What an alias file in each format looks like can be found in the documentation of the email program of the same name. The differences and limitations from the standard formats are described below:"
-msgstr ""
-"A aparência de um arquivo alias em cada formato pode ser encontrada na "
-"documentação do programa do e-mail com o mesmo nome. As diferenças e as "
-"limitações dos formatos predefinidas são descritas abaixo:"
+msgstr "A aparência de um arquivo alias em cada formato pode ser encontrada na documentação do programa do e-mail com o mesmo nome. As diferenças e as limitações dos formatos predefinidas são descritas abaixo:"
 
 #. type: Labeled list
 #: en/git-send-email.txt:460
@@ -55164,9 +48097,7 @@ msgstr "contenham o símbolo `\"` são ignorados."
 #: en/git-send-email.txt:464
 #, priority:100
 msgid "Redirection to a file (`/path/name`) or pipe (`|command`) is not"
-msgstr ""
-"O redirecionamento para um arquivo (`/nome/do/caminho`) ou pipe (`|comando`) "
-"não é"
+msgstr "O redirecionamento para um arquivo (`/nome/do/caminho`) ou pipe (`|comando`) não é"
 
 #. type: Plain text
 #: en/git-send-email.txt:465
@@ -55190,9 +48121,7 @@ msgstr "Os avisos são impressos na saída de erro predefinido para qualquer"
 #: en/git-send-email.txt:469
 #, priority:100
 msgid "explicitly unsupported constructs, and any other lines that are not recognized by the parser."
-msgstr ""
-"construções explicitamente não suportadas e quaisquer outras linhas que não "
-"sejam reconhecidas pelo analisador."
+msgstr "construções explicitamente não suportadas e quaisquer outras linhas que não sejam reconhecidas pelo analisador."
 
 #. type: Labeled list
 #: en/git-send-email.txt:471
@@ -55204,12 +48133,7 @@ msgstr "sendemail.multiEdit"
 #: en/git-send-email.txt:476
 #, priority:100
 msgid "If true (default), a single editor instance will be spawned to edit files you have to edit (patches when `--annotate` is used, and the summary when `--compose` is used). If false, files will be edited one after the other, spawning a new editor each time."
-msgstr ""
-"Caso o valor seja `true` (predefinido), uma única instância do editor será "
-"gerada para editar os arquivos que precisam ser editados (os patches quando "
-"`--annotate` é utilizado e o resumo quando `--compose` é utilizado). Caso o "
-"valor seja `false`, os arquivos serão editados um após o outro, onde um novo "
-"editor é aberto a cada vez."
+msgstr "Caso o valor seja `true` (predefinido), uma única instância do editor será gerada para editar os arquivos que precisam ser editados (os patches quando `--annotate` é utilizado e o resumo quando `--compose` é utilizado). Caso o valor seja `false`, os arquivos serão editados um após o outro, onde um novo editor é aberto a cada vez."
 
 #. type: Labeled list
 #: en/git-send-email.txt:477
@@ -55221,11 +48145,7 @@ msgstr "sendemail.confirm"
 #: en/git-send-email.txt:481
 #, priority:100
 msgid "Sets the default for whether to confirm before sending. Must be one of 'always', 'never', 'cc', 'compose', or 'auto'. See `--confirm` in the previous section for the meaning of these values."
-msgstr ""
-"Define a predefinição para confirmar antes do envio. Deve ser um de 'always' "
-"(sempre), 'never' (nunca), 'cc' (com cópia), 'compose' (compor) ou 'auto'. "
-"Consulte `--confirm` na seção anterior para obter o significado destes "
-"valores."
+msgstr "Define a predefinição para confirmar antes do envio. Deve ser um de 'always' (sempre), 'never' (nunca), 'cc' (com cópia), 'compose' (compor) ou 'auto'. Consulte `--confirm` na seção anterior para obter o significado destes valores."
 
 #. type: Title ~
 #: en/git-send-email.txt:485
@@ -55237,10 +48157,7 @@ msgstr "Utilize o gmail como servidor smtp"
 #: en/git-send-email.txt:488
 #, priority:100
 msgid "To use 'git send-email' to send your patches through the GMail SMTP server, edit ~/.gitconfig to specify your account settings:"
-msgstr ""
-"Para usar o 'git send-email' para enviar os seus patches através do servidor "
-"SMTP do GMail, edite '~/.gitconfig' para definir as configurações da sua "
-"conta:"
+msgstr "Para usar o 'git send-email' para enviar os seus patches através do servidor SMTP do GMail, edite '~/.gitconfig' para definir as configurações da sua conta:"
 
 #. type: delimited block -
 #: en/git-send-email.txt:495
@@ -55262,19 +48179,13 @@ msgstr ""
 #: en/git-send-email.txt:500
 #, priority:100
 msgid "If you have multifactor authentication setup on your gmail account, you will need to generate an app-specific password for use with 'git send-email'. Visit https://security.google.com/settings/security/apppasswords to create it."
-msgstr ""
-"Caso tenha uma configuração de autenticação de dois fatores na sua conta do "
-"Gmail, será necessário gerar uma senha específica do aplicativo para ser "
-"possível utilizar com o comando `git send-email`. Visite https://security."
-"google.com/settings/security/apppasswords para criá-la."
+msgstr "Caso tenha uma configuração de autenticação de dois fatores na sua conta do Gmail, será necessário gerar uma senha específica do aplicativo para ser possível utilizar com o comando `git send-email`. Visite https://security.google.com/settings/security/apppasswords para criá-la."
 
 #. type: Plain text
 #: en/git-send-email.txt:503
 #, priority:100
 msgid "Once your commits are ready to be sent to the mailing list, run the following commands:"
-msgstr ""
-"Quando os seus commits estiverem prontos para serem enviadas para a lista de "
-"discussão, execute os seguintes comandos:"
+msgstr "Quando os seus commits estiverem prontos para serem enviadas para a lista de discussão, execute os seguintes comandos:"
 
 #. type: Plain text
 #: en/git-send-email.txt:507
@@ -55298,11 +48209,7 @@ msgstr "As suas credenciais serão solicitadas na primeira vez em que você exec
 #: en/git-send-email.txt:518
 #, priority:100
 msgid "Note: the following core Perl modules that may be installed with your distribution of Perl are required: MIME::Base64, MIME::QuotedPrint, Net::Domain and Net::SMTP.  These additional Perl modules are also required: Authen::SASL and Mail::Address."
-msgstr ""
-"Observação: os seguintes módulos Perl talvez já estejam instalados com a sua "
-"distribuição Perl, caso contrário, estes módulos são necessários: MIME::"
-"Base64, MIME::QuotedPrint, Net::Domain e Net::SMTP.  Estes módulos Perl "
-"também são necessários: Authen::SASL and Mail::Address."
+msgstr "Observação: os seguintes módulos Perl talvez já estejam instalados com a sua distribuição Perl, caso contrário, estes módulos são necessários: MIME::Base64, MIME::QuotedPrint, Net::Domain e Net::SMTP.  Estes módulos Perl também são necessários: Authen::SASL and Mail::Address."
 
 #. type: Plain text
 #: en/git-send-email.txt:523
@@ -55320,9 +48227,7 @@ msgstr "git-send-pack(1)"
 #: en/git-send-pack.txt:7
 #, priority:100
 msgid "git-send-pack - Push objects over Git protocol to another repository"
-msgstr ""
-"git-send-pack - Impulsiona (push) os objetos através do protocolo Git para "
-"um outro repositório"
+msgstr "git-send-pack - Impulsiona (push) os objetos através do protocolo Git para um outro repositório"
 
 #. type: Plain text
 #: en/git-send-pack.txt:16
@@ -55333,8 +48238,7 @@ msgid ""
 "\t\t[--[no-]signed|--signed=(true|false|if-asked)]\n"
 "\t\t[<host>:]<directory> [<ref>...]\n"
 msgstr ""
-"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-"
-"pack>]\n"
+"'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]\n"
 "\t\t[--verbose] [--thin] [--atomic]\n"
 "\t\t[--[no-]signed|--signed=(true|false|if-asked)]\n"
 "\t\t[<host>:]<diretório> [<ref>...]\n"
@@ -55349,9 +48253,7 @@ msgstr "No lugar utilize 'git push' que é um wrapper de maior hierarquia deste
 #: en/git-send-pack.txt:24
 #, priority:100
 msgid "Invokes 'git-receive-pack' on a possibly remote repository, and updates it from the current repository, sending named refs."
-msgstr ""
-"Invoca o comando 'git-receive-pack' em um repositório possivelmente remoto e "
-"atualiza-o a partir do repositório atual, enviando determinados refs."
+msgstr "Invoca o comando 'git-receive-pack' em um repositório possivelmente remoto e atualiza-o a partir do repositório atual, enviando determinados refs."
 
 #. type: Plain text
 #: en/git-send-pack.txt:36
@@ -55363,17 +48265,13 @@ msgstr "O mesmo que --receive-pack=<git-receive-pack>."
 #: en/git-send-pack.txt:40
 #, priority:100
 msgid "Instead of explicitly specifying which refs to update, update all heads that locally exist."
-msgstr ""
-"Em vez de definir de forma explicita quais são referências que devem ser "
-"atualizadas, atualize todos os cabeçalhos que existam localmente."
+msgstr "Em vez de definir de forma explicita quais são referências que devem ser atualizadas, atualize todos os cabeçalhos que existam localmente."
 
 #. type: Plain text
 #: en/git-send-pack.txt:67
 #, priority:100
 msgid "Send a \"thin\" pack, which records objects in deltified form based on objects not included in the pack to reduce network traffic."
-msgstr ""
-"Envie um pacote \"thin\", que registra os objetos no formato \"deltificado\" "
-"com base nos objetos não inclusos no pacote para reduzir o tráfego de rede."
+msgstr "Envie um pacote \"thin\", que registra os objetos no formato \"deltificado\" com base nos objetos não inclusos no pacote para reduzir o tráfego de rede."
 
 #. type: Labeled list
 #: en/git-send-pack.txt:68
@@ -55385,9 +48283,7 @@ msgstr "--atomic"
 #: en/git-send-pack.txt:72
 #, priority:100
 msgid "Use an atomic transaction for updating the refs. If any of the refs fails to update then the entire push will fail without changing any refs."
-msgstr ""
-"Use uma transação atômica para atualizar as refs. Caso alguma das refs "
-"falhem na atualização, todo o \"push\" falhará sem alterar nenhuma das refs."
+msgstr "Use uma transação atômica para atualizar as refs. Caso alguma das refs falhem na atualização, todo o \"push\" falhará sem alterar nenhuma das refs."
 
 #. type: Labeled list
 #: en/git-send-pack.txt:84
@@ -55411,9 +48307,7 @@ msgstr "<host>"
 #: en/git-send-pack.txt:94
 #, priority:100
 msgid "A remote host to house the repository.  When this part is specified, 'git-receive-pack' is invoked via ssh."
-msgstr ""
-"Um host remoto para hospedar o repositório.  Quando esta parte for definida, "
-"o comando 'git-receive-pack' é chamado através do ssh."
+msgstr "Um host remoto para hospedar o repositório.  Quando esta parte for definida, o comando 'git-receive-pack' é chamado através do ssh."
 
 #. type: Plain text
 #: en/git-send-pack.txt:97
@@ -55425,37 +48319,25 @@ msgstr "O repositório que será atualizado."
 #: en/git-send-pack.txt:107
 #, priority:100
 msgid "There are three ways to specify which refs to update on the remote end."
-msgstr ""
-"Existem três maneiras para definir quais as refs devem ser atualizadas na "
-"extremidade remota."
+msgstr "Existem três maneiras para definir quais as refs devem ser atualizadas na extremidade remota."
 
 #. type: Plain text
 #: en/git-send-pack.txt:111
 #, priority:100
 msgid "With `--all` flag, all refs that exist locally are transferred to the remote side.  You cannot specify any '<ref>' if you use this flag."
-msgstr ""
-"Com a opção `--all`, todos as refs existentes localmente são transferidos "
-"para o lado remoto.  Você não pode definir qualquer '<ref>' caso você "
-"utilize está opção."
+msgstr "Com a opção `--all`, todos as refs existentes localmente são transferidos para o lado remoto.  Você não pode definir qualquer '<ref>' caso você utilize está opção."
 
 #. type: Plain text
 #: en/git-send-pack.txt:114
 #, priority:100
 msgid "Without `--all` and without any '<ref>', the heads that exist both on the local side and on the remote side are updated."
-msgstr ""
-"Sem `--all` e sem qualquer '<ref>', os cabeçalhos existentes no lado local e "
-"no lado remoto são atualizadas."
+msgstr "Sem `--all` e sem qualquer '<ref>', os cabeçalhos existentes no lado local e no lado remoto são atualizadas."
 
 #. type: Plain text
 #: en/git-send-pack.txt:120
 #, priority:100
 msgid "When one or more '<ref>' are specified explicitly (whether on the command line or via `--stdin`), it can be either a single pattern, or a pair of such pattern separated by a colon \":\" (this means that a ref name cannot have a colon in it).  A single pattern '<name>' is just a shorthand for '<name>:<name>'."
-msgstr ""
-"Quando uma ou mais '<ref>' sejam definidas de forma explicita (seja através "
-"da linha do comando ou através da opção `--stdin`), pode ser um único padrão "
-"ou o par deles separados por dois pontos \":\" (significa que o nome da \"ref"
-"\" não pode ter dois pontos).  Um único padrão '<nome>' é apenas uma "
-"abreviação para '<nome>:<nome>'."
+msgstr "Quando uma ou mais '<ref>' sejam definidas de forma explicita (seja através da linha do comando ou através da opção `--stdin`), pode ser um único padrão ou o par deles separados por dois pontos \":\" (significa que o nome da \"ref\" não pode ter dois pontos).  Um único padrão '<nome>' é apenas uma abreviação para '<nome>:<nome>'."
 
 #. type: Plain text
 #: en/git-send-pack.txt:128
@@ -55497,12 +48379,7 @@ msgstr ""
 #: en/git-shell.txt:23
 #, priority:100
 msgid "This is a login shell for SSH accounts to provide restricted Git access.  It permits execution only of server-side Git commands implementing the pull/push functionality, plus custom commands present in a subdirectory named `git-shell-commands` in the user's home directory."
-msgstr ""
-"Este é um shell de login para contas SSH para fornecer acesso restrito ao "
-"Git.  Ele permite a execução apenas dos comandos Git do lado do servidor, "
-"implementando a funcionalidade 'pull/push', além dos comandos personalizados "
-"presentes em um subdiretório chamado `git shell command` no diretório "
-"inicial do usuário."
+msgstr "Este é um shell de login para contas SSH para fornecer acesso restrito ao Git.  Ele permite a execução apenas dos comandos Git do lado do servidor, implementando a funcionalidade 'pull/push', além dos comandos personalizados presentes em um subdiretório chamado `git shell command` no diretório inicial do usuário."
 
 #. type: Plain text
 #: en/git-shell.txt:28
@@ -55532,9 +48409,7 @@ msgstr "'git upload-archive <argumento>'"
 #: en/git-shell.txt:35
 #, priority:100
 msgid "Call the corresponding server-side command to support the client's 'git push', 'git fetch', or 'git archive --remote' request."
-msgstr ""
-"Chame o comando correspondente do lado do servidor para apoiar a solicitação "
-"do comando 'git push', 'git fetch' ou 'git archive --remote' do cliente."
+msgstr "Chame o comando correspondente do lado do servidor para apoiar a solicitação do comando 'git push', 'git fetch' ou 'git archive --remote' do cliente."
 
 #. type: Labeled list
 #: en/git-shell.txt:35
@@ -55552,10 +48427,7 @@ msgstr "Imite um servidor CVS.  Consulte linkgit:git-cvsserver[1]."
 #: en/git-shell.txt:42
 #, priority:100
 msgid "If a `~/git-shell-commands` directory is present, 'git shell' will also handle other, custom commands by running \"`git-shell-commands/<command> <arguments>`\" from the user's home directory."
-msgstr ""
-"Caso um diretório `~/git-shell-command` estiver presente, o comando 'git "
-"shell' também manipulará outros comandos personalizados executando \"`git-"
-"shell-commands/<comando> <argumentos>`\" no diretório inicial do usuário."
+msgstr "Caso um diretório `~/git-shell-command` estiver presente, o comando 'git shell' também manipulará outros comandos personalizados executando \"`git-shell-commands/<comando> <argumentos>`\" no diretório inicial do usuário."
 
 #. type: Title -
 #: en/git-shell.txt:44
@@ -55567,40 +48439,25 @@ msgstr "USO INTERATIVO"
 #: en/git-shell.txt:48
 #, priority:100
 msgid "By default, the commands above can be executed only with the `-c` option; the shell is not interactive."
-msgstr ""
-"É predefinido que os comandos acima possam ser executados apenas com a opção "
-"`-c`; o shell não é interativo."
+msgstr "É predefinido que os comandos acima possam ser executados apenas com a opção `-c`; o shell não é interativo."
 
 #. type: Plain text
 #: en/git-shell.txt:56
 #, priority:100
 msgid "If a `~/git-shell-commands` directory is present, 'git shell' can also be run interactively (with no arguments).  If a `help` command is present in the `git-shell-commands` directory, it is run to provide the user with an overview of allowed actions.  Then a \"git> \" prompt is presented at which one can enter any of the commands from the `git-shell-commands` directory, or `exit` to close the connection."
-msgstr ""
-"Caso um diretório `~/git-shell-command` estiver presente, o comando 'git "
-"shell' também poderá ser executado interativamente (sem argumentos).  Caso "
-"um comando `help` estiver presente no diretório `git-shell-command`, ele "
-"será executado para fornecer ao usuário uma visão geral das ações que são "
-"permitidas.  Em seguida, é apresentado um prompt \"git>\", onde é possível "
-"digitar qualquer um dos comandos do diretório `git-shell-command`, ou `exit` "
-"para encerrar a conexão."
+msgstr "Caso um diretório `~/git-shell-command` estiver presente, o comando 'git shell' também poderá ser executado interativamente (sem argumentos).  Caso um comando `help` estiver presente no diretório `git-shell-command`, ele será executado para fornecer ao usuário uma visão geral das ações que são permitidas.  Em seguida, é apresentado um prompt \"git>\", onde é possível digitar qualquer um dos comandos do diretório `git-shell-command`, ou `exit` para encerrar a conexão."
 
 #. type: Plain text
 #: en/git-shell.txt:61
 #, priority:100
 msgid "Generally this mode is used as an administrative interface to allow users to list repositories they have access to, create, delete, or rename repositories, or change repository descriptions and permissions."
-msgstr ""
-"Em geral, este modo é utilizado como uma interface administrativa para "
-"permitir que os usuários listem os repositórios dos quais eles têm acesso "
-"para, criar, excluir ou renomear os repositórios ou alterar as descrições e "
-"permissões do mesmo."
+msgstr "Em geral, este modo é utilizado como uma interface administrativa para permitir que os usuários listem os repositórios dos quais eles têm acesso para, criar, excluir ou renomear os repositórios ou alterar as descrições e permissões do mesmo."
 
 #. type: Plain text
 #: en/git-shell.txt:64
 #, priority:100
 msgid "If a `no-interactive-login` command exists, then it is run and the interactive shell is aborted."
-msgstr ""
-"Caso um comando `no-interactive-login` existir, ele será executado e o shell "
-"interativo será abortado."
+msgstr "Caso um comando `no-interactive-login` existir, ele será executado e o shell interativo será abortado."
 
 #. type: Plain text
 #: en/git-shell.txt:69
@@ -55626,10 +48483,8 @@ msgstr ""
 "$ mkdir $HOME/git-shell-commands\n"
 "$ cat >$HOME/git-shell-commands/no-interactive-login <<\\EOF\n"
 "#!/bin/sh\n"
-"printf '%s\\n"
-"' \"Olá $USER! Você se autenticou com sucesso, porém eu não\"\n"
-"printf '%s\\n"
-"' \"forneço um acesso interativo ao shell.\"\n"
+"printf '%s\\n' \"Olá $USER! Você se autenticou com sucesso, porém eu não\"\n"
+"printf '%s\\n' \"forneço um acesso interativo ao shell.\"\n"
 "exit 128\n"
 "EOF\n"
 "$ chmod +x $HOME/git-shell-commands/no-interactive-login\n"
@@ -55638,10 +48493,7 @@ msgstr ""
 #: en/git-shell.txt:85
 #, priority:100
 msgid "To enable git-cvsserver access (which should generally have the `no-interactive-login` example above as a prerequisite, as creating the git-shell-commands directory allows interactive logins):"
-msgstr ""
-"Para habilitar o acesso ao 'git cvsserver' (que geralmente deve ter o "
-"exemplo `no-interactive-login` acima) como um pré-requisito, como criando o "
-"diretório `git-shell-commands` permite logins interativos):"
+msgstr "Para habilitar o acesso ao 'git cvsserver' (que geralmente deve ter o exemplo `no-interactive-login` acima) como um pré-requisito, como criando o diretório `git-shell-commands` permite logins interativos):"
 
 #. type: delimited block -
 #: en/git-shell.txt:96
@@ -55683,8 +48535,7 @@ msgstr "git-sh-i18n{litdd}envsubst(1)"
 #: en/git-sh-i18n--envsubst.txt:7
 #, priority:100
 msgid "git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks"
-msgstr ""
-"git-sh-i18n--envsubst - O próprio envsubst(1) do Git para fallbacks do i18n"
+msgstr "git-sh-i18n--envsubst - O próprio envsubst(1) do Git para fallbacks do i18n"
 
 #. type: Plain text
 #: en/git-sh-i18n--envsubst.txt:17
@@ -55708,28 +48559,19 @@ msgstr ""
 #: en/git-sh-i18n--envsubst.txt:24
 #, priority:100
 msgid "This is not a command the end user would want to run.  Ever.  This documentation is meant for people who are studying the plumbing scripts and/or are writing new ones."
-msgstr ""
-"Este não é um comando que o usuário final gostaria de executar.  Nunca.  "
-"Esta documentação é destinada para as pessoas que estudam os scripts "
-"\"plumbing\" e/ou estão escrevendo novos."
+msgstr "Este não é um comando que o usuário final gostaria de executar.  Nunca.  Esta documentação é destinada para as pessoas que estudam os scripts \"plumbing\" e/ou estão escrevendo novos."
 
 #. type: Plain text
 #: en/git-sh-i18n--envsubst.txt:29
 #, priority:100
 msgid "'git sh-i18n{litdd}envsubst' is Git's stripped-down copy of the GNU `envsubst(1)` program that comes with the GNU gettext package. It's used internally by linkgit:git-sh-i18n[1] to interpolate the variables passed to the `eval_gettext` function."
-msgstr ""
-"O comando 'git sh-i18n {litdd} envsubst' é uma cópia simplificada do Git do "
-"programa GNU `envsubst(1)` que vem com o pacote gettext do GNU. É utilizado "
-"internamente através do linkgit:git-sh-i18n[1] para interpolar as variáveis "
-"encaminhadas para a função `eval_gettext`."
+msgstr "O comando 'git sh-i18n {litdd} envsubst' é uma cópia simplificada do Git do programa GNU `envsubst(1)` que vem com o pacote gettext do GNU. É utilizado internamente através do linkgit:git-sh-i18n[1] para interpolar as variáveis encaminhadas para a função `eval_gettext`."
 
 #. type: Plain text
 #: en/git-sh-i18n--envsubst.txt:33
 #, priority:100
 msgid "No promises are made about the interface, or that this program won't disappear without warning in the next version of Git. Don't use it."
-msgstr ""
-"Nenhuma promessa é feita sobre a interface ou que este programa não "
-"desaparecerá sem aviso prévio na próxima versão do Git. Não use."
+msgstr "Nenhuma promessa é feita sobre a interface ou que este programa não desaparecerá sem aviso prévio na próxima versão do Git. Não use."
 
 #. type: Title =
 #: en/git-sh-i18n.txt:2
@@ -55753,12 +48595,7 @@ msgstr "'. \"$(git --exec-path)/git-sh-i18n\"'\n"
 #: en/git-sh-i18n.txt:26
 #, priority:100
 msgid "The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's porcelain programs implemented in shell script. It provides wrappers for the GNU `gettext` and `eval_gettext` functions accessible through the `gettext.sh` script, and provides pass-through fallbacks on systems without GNU gettext."
-msgstr ""
-"O script 'git sh-i18n' foi projetado para ser obtido (utilizando `.`) pelos "
-"programas de porcelana do Git implementados no shell script. Ele fornece "
-"\"wrappers\" para as funções GNU `gettext` e `eval_gettext` acessíveis "
-"através do script `gettext.sh`, e oferece retroatividade com passagem direta "
-"nos sistemas sem o GNU gettext."
+msgstr "O script 'git sh-i18n' foi projetado para ser obtido (utilizando `.`) pelos programas de porcelana do Git implementados no shell script. Ele fornece \"wrappers\" para as funções GNU `gettext` e `eval_gettext` acessíveis através do script `gettext.sh`, e oferece retroatividade com passagem direta nos sistemas sem o GNU gettext."
 
 #. type: Labeled list
 #: en/git-sh-i18n.txt:30
@@ -55770,10 +48607,7 @@ msgstr "gettext"
 #: en/git-sh-i18n.txt:34
 #, priority:100
 msgid "Currently a dummy fall-through function implemented as a wrapper around `printf(1)`. Will be replaced by a real gettext implementation in a later version."
-msgstr ""
-"Atualmente uma função fictícia `fall-through` implementada como um invólucro "
-"'wrapper' em torno do `printf(1)`. Será substituído por uma implementação "
-"'gettext' real em uma versão posterior."
+msgstr "Atualmente uma função fictícia `fall-through` implementada como um invólucro 'wrapper' em torno do `printf(1)`. Será substituído por uma implementação 'gettext' real em uma versão posterior."
 
 #. type: Labeled list
 #: en/git-sh-i18n.txt:35
@@ -55785,11 +48619,7 @@ msgstr "eval_gettext"
 #: en/git-sh-i18n.txt:40
 #, priority:100
 msgid "Currently a dummy fall-through function implemented as a wrapper around `printf(1)` with variables expanded by the linkgit:git-sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext implementation in a later version."
-msgstr ""
-"Atualmente uma função fictícia `fall-through` implementada como um invólucro "
-"'wrapper' em torno do `printf(1)` com as variáveis expandidas através do "
-"auxiliar linkgit:git-sh-i18n{litdd}envsubst[1]. Será substituído por uma "
-"implementação 'gettext' real em uma versão posterior."
+msgstr "Atualmente uma função fictícia `fall-through` implementada como um invólucro 'wrapper' em torno do `printf(1)` com as variáveis expandidas através do auxiliar linkgit:git-sh-i18n{litdd}envsubst[1]. Será substituído por uma implementação 'gettext' real em uma versão posterior."
 
 #. type: Title =
 #: en/git-shortlog.txt:2
@@ -55817,9 +48647,7 @@ msgstr ""
 #: en/git-shortlog.txt:18
 #, priority:260
 msgid "Summarizes 'git log' output in a format suitable for inclusion in release announcements. Each commit will be grouped by author and title."
-msgstr ""
-"Resume a saída 'git log' em um formato adequado para inclusão nos anúncios "
-"de lançamento. Cada commit será agrupada por autor e título."
+msgstr "Resume a saída 'git log' em um formato adequado para inclusão nos anúncios de lançamento. Cada commit será agrupada por autor e título."
 
 #. type: Plain text
 #: en/git-shortlog.txt:20
@@ -55831,11 +48659,7 @@ msgstr "Além disso, o \"[PATCH]\" será retirado da descrição do commit."
 #: en/git-shortlog.txt:25
 #, priority:260
 msgid "If no revisions are passed on the command line and either standard input is not a terminal or there is no current branch, 'git shortlog' will output a summary of the log read from standard input, without reference to the current repository."
-msgstr ""
-"Caso nenhuma revisão seja aprovada na linha de comando e a entrada padrão "
-"não seja um terminal ou não houver uma ramificação atual, o `git shortlog` "
-"exibirá um resumo do registro log lido da entrada padrão, sem referência ao "
-"repositório atual."
+msgstr "Caso nenhuma revisão seja aprovada na linha de comando e a entrada padrão não seja um terminal ou não houver uma ramificação atual, o `git shortlog` exibirá um resumo do registro log lido da entrada padrão, sem referência ao repositório atual."
 
 #. type: Plain text
 #: en/git-shortlog.txt:33
@@ -55871,11 +48695,7 @@ msgstr "--format[=<formato>]"
 #: en/git-shortlog.txt:47
 #, priority:260
 msgid "Instead of the commit subject, use some other information to describe each commit.  '<format>' can be any string accepted by the `--format` option of 'git log', such as '* [%h] %s'.  (See the \"PRETTY FORMATS\" section of linkgit:git-log[1].)"
-msgstr ""
-"Em vez do assunto do commit, utilize outras informações para descrever cada "
-"commit.  O '<formato>' pode ser qualquer texto aceito pela opção `--format` "
-"do comando 'git log', assim como '* [%h] %s'.  (Consulte a seção \"FORMATOS "
-"BONITOS\" do linkgit:git-log[1].)"
+msgstr "Em vez do assunto do commit, utilize outras informações para descrever cada commit.  O '<formato>' pode ser qualquer texto aceito pela opção `--format` do comando 'git log', assim como '* [%h] %s'.  (Consulte a seção \"FORMATOS BONITOS\" do linkgit:git-log[1].)"
 
 #. type: Plain text
 #: en/git-shortlog.txt:49
@@ -55905,12 +48725,7 @@ msgstr "-w[<largura>[,<recuo1>[,<recuo2>]]]"
 #: en/git-shortlog.txt:59
 #, priority:260
 msgid "Linewrap the output by wrapping each line at `width`.  The first line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively."
-msgstr ""
-"Limite o tamanho das linhas geradas, quebrando a linha através da sua "
-"`largura`.  A primeira linha de cada entrada é recuada pelos espaços `recuo1`"
-", assim como a segunda linha junto com as próximas, são recuadas pelos "
-"espaços `recuo2`. A `largura`, `recuo1`, e `recuo2` estão predefinidos para "
-"76, 6 e 9 caracteres, respectivamente."
+msgstr "Limite o tamanho das linhas geradas, quebrando a linha através da sua `largura`.  A primeira linha de cada entrada é recuada pelos espaços `recuo1`, assim como a segunda linha junto com as próximas, são recuadas pelos espaços `recuo2`. A `largura`, `recuo1`, e `recuo2` estão predefinidos para 76, 6 e 9 caracteres, respectivamente."
 
 #. type: Plain text
 #: en/git-shortlog.txt:62
@@ -55922,14 +48737,7 @@ msgstr "Caso a largura seja `0` (zero), recue as linhas da saída sem quebrá-la
 #: en/git-shortlog.txt:71
 #, priority:260
 msgid "Show only commits in the specified revision range.  When no <revision range> is specified, it defaults to `HEAD` (i.e. the whole history leading to the current commit).  `origin..HEAD` specifies all the commits reachable from the current commit (i.e. `HEAD`), but not from `origin`. For a complete list of ways to spell <revision range>, see the \"Specifying Ranges\" section of linkgit:gitrevisions[7]."
-msgstr ""
-"Exibe apenas os commits no intervalo definido das revisões.  Quando um "
-"<intervalo de revisão> não é definido, a predefinição retorna para `HEAD` ("
-"ou seja, todo o histórico que leva ao commit atual).  O `origin..HEAD` "
-"define todos os commits acessíveis a partir do commit atual (ou seja, `HEAD`)"
-", porém não a partir do `origin`. Para uma lista mais completa das maneiras "
-"de escrever os nomes dos objetos, consulte a seção \"DEFININDO AS REVISÕES\" "
-"no linkgit:gitrevisions[7]."
+msgstr "Exibe apenas os commits no intervalo definido das revisões.  Quando um <intervalo de revisão> não é definido, a predefinição retorna para `HEAD` (ou seja, todo o histórico que leva ao commit atual).  O `origin..HEAD` define todos os commits acessíveis a partir do commit atual (ou seja, `HEAD`), porém não a partir do `origin`. Para uma lista mais completa das maneiras de escrever os nomes dos objetos, consulte a seção \"DEFININDO AS REVISÕES\" no linkgit:gitrevisions[7]."
 
 #. type: Plain text
 #: en/git-shortlog.txt:75
@@ -55977,10 +48785,7 @@ msgstr ""
 #: en/git-show-branch.txt:24
 #, priority:100
 msgid "Shows the commit ancestry graph starting from the commits named with <rev>s or <glob>s (or all refs under refs/heads and/or refs/tags) semi-visually."
-msgstr ""
-"Exibe o grafo da ancestralidade do commit, começando pelos commits "
-"informados com <rev>s ou <glob>s (ou todos as refs em 'refs/heads' e/ou '"
-"refs/tags') de forma semi-visual."
+msgstr "Exibe o grafo da ancestralidade do commit, começando pelos commits informados com <rev>s ou <glob>s (ou todos as refs em 'refs/heads' e/ou 'refs/tags') de forma semi-visual."
 
 #. type: Plain text
 #: en/git-show-branch.txt:26
@@ -55992,9 +48797,7 @@ msgstr "Não pode exibir mais de 29 ramificações e commits por vez."
 #: en/git-show-branch.txt:29
 #, priority:100
 msgid "It uses `showbranch.default` multi-valued configuration items if no <rev> or <glob> is given on the command line."
-msgstr ""
-"Ele utiliza itens de configuração `showbranch.default` com vários valores "
-"caso nenhuma <rev> ou <glob> seja utilizado na linha de comando."
+msgstr "Ele utiliza itens de configuração `showbranch.default` com vários valores caso nenhuma <rev> ou <glob> seja utilizado na linha de comando."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:33
@@ -56006,9 +48809,7 @@ msgstr "<rev>"
 #: en/git-show-branch.txt:36
 #, priority:100
 msgid "Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7])  that typically names a branch head or a tag."
-msgstr ""
-"A expressão arbitrária estendida do SHA-1 (consulte linkgit:gitrevisions[7]) "
-"que normalmente informa o cabeçalho de um ramo ou uma tag."
+msgstr "A expressão arbitrária estendida do SHA-1 (consulte linkgit:gitrevisions[7]) que normalmente informa o cabeçalho de um ramo ou uma tag."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:37
@@ -56020,10 +48821,7 @@ msgstr "<glob>"
 #: en/git-show-branch.txt:42
 #, priority:100
 msgid "A glob pattern that matches branch or tag names under refs/.  For example, if you have many topic branches under refs/heads/topic, giving `topic/*` would show all of them."
-msgstr ""
-"Um padrão \"glob\" que corresponda aos nomes dos ramos ou tags nos refs/.  "
-"Caso você tenha muitos tópicos nos ramos em 'refs/heads/topic', informando `"
-"topic/*` exibiria todas elas."
+msgstr "Um padrão \"glob\" que corresponda aos nomes dos ramos ou tags nos refs/.  Caso você tenha muitos tópicos nos ramos em 'refs/heads/topic', informando `topic/*` exibiria todas elas."
 
 #. type: Plain text
 #: en/git-show-branch.txt:46
@@ -56047,9 +48845,7 @@ msgstr "--current"
 #: en/git-show-branch.txt:55
 #, priority:100
 msgid "With this option, the command includes the current branch to the list of revs to be shown when it is not given on the command line."
-msgstr ""
-"Com esta opção, o comando inclui o ramo atual na lista das \"revs\" que "
-"serão exibidas quando não for utilizada na linha de comando."
+msgstr "Com esta opção, o comando inclui o ramo atual na lista das \"revs\" que serão exibidas quando não for utilizada na linha de comando."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:56 en/rev-list-options.txt:791
@@ -56061,11 +48857,7 @@ msgstr "--topo-order"
 #: en/git-show-branch.txt:61
 #, priority:100
 msgid "By default, the branches and their commits are shown in reverse chronological order.  This option makes them appear in topological order (i.e., descendant commits are shown before their parents)."
-msgstr ""
-"É predefinido que os ramos e seus commits sejam exibidos em ordem "
-"cronológica inversa.  Esta opção faz com que eles apareçam em ordem "
-"topológica (ou seja, os commits descendentes são exibidos antes dos "
-"parentes)."
+msgstr "É predefinido que os ramos e seus commits sejam exibidos em ordem cronológica inversa.  Esta opção faz com que eles apareçam em ordem topológica (ou seja, os commits descendentes são exibidos antes dos parentes)."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:62 en/rev-list-options.txt:783
@@ -56077,18 +48869,13 @@ msgstr "--date-order"
 #: en/git-show-branch.txt:66
 #, priority:100
 msgid "This option is similar to `--topo-order` in the sense that no parent comes before all of its children, but otherwise commits are ordered according to their commit date."
-msgstr ""
-"Essa opção é semelhante à `--topo-order`, no sentido onde nenhum pai vem "
-"antes de todos os herdeiros, porém, caso contrário, os commits são ordenadas "
-"de acordo com a data do commits."
+msgstr "Essa opção é semelhante à `--topo-order`, no sentido onde nenhum pai vem antes de todos os herdeiros, porém, caso contrário, os commits são ordenadas de acordo com a data do commits."
 
 #. type: Plain text
 #: en/git-show-branch.txt:71
 #, priority:100
 msgid "By default, the output omits merges that are reachable from only one tip being shown.  This option makes them visible."
-msgstr ""
-"É predefinido que a saída omita as mesclagens que sejam acessíveis apenas do "
-"cume que está sendo exibido.  Esta opção os torna visíveis."
+msgstr "É predefinido que a saída omita as mesclagens que sejam acessíveis apenas do cume que está sendo exibido.  Esta opção os torna visíveis."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:72
@@ -56100,12 +48887,7 @@ msgstr "--more=<n>"
 #: en/git-show-branch.txt:79
 #, priority:100
 msgid "Usually the command stops output upon showing the commit that is the common ancestor of all the branches.  This flag tells the command to go <n> more common commits beyond that.  When <n> is negative, display only the <reference>s given, without showing the commit ancestry tree."
-msgstr ""
-"Normalmente, o comando interrompe a saída durante a exibição do commit que "
-"for o ancestral comum de todos os ramos.  Esta opção diz ao comando para ir "
-"até <n> commits além disso.  Quando o valor de <n> for negativo, exiba "
-"apenas os `<reference>` informados, sem exibir ancestralidade da árvore do "
-"commit ."
+msgstr "Normalmente, o comando interrompe a saída durante a exibição do commit que for o ancestral comum de todos os ramos.  Esta opção diz ao comando para ir até <n> commits além disso.  Quando o valor de <n> for negativo, exiba apenas os `<reference>` informados, sem exibir ancestralidade da árvore do commit ."
 
 #. type: Plain text
 #: en/git-show-branch.txt:82
@@ -56123,19 +48905,13 @@ msgstr "--merge-base"
 #: en/git-show-branch.txt:89
 #, priority:100
 msgid "Instead of showing the commit list, determine possible merge bases for the specified commits. All merge bases will be contained in all specified commits. This is different from how linkgit:git-merge-base[1] handles the case of three or more commits."
-msgstr ""
-"Em vez de exibir a lista do commit, determine as possíveis bases para "
-"mesclagem para determinados commits. Todas as mesclagens das bases estarão "
-"contidas em todos os commits informados. Isso é diferente de como o linkgit"
-":git-merge-base[1] lida com o caso de três ou mais commits."
+msgstr "Em vez de exibir a lista do commit, determine as possíveis bases para mesclagem para determinados commits. Todas as mesclagens das bases estarão contidas em todos os commits informados. Isso é diferente de como o linkgit:git-merge-base[1] lida com o caso de três ou mais commits."
 
 #. type: Plain text
 #: en/git-show-branch.txt:93
 #, priority:100
 msgid "Among the <reference>s given, display only the ones that cannot be reached from any other <reference>."
-msgstr ""
-"Entre as <referências> informadas, exiba apenas as que não podem ser "
-"alcançadas a partir de nenhuma outra <referência>."
+msgstr "Entre as <referências> informadas, exiba apenas as que não podem ser alcançadas a partir de nenhuma outra <referência>."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:94
@@ -56159,10 +48935,7 @@ msgstr "--sha1-name"
 #: en/git-show-branch.txt:102
 #, priority:100
 msgid "Instead of naming the commits using the path to reach them from heads (e.g. \"master~2\" to mean the grandparent of \"master\"), name them with the unique prefix of their object names."
-msgstr ""
-"Em vez de nomear os commits utilizando o caminho para alcançá-los através "
-"dos cabeçalhos (\"master~2\" para significar o avô do \"master\" por exemplo)"
-", nomeie-os com o prefixo exclusivo dos nomes dos seus objetos."
+msgstr "Em vez de nomear os commits utilizando o caminho para alcançá-los através dos cabeçalhos (\"master~2\" para significar o avô do \"master\" por exemplo), nomeie-os com o prefixo exclusivo dos nomes dos seus objetos."
 
 #. type: Labeled list
 #: en/git-show-branch.txt:103
@@ -56174,12 +48947,7 @@ msgstr "--topics"
 #: en/git-show-branch.txt:110
 #, priority:100
 msgid "Shows only commits that are NOT on the first branch given.  This helps track topic branches by hiding any commit that is already in the main line of development.  When given \"git show-branch --topics master topic1 topic2\", this will show the revisions given by \"git rev-list {caret}master topic1 topic2\""
-msgstr ""
-"Exibe apenas os commits que NÃO estão no primeiro ramo informado.  Isso "
-"ajuda a monitorar o tópico das ramificações ocultando qualquer commit que já "
-"esteja na linha principal de desenvolvimento.  Quando o comando `git show-"
-"branch --topics master topic1 topic2` for utilizado, isso mostra as revisões "
-"fornecidas pelo comando `git rev-list {caret}master topic1 topic2`"
+msgstr "Exibe apenas os commits que NÃO estão no primeiro ramo informado.  Isso ajuda a monitorar o tópico das ramificações ocultando qualquer commit que já esteja na linha principal de desenvolvimento.  Quando o comando `git show-branch --topics master topic1 topic2` for utilizado, isso mostra as revisões fornecidas pelo comando `git rev-list {caret}master topic1 topic2`"
 
 #. type: Labeled list
 #: en/git-show-branch.txt:112
@@ -56191,12 +48959,7 @@ msgstr "--reflog[=<n>[,<base>]] [<ref>]"
 #: en/git-show-branch.txt:118
 #, priority:100
 msgid "Shows <n> most recent ref-log entries for the given ref.  If <base> is given, <n> entries going back from that entry.  <base> can be specified as count or date.  When no explicit <ref> parameter is given, it defaults to the current branch (or `HEAD` if it is detached)."
-msgstr ""
-"Mostra <n> lançamentos mais recentes do 'ref-log' para uma determinada \"ref"
-"\".  Caso a <base> seja utilizado, os <n> lançamentos retornam daquela "
-"lançamento.  A opção <base> pode ser definida como uma contagem ou data.  "
-"Quando nenhum parâmetro explícito <ref> é utilizado, a predefinição retorna "
-"para o ramo atual (ou `HEAD` caso esteja desanexado)."
+msgstr "Mostra <n> lançamentos mais recentes do 'ref-log' para uma determinada \"ref\".  Caso a <base> seja utilizado, os <n> lançamentos retornam daquela lançamento.  A opção <base> pode ser definida como uma contagem ou data.  Quando nenhum parâmetro explícito <ref> é utilizado, a predefinição retorna para o ramo atual (ou `HEAD` caso esteja desanexado)."
 
 #. type: Plain text
 #: en/git-show-branch.txt:123
@@ -56214,39 +48977,25 @@ msgstr "Turn off colored output, even when the configuration file gives the defa
 #: en/git-show-branch.txt:131
 #, priority:100
 msgid "Note that --more, --list, --independent and --merge-base options are mutually exclusive."
-msgstr ""
-"Observe que as opções `--more`, `--list`, `--independent` e `--merge-base` "
-"são mutuamente exclusivas."
+msgstr "Observe que as opções `--more`, `--list`, `--independent` e `--merge-base` são mutuamente exclusivas."
 
 #. type: Plain text
 #: en/git-show-branch.txt:139
 #, priority:100
 msgid "Given N <references>, the first N lines are the one-line description from their commit message.  The branch head that is pointed at by $GIT_DIR/HEAD is prefixed with an asterisk `*` character while other heads are prefixed with a `!` character."
-msgstr ""
-"Dadas as \"N\" <referências>, as primeiras \"N\" linhas são a descrição de "
-"uma linha da mensagem do commit.  O cabeçalho do ramo apontada para `$"
-"GIT_DIR/HEAD` é prefixada com um caractere asterisco `*` enquanto outros "
-"cabeçalhos são prefixadas com um caractere `!`."
+msgstr "Dadas as \"N\" <referências>, as primeiras \"N\" linhas são a descrição de uma linha da mensagem do commit.  O cabeçalho do ramo apontada para `$GIT_DIR/HEAD` é prefixada com um caractere asterisco `*` enquanto outros cabeçalhos são prefixadas com um caractere `!`."
 
 #. type: Plain text
 #: en/git-show-branch.txt:146
 #, priority:100
 msgid "Following these N lines, one-line log for each commit is displayed, indented N places.  If a commit is on the I-th branch, the I-th indentation character shows a `+` sign; otherwise it shows a space.  Merge commits are denoted by a `-` sign.  Each commit shows a short name that can be used as an extended SHA-1 to name that commit."
-msgstr ""
-"Após essas \"N\" linhas, um registro log com uma linha para cada commit é "
-"exibido, recuados em \"N\" lugares.  Caso um commit esteja no \"I-ésimo\" "
-"ramo, o \"I-ésimo\" caractere de indentação exibe um sinal de `+`; caso "
-"contrário, mostra um espaço.  Os commits mesclados são indicados através de "
-"um sinal `-`.  Cada commit exibe um nome abreviado que pode ser utilizado "
-"como um SHA-1 estendido para dar nome a este commit."
+msgstr "Após essas \"N\" linhas, um registro log com uma linha para cada commit é exibido, recuados em \"N\" lugares.  Caso um commit esteja no \"I-ésimo\" ramo, o \"I-ésimo\" caractere de indentação exibe um sinal de `+`; caso contrário, mostra um espaço.  Os commits mesclados são indicados através de um sinal `-`.  Cada commit exibe um nome abreviado que pode ser utilizado como um SHA-1 estendido para dar nome a este commit."
 
 #. type: Plain text
 #: en/git-show-branch.txt:149
 #, priority:100
 msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":"
-msgstr ""
-"O exemplo a seguir mostra três ramificações, `master` (mestres), `fixes` "
-"(correções) e `mhf`:"
+msgstr "O exemplo a seguir mostra três ramificações, `master` (mestres), `fixes` (correções) e `mhf`:"
 
 #. type: delimited block -
 #: en/git-show-branch.txt:155
@@ -56296,20 +49045,13 @@ msgstr ""
 #: en/git-show-branch.txt:174
 #, priority:100
 msgid "These three branches all forked from a common commit, [master], whose commit message is \"Add \\'git show-branch'\".  The \"fixes\" branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". The \"mhf\" branch adds many other commits.  The current branch is \"master\"."
-msgstr ""
-"Todos estes três ramos foram bifurcados em um commit comum, [master], cuja "
-"mensagem do commit é \"Add \\'git show-branch'\".  O ramo \"fixes\" adiciona "
-"um commit \"Introduz a opção \"reset type\" para o comando \"git reset\"\". "
-"O ramo \"mhf\" adiciona muitos outros commits.  O ramo atual é \"master\"."
+msgstr "Todos estes três ramos foram bifurcados em um commit comum, [master], cuja mensagem do commit é \"Add \\'git show-branch'\".  O ramo \"fixes\" adiciona um commit \"Introduz a opção \"reset type\" para o comando \"git reset\"\". O ramo \"mhf\" adiciona muitos outros commits.  O ramo atual é \"master\"."
 
 #. type: Plain text
 #: en/git-show-branch.txt:182
 #, priority:100
 msgid "If you keep your primary branches immediately under `refs/heads`, and topic branches in subdirectories of it, having the following in the configuration file may help:"
-msgstr ""
-"Caso mantenha os seus ramos principais imediatamente sob `refs/heads` e "
-"tópico dos ramos nos subdiretórios, ter o seguinte no arquivo de "
-"configuração pode ajudar:"
+msgstr "Caso mantenha os seus ramos principais imediatamente sob `refs/heads` e tópico dos ramos nos subdiretórios, ter o seguinte no arquivo de configuração pode ajudar:"
 
 #. type: delimited block -
 #: en/git-show-branch.txt:187
@@ -56327,10 +49069,7 @@ msgstr ""
 #: en/git-show-branch.txt:193
 #, priority:100
 msgid "With this, `git show-branch` without extra parameters would show only the primary branches.  In addition, if you happen to be on your topic branch, it is shown as well."
-msgstr ""
-"Com isso, o comando `git show branch` sem parâmetros extras exibiria apenas "
-"as principais ramificações.  Além disso, caso esteja no tópico do ramo, ele "
-"também será exibido."
+msgstr "Com isso, o comando `git show branch` sem parâmetros extras exibiria apenas as principais ramificações.  Além disso, caso esteja no tópico do ramo, ele também será exibido."
 
 #. type: delimited block -
 #: en/git-show-branch.txt:196
@@ -56342,10 +49081,7 @@ msgstr "$ git show-branch --reflog=\"10,1 horas atrás\" --list master\n"
 #: en/git-show-branch.txt:201
 #, priority:100
 msgid "shows 10 reflog entries going back from the tip as of 1 hour ago.  Without `--list`, the output also shows how these tips are topologically related with each other."
-msgstr ""
-"exibe 10 entradas \"reflogs\" retornando do cume há uma hora atrás.  Sem "
-"`--list`, a saída também exibe como estes cumes estão topologicamente "
-"relacionados entre si."
+msgstr "exibe 10 entradas \"reflogs\" retornando do cume há uma hora atrás.  Sem `--list`, a saída também exibe como estes cumes estão topologicamente relacionados entre si."
 
 #. type: Title =
 #: en/git-show-index.txt:2
@@ -56362,26 +49098,20 @@ msgstr "git-show-index - Exibe o índice do arquivo empacotado"
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
-msgstr "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
+msgstr ""
 
 #. type: Plain text
 #: en/git-show-index.txt:22
 #, priority:100
 msgid "Read the `.idx` file for a Git packfile (created with linkgit:git-pack-objects[1] or linkgit:git-index-pack[1]) from the standard input, and dump its contents. The output consists of one object per line, with each line containing two or three space-separated columns:"
-msgstr ""
-"Leia o arquivo `.idx` para um arquivo do pacote Git (criado com os objetos "
-"linkgit:git-pack[1] ou linkgit:git-index-pack[1]) da entrada padrão e "
-"despeje o seu conteúdo. A saída consiste em um objeto por linha, com cada "
-"linha contendo duas ou três colunas separadas por espaço:"
+msgstr "Leia o arquivo `.idx` para um arquivo do pacote Git (criado com os objetos linkgit:git-pack[1] ou linkgit:git-index-pack[1]) da entrada padrão e despeje o seu conteúdo. A saída consiste em um objeto por linha, com cada linha contendo duas ou três colunas separadas por espaço:"
 
 #. type: Plain text
 #: en/git-show-index.txt:25
 #, priority:100
 msgid "the first column is the offset in bytes of the object within the corresponding packfile"
-msgstr ""
-"a primeira coluna é a compensação em bytes do objeto no arquivo do pacote "
-"correspondente"
+msgstr "a primeira coluna é a compensação em bytes do objeto no arquivo do pacote correspondente"
 
 #. type: Plain text
 #: en/git-show-index.txt:27
@@ -56393,27 +49123,26 @@ msgstr "a segunda coluna é o ID do objeto"
 #: en/git-show-index.txt:30
 #, priority:100
 msgid "if the index version is 2 or higher, the third column contains the CRC32 of the object data"
-msgstr ""
-"caso a versão do índice for 2 ou superior, a terceira coluna conterá o CRC32 "
-"dos dados do objeto"
+msgstr "caso a versão do índice for 2 ou superior, a terceira coluna conterá o CRC32 dos dados do objeto"
 
 #. type: Plain text
 #: en/git-show-index.txt:34
 #, priority:100
 msgid "The objects are output in the order in which they are found in the index file, which should be (in a correctly constructed file) sorted by object id."
-msgstr ""
-"Os objetos são gerados na ordem em que são encontrados no arquivo do índice, "
-"que deve ser (em um arquivo construído corretamente) classificado pela ID do "
-"objeto."
+msgstr "Os objetos são gerados na ordem em que são encontrados no arquivo do índice, que deve ser (em um arquivo construído corretamente) classificado pela ID do objeto."
 
 #. type: Plain text
 #: en/git-show-index.txt:38
 #, priority:100
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
-msgstr ""
-"Observe que você pode obter mais informações sobre um arquivo do pacote "
-"chamando linkgit:git-verify-pack[1]. No entanto, como este comando considera "
-"apenas o próprio arquivo do índice, é mais rápido e flexível."
+msgstr "Observe que você pode obter mais informações sobre um arquivo do pacote chamando linkgit:git-verify-pack[1]. No entanto, como este comando considera apenas o próprio arquivo do índice, é mais rápido e flexível."
+
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "Defina o formato do objeto informado (algoritmo hash) para o repositório.  Os valores válidos são 'sha1' e (se ativado) 'sha256'.  O valor predefinido é 'sha1'."
 
 #. type: Title =
 #: en/git-show-ref.txt:2
@@ -56445,36 +49174,25 @@ msgstr ""
 #: en/git-show-ref.txt:23
 #, priority:100
 msgid "Displays references available in a local repository along with the associated commit IDs. Results can be filtered using a pattern and tags can be dereferenced into object IDs. Additionally, it can be used to test whether a particular ref exists."
-msgstr ""
-"Exiba as referências disponíveis em um repositório local, juntamente com as "
-"IDs dos commits associados. Os resultados podem ser filtrados utilizando um "
-"padrão e as tags podem perder as suas referências nas IDs dos objetos. Além "
-"disso, pode ser utilizado para fazer um teste e ver se existe uma \"ref\" "
-"específica."
+msgstr "Exiba as referências disponíveis em um repositório local, juntamente com as IDs dos commits associados. Os resultados podem ser filtrados utilizando um padrão e as tags podem perder as suas referências nas IDs dos objetos. Além disso, pode ser utilizado para fazer um teste e ver se existe uma \"ref\" específica."
 
 #. type: Plain text
 #: en/git-show-ref.txt:25
 #, priority:100
 msgid "By default, shows the tags, heads, and remote refs."
-msgstr ""
-"É predefinido que se exiba as tags, cabeçalhos e as referências remotas."
+msgstr "É predefinido que se exiba as tags, cabeçalhos e as referências remotas."
 
 #. type: Plain text
 #: en/git-show-ref.txt:29
 #, priority:100
 msgid "The --exclude-existing form is a filter that does the inverse. It reads refs from stdin, one ref per line, and shows those that don't exist in the local repository."
-msgstr ""
-"A opção `--exclude-existing` é uma forma de filtro que faz o inverso. Ele lê "
-"as refs do 'stdin', uma \"ref\" por linha, e exibe aqueles que não existem "
-"no repositório local."
+msgstr "A opção `--exclude-existing` é uma forma de filtro que faz o inverso. Ele lê as refs do 'stdin', uma \"ref\" por linha, e exibe aqueles que não existem no repositório local."
 
 #. type: Plain text
 #: en/git-show-ref.txt:32
 #, priority:100
 msgid "Use of this utility is encouraged in favor of directly accessing files under the `.git` directory."
-msgstr ""
-"O uso deste utilitário é incentivado em favor do acesso direto aos arquivos "
-"no diretório `.git`."
+msgstr "O uso deste utilitário é incentivado em favor do acesso direto aos arquivos no diretório `.git`."
 
 #. type: Labeled list
 #: en/git-show-ref.txt:36
@@ -56492,10 +49210,7 @@ msgstr "Exibe a referência `HEAD`, mesmo que ela normalmente fosse filtrada."
 #: en/git-show-ref.txt:46
 #, priority:100
 msgid "Limit to \"refs/heads\" and \"refs/tags\", respectively.  These options are not mutually exclusive; when given both, references stored in \"refs/heads\" and \"refs/tags\" are displayed."
-msgstr ""
-"Limite para \"refs/heads\" e \"refs/tags\", respectivamente.  Estas opções "
-"não são mutuamente exclusivas; quando utilizadas, as referências armazenadas "
-"em \"refs/heads\" e \"refs/tags\" são exibidas."
+msgstr "Limite para \"refs/heads\" e \"refs/tags\", respectivamente.  Estas opções não são mutuamente exclusivas; quando utilizadas, as referências armazenadas em \"refs/heads\" e \"refs/tags\" são exibidas."
 
 #. type: Labeled list
 #: en/git-show-ref.txt:48
@@ -56507,9 +49222,7 @@ msgstr "--dereference"
 #: en/git-show-ref.txt:52
 #, priority:100
 msgid "Dereference tags into object IDs as well. They will be shown with \"{caret}{}\" appended."
-msgstr ""
-"Remova as referências das tags dos IDs do objeto também. Eles serão exibidos "
-"com um \"{caret}{}\" anexado."
+msgstr "Remova as referências das tags dos IDs do objeto também. Eles serão exibidos com um \"{caret}{}\" anexado."
 
 #. type: Labeled list
 #: en/git-show-ref.txt:54
@@ -56521,37 +49234,25 @@ msgstr "--hash[=<n>]"
 #: en/git-show-ref.txt:58
 #, priority:100
 msgid "Only show the SHA-1 hash, not the reference name. When combined with --dereference the dereferenced tag will still be shown after the SHA-1."
-msgstr ""
-"Exiba apenas o hash SHA-1, não o nome da referência. Quando combinada com "
-"`--dereference`, a tag da perda da referência ainda será exibida após o "
-"SHA-1."
+msgstr "Exiba apenas o hash SHA-1, não o nome da referência. Quando combinada com `--dereference`, a tag da perda da referência ainda será exibida após o SHA-1."
 
 #. type: Plain text
 #: en/git-show-ref.txt:64
 #, priority:100
 msgid "Enable stricter reference checking by requiring an exact ref path.  Aside from returning an error code of 1, it will also print an error message if `--quiet` was not specified."
-msgstr ""
-"Ative a verificação de referência mais rigorosa, exigindo um caminho de "
-"referência exato.  Além de retornar um código de erro 1, ele também "
-"imprimirá uma mensagem de erro caso a opção `--quiet` não tiver sido "
-"utilizada."
+msgstr "Ative a verificação de referência mais rigorosa, exigindo um caminho de referência exato.  Além de retornar um código de erro 1, ele também imprimirá uma mensagem de erro caso a opção `--quiet` não tiver sido utilizada."
 
 #. type: Plain text
 #: en/git-show-ref.txt:69
 #, priority:100
 msgid "Abbreviate the object name.  When using `--hash`, you do not have to say `--hash --abbrev`; `--hash=n` would do."
-msgstr ""
-"Abrevie o nome do objeto.  Ao utilizar `--hash`, não é necessário a opção `--"
-"hash --abbrev`; a opção `--hash=n` já faz."
+msgstr "Abrevie o nome do objeto.  Ao utilizar `--hash`, não é necessário a opção `--hash --abbrev`; a opção `--hash=n` já faz."
 
 #. type: Plain text
 #: en/git-show-ref.txt:75
 #, priority:100
 msgid "Do not print any results to stdout. When combined with `--verify` this can be used to silently check if a reference exists."
-msgstr ""
-"Não imprima nenhum resultado no stdout. Quando combinado com a opção "
-"`--verify`, isso pode ser utilizado para verificar silenciosamente a "
-"existência de uma referência."
+msgstr "Não imprima nenhum resultado no stdout. Quando combinado com a opção `--verify`, isso pode ser utilizado para verificar silenciosamente a existência de uma referência."
 
 #. type: Labeled list
 #: en/git-show-ref.txt:76
@@ -56563,10 +49264,7 @@ msgstr "--exclude-existing[=<padrão>]"
 #: en/git-show-ref.txt:81
 #, priority:100
 msgid "Make 'git show-ref' act as a filter that reads refs from stdin of the form \"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" and performs the following actions on each:"
-msgstr ""
-"Faça com que o comando 'git show-ref' atue como um filtro que leia as refs "
-"do stdin no formato \"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" e execute "
-"o seguintes ações em cada:"
+msgstr "Faça com que o comando 'git show-ref' atue como um filtro que leia as refs do stdin no formato \"`^(?:<anything>\\s)?<refname>(?:\\^{})?$`\" e execute o seguintes ações em cada:"
 
 #. type: Plain text
 #: en/git-show-ref.txt:82
@@ -56578,9 +49276,7 @@ msgstr "tira o \"{caret}{}\" no final da linha, caso haja;"
 #: en/git-show-ref.txt:83
 #, priority:100
 msgid "ignore if pattern is provided and does not head-match refname;"
-msgstr ""
-"ignore caso a predefinição seja informada e não corresponder ao cabeçalho a "
-"\"refname\";"
+msgstr "ignore caso a predefinição seja informada e não corresponder ao cabeçalho a \"refname\";"
 
 #. type: Plain text
 #: en/git-show-ref.txt:84
@@ -56592,8 +49288,7 @@ msgstr "avise caso o \"refname\" não seja um \"refname\" bem formado e ignore;"
 #: en/git-show-ref.txt:85
 #, priority:100
 msgid "ignore if refname is a ref that exists in the local repository;"
-msgstr ""
-"ignore caso o \"refname\" é uma \"ref\" que exista no repositório local;"
+msgstr "ignore caso o \"refname\" é uma \"ref\" que exista no repositório local;"
 
 #. type: Plain text
 #: en/git-show-ref.txt:86
@@ -56605,19 +49300,13 @@ msgstr "caso contrário, imprima a linha."
 #: en/git-show-ref.txt:95
 #, priority:100
 msgid "Show references matching one or more patterns. Patterns are matched from the end of the full name, and only complete parts are matched, e.g.  'master' matches 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'."
-msgstr ""
-"Exiba as referências coincidentes a um ou mais padrões. Os padrões são "
-"coincididos a partir do final do nome completo e apenas as peças completas "
-"são coincididas, por exemplo, 'master' coincide com 'refs/heads/master', '"
-"refs/remotes/origin/master', 'refs/tags/jedi/master' mas não com 'refs/heads/"
-"mymaster' ou 'refs/remotes/master/jedi'."
+msgstr "Exiba as referências coincidentes a um ou mais padrões. Os padrões são coincididos a partir do final do nome completo e apenas as peças completas são coincididas, por exemplo, 'master' coincide com 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/master' mas não com 'refs/heads/mymaster' ou 'refs/remotes/master/jedi'."
 
 #. type: Plain text
 #: en/git-show-ref.txt:100
 #, priority:100
 msgid "The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
-msgstr ""
-"A saída está no formato: '<SHA-1 ID>' '<espaço>' '<nome da referência>'."
+msgstr "A saída está no formato: '<SHA-1 ID>' '<espaço>' '<nome da referência>'."
 
 #. type: delimited block -
 #: en/git-show-ref.txt:111
@@ -56647,9 +49336,7 @@ msgstr ""
 #: en/git-show-ref.txt:114
 #, priority:100
 msgid "When using --hash (and not --dereference) the output format is: '<SHA-1 ID>'"
-msgstr ""
-"Ao utilizar o `--hash` (e não `--dereference`), o formato de saída é: '<ID "
-"do SHA-1>'"
+msgstr "Ao utilizar o `--hash` (e não `--dereference`), o formato de saída é: '<ID do SHA-1>'"
 
 #. type: delimited block -
 #: en/git-show-ref.txt:121
@@ -56671,10 +49358,7 @@ msgstr ""
 #: en/git-show-ref.txt:129
 #, priority:100
 msgid "To show all references called \"master\", whether tags or heads or anything else, and regardless of how deep in the reference naming hierarchy they are, use:"
-msgstr ""
-"Para exibir todas as referências chamadas \"master\", sejam tags, cabeçalhos "
-"ou qualquer outro, e independentemente da profundidade na hierarquia dos "
-"nomes de referência, utilize:"
+msgstr "Para exibir todas as referências chamadas \"master\", sejam tags, cabeçalhos ou qualquer outro, e independentemente da profundidade na hierarquia dos nomes de referência, utilize:"
 
 #. type: delimited block -
 #: en/git-show-ref.txt:132
@@ -56686,16 +49370,13 @@ msgstr "\tgit show-ref master\n"
 #: en/git-show-ref.txt:136
 #, priority:100
 msgid "This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master\", if such references exists."
-msgstr ""
-"Exibirá \"refs/heads/master\" e também \"refs/remote/other-repo/master\", "
-"caso tais referências existam."
+msgstr "Exibirá \"refs/heads/master\" e também \"refs/remote/other-repo/master\", caso tais referências existam."
 
 #. type: Plain text
 #: en/git-show-ref.txt:138
 #, priority:100
 msgid "When using the `--verify` flag, the command requires an exact path:"
-msgstr ""
-"Quando utilizar a opção `--verify`, o comando precisa de um caminho exato:"
+msgstr "Quando utilizar a opção `--verify`, o comando precisa de um caminho exato:"
 
 #. type: delimited block -
 #: en/git-show-ref.txt:141
@@ -56713,18 +49394,13 @@ msgstr "coincidirá apenas ao ramo exato chamado \"master\"."
 #: en/git-show-ref.txt:147
 #, priority:100
 msgid "If nothing matches, 'git show-ref' will return an error code of 1, and in the case of verification, it will show an error message."
-msgstr ""
-"Caso não haja coincidência com nada, o comando 'git show-ref' retornará um "
-"código de erro '1' e no caso de uma verificação, exibirá uma mensagem de "
-"erro."
+msgstr "Caso não haja coincidência com nada, o comando 'git show-ref' retornará um código de erro '1' e no caso de uma verificação, exibirá uma mensagem de erro."
 
 #. type: Plain text
 #: en/git-show-ref.txt:150
 #, priority:100
 msgid "For scripting, you can ask it to be quiet with the \"--quiet\" flag, which allows you to do things like"
-msgstr ""
-"Para os scripts, é possível pedir para que fiquem em silêncio com a opção "
-"`--quiet`, que permite fazer coisas como"
+msgstr "Para os scripts, é possível pedir para que fiquem em silêncio com a opção `--quiet`, que permite fazer coisas como"
 
 #. type: delimited block -
 #: en/git-show-ref.txt:154
@@ -56740,29 +49416,19 @@ msgstr ""
 #: en/git-show-ref.txt:159
 #, priority:100
 msgid "to check whether a particular branch exists or not (notice how we don't actually want to show any results, and we want to use the full refname for it in order to not trigger the problem with ambiguous partial matches)."
-msgstr ""
-"para verificar se um ramo específico existe ou não (observe como na verdade "
-"não queremos exibir os resultados e queremos usar o nome completo da \"ref\" "
-"para ele, a fim de não desencadear o problema com coincidências parciais e "
-"ambíguas)."
+msgstr "para verificar se um ramo específico existe ou não (observe como na verdade não queremos exibir os resultados e queremos usar o nome completo da \"ref\" para ele, a fim de não desencadear o problema com coincidências parciais e ambíguas)."
 
 #. type: Plain text
 #: en/git-show-ref.txt:163
 #, priority:100
 msgid "To show only tags, or only proper branch heads, use \"--tags\" and/or \"--heads\" respectively (using both means that it shows tags and heads, but not other random references under the refs/ subdirectory)."
-msgstr ""
-"Para exibir adequadamente apenas as tags, ou apenas os cabeçalhos do ramo, "
-"utilize \"--tags\" e/ou \"--heads\" respectivamente (usando ambos significa "
-"que ele exibirá as tags e as heads, porém não as outras referências "
-"aleatórias no subdiretório 'refs/')."
+msgstr "Para exibir adequadamente apenas as tags, ou apenas os cabeçalhos do ramo, utilize \"--tags\" e/ou \"--heads\" respectivamente (usando ambos significa que ele exibirá as tags e as heads, porém não as outras referências aleatórias no subdiretório 'refs/')."
 
 #. type: Plain text
 #: en/git-show-ref.txt:166
 #, priority:100
 msgid "To do automatic tag object dereferencing, use the \"-d\" or \"--dereference\" flag, so you can do"
-msgstr ""
-"Para fazer a perda da referência automática da tag dos objetos, utilize a "
-"opção `-d` ou `--dereference` para que seja possível executar"
+msgstr "Para fazer a perda da referência automática da tag dos objetos, utilize a opção `-d` ou `--dereference` para que seja possível executar"
 
 #. type: delimited block -
 #: en/git-show-ref.txt:169
@@ -56774,9 +49440,7 @@ msgstr "\tgit show-ref --tags --dereference\n"
 #: en/git-show-ref.txt:172
 #, priority:100
 msgid "to get a listing of all tags together with what they dereference."
-msgstr ""
-"para obter uma lista de todas as \"tags\" junto com a perda da referência "
-"feita."
+msgstr "para obter uma lista de todas as \"tags\" junto com a perda da referência feita."
 
 #. type: Plain text
 #: en/git-show-ref.txt:176
@@ -56860,11 +49524,7 @@ msgstr "<objeto>..."
 #: en/git-show.txt:41
 #, priority:260
 msgid "The names of objects to show (defaults to 'HEAD').  For a more complete list of ways to spell object names, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7]."
-msgstr ""
-"Os nomes dos objetos a serem exibidos (a predefinição retorna para 'HEAD').  "
-"Para obter uma lista mais completa de maneiras de soletrar os nomes dos "
-"objetos, consulte a seção \"DEFININDO AS REVISÕES\" em "
-"linkgit:gitrevisions[7]."
+msgstr "Os nomes dos objetos a serem exibidos (a predefinição retorna para 'HEAD').  Para obter uma lista mais completa de maneiras de soletrar os nomes dos objetos, consulte a seção \"DEFININDO AS REVISÕES\" em linkgit:gitrevisions[7]."
 
 #. type: Labeled list
 #: en/git-show.txt:60
@@ -56948,29 +49608,19 @@ msgstr "'. \"$(git --exec-path)/git-sh-setup\"'\n"
 #: en/git-sh-setup.txt:23
 #, priority:100
 msgid "The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up some variables pointing at the normal Git directories and a few helper shell functions."
-msgstr ""
-"O scriptlet 'git sh-setup' foi projetado para ser originado (usando `.`) "
-"através dos outros scripts shell para configurar algumas variáveis apontando "
-"para os diretórios normais do Git e algumas funções auxiliares do shell."
+msgstr "O scriptlet 'git sh-setup' foi projetado para ser originado (usando `.`) através dos outros scripts shell para configurar algumas variáveis apontando para os diretórios normais do Git e algumas funções auxiliares do shell."
 
 #. type: Plain text
 #: en/git-sh-setup.txt:29
 #, priority:100
 msgid "Before sourcing it, your script should set up a few variables; `USAGE` (and `LONG_USAGE`, if any) is used to define message given by `usage()` shell function.  `SUBDIRECTORY_OK` can be set if the script can run from a subdirectory of the working tree (some commands do not)."
-msgstr ""
-"Antes de procurá-lo, o seu script deve configurar algumas variáveis; `USAGE` "
-"(e `LONG_USAGE`, caso haja) é utilizado para definir a mensagem informada "
-"através da função shell `use ()`.  O `SUBDIRECTORY_OK` pode ser definido "
-"caso o script possa ser executado a partir de um subdiretório da árvore de "
-"trabalho (alguns comandos não podem)."
+msgstr "Antes de procurá-lo, o seu script deve configurar algumas variáveis; `USAGE` (e `LONG_USAGE`, caso haja) é utilizado para definir a mensagem informada através da função shell `use ()`.  O `SUBDIRECTORY_OK` pode ser definido caso o script possa ser executado a partir de um subdiretório da árvore de trabalho (alguns comandos não podem)."
 
 #. type: Plain text
 #: en/git-sh-setup.txt:32
 #, priority:100
 msgid "The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but does *not* export them to the environment."
-msgstr ""
-"O scriptlet define o `GIT_DIR` e as variáveis shell `GIT_OBJECT_DIRECTORY`, "
-"porém *não* as exporta no ambiente."
+msgstr "O scriptlet define o `GIT_DIR` e as variáveis shell `GIT_OBJECT_DIRECTORY`, porém *não* as exporta no ambiente."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:36
@@ -56982,9 +49632,7 @@ msgstr "die"
 #: en/git-sh-setup.txt:39
 #, priority:100
 msgid "exit after emitting the supplied error message to the standard error stream."
-msgstr ""
-"encerra após emitir a mensagem de erro informada no fluxo de erros "
-"predefinido."
+msgstr "encerra após emitir a mensagem de erro informada no fluxo de erros predefinido."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:40
@@ -57008,12 +49656,7 @@ msgstr "set_reflog_action"
 #: en/git-sh-setup.txt:49
 #, priority:100
 msgid "Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of the program) unless it is already set.  Whenever the script runs a `git` command that updates refs, a reflog entry is created using the value of this string to leave the record of what command updated the ref."
-msgstr ""
-"Defina a variável de ambiente `GIT_REFLOG_ACTION` para um determinado texto ("
-"tipicamente o nome do programa) a menos que já esteja definido.  Sempre que "
-"o script executa um comando `git` que atualiza as refs, um lançamento no "
-"reflog é criad usando o valor deste texto para deixar o registro onde "
-"comando atualizou a \"ref\"."
+msgstr "Defina a variável de ambiente `GIT_REFLOG_ACTION` para um determinado texto (tipicamente o nome do programa) a menos que já esteja definido.  Sempre que o script executa um comando `git` que atualiza as refs, um lançamento no reflog é criad usando o valor deste texto para deixar o registro onde comando atualizou a \"ref\"."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:50
@@ -57025,10 +49668,7 @@ msgstr "git_editor"
 #: en/git-sh-setup.txt:54
 #, priority:100
 msgid "runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) on a given file, but error out if no editor is specified and the terminal is dumb."
-msgstr ""
-"executa um editor selecionado pelo usuário (GIT_EDITOR, core.editor, VISUAL "
-"ou EDITOR) em um determinado arquivo, mas com erro caso nenhum editor seja "
-"definido e o terminal for burro."
+msgstr "executa um editor selecionado pelo usuário (GIT_EDITOR, core.editor, VISUAL ou EDITOR) em um determinado arquivo, mas com erro caso nenhum editor seja definido e o terminal for burro."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:55
@@ -57040,10 +49680,7 @@ msgstr "is_bare_repository"
 #: en/git-sh-setup.txt:59
 #, priority:100
 msgid "outputs `true` or `false` to the standard output stream to indicate if the repository is a bare repository (i.e. without an associated working tree)."
-msgstr ""
-"gera `true` ou `false` no fluxo da saída padrão para indicar caso o "
-"repositório seja um repositório simples (ou seja, sem uma associação a "
-"qualquer árvore de trabalho)."
+msgstr "gera `true` ou `false` no fluxo da saída padrão para indicar caso o repositório seja um repositório simples (ou seja, sem uma associação a qualquer árvore de trabalho)."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:60
@@ -57067,9 +49704,7 @@ msgstr "require_work_tree"
 #: en/git-sh-setup.txt:66
 #, priority:100
 msgid "checks if the current directory is within the working tree of the repository, and otherwise dies."
-msgstr ""
-"verifica se o diretório atual está dentro da árvore de trabalho do "
-"repositório, ou de outra forma, encerre."
+msgstr "verifica se o diretório atual está dentro da árvore de trabalho do repositório, ou de outra forma, encerre."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:67
@@ -57081,11 +49716,7 @@ msgstr "require_work_tree_exists"
 #: en/git-sh-setup.txt:72
 #, priority:100
 msgid "checks if the working tree associated with the repository exists, and otherwise dies.  Often done before calling cd_to_toplevel, which is impossible to do if there is no working tree."
-msgstr ""
-"verifica se a árvore de trabalho associada ao repositório existe, ou de "
-"outra forma, encerre.  Geralmente é feito antes de chamar o `cd_to_toplevel`"
-", o que é impossível de fazer caso não haja uma árvore de trabalho em "
-"funcionamento."
+msgstr "verifica se a árvore de trabalho associada ao repositório existe, ou de outra forma, encerre.  Geralmente é feito antes de chamar o `cd_to_toplevel`, o que é impossível de fazer caso não haja uma árvore de trabalho em funcionamento."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:73
@@ -57097,11 +49728,7 @@ msgstr "require_clean_work_tree <ação> [<dica>]"
 #: en/git-sh-setup.txt:78
 #, priority:100
 msgid "checks that the working tree and index associated with the repository have no uncommitted changes to tracked files.  Otherwise it emits an error message of the form `Cannot <action>: <reason>. <hint>`, and dies.  Example:"
-msgstr ""
-"verifica se a arvore de trabalho e o índice associados ao repositório "
-"possuam alterações nos commits que não foram feitos  dos arquivos "
-"monitorados. Caso contrário, emita uma mensagem de erro no formato `Cannot "
-"<ação>: <motivo>. <dica>`, e encerre.  Exemplo:"
+msgstr "verifica se a arvore de trabalho e o índice associados ao repositório possuam alterações nos commits que não foram feitos  dos arquivos monitorados. Caso contrário, emita uma mensagem de erro no formato `Cannot <ação>: <motivo>. <dica>`, e encerre.  Exemplo:"
 
 #. type: delimited block -
 #: en/git-sh-setup.txt:81
@@ -57119,10 +49746,7 @@ msgstr "get_author_ident_from_commit"
 #: en/git-sh-setup.txt:86
 #, priority:100
 msgid "outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit."
-msgstr ""
-"gera o código para uso com o 'eval' para definir as variáveis "
-"`GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL` e `GIT_AUTHOR_DATE` para um "
-"determinado commit."
+msgstr "gera o código para uso com o 'eval' para definir as variáveis `GIT_AUTHOR_NAME`, `GIT_AUTHOR_EMAIL` e `GIT_AUTHOR_DATE` para um determinado commit."
 
 #. type: Labeled list
 #: en/git-sh-setup.txt:87
@@ -57134,11 +49758,7 @@ msgstr "create_virtual_base"
 #: en/git-sh-setup.txt:92
 #, priority:100
 msgid "modifies the first file so only lines in common with the second file remain. If there is insufficient common material, then the first file is left empty. The result is suitable as a virtual base input for a 3-way merge."
-msgstr ""
-"modifica o primeiro arquivo para que apenas as linhas em comum com o segundo "
-"arquivo permaneçam. Caso haja um material comum insuficiente, o primeiro "
-"arquivo será deixado vazio. O resultado é adequado como uma entrada da base "
-"virtual para mesclagem de três vias."
+msgstr "modifica o primeiro arquivo para que apenas as linhas em comum com o segundo arquivo permaneçam. Caso haja um material comum insuficiente, o primeiro arquivo será deixado vazio. O resultado é adequado como uma entrada da base virtual para mesclagem de três vias."
 
 #. type: Title =
 #: en/git-stage.txt:2
@@ -57210,67 +49830,37 @@ msgstr ""
 #: en/git-stash.txt:31
 #, priority:240
 msgid "Use `git stash` when you want to record the current state of the working directory and the index, but want to go back to a clean working directory.  The command saves your local modifications away and reverts the working directory to match the `HEAD` commit."
-msgstr ""
-"Use o comando `git stash` quando quiser gravar a condição atual do diretório "
-"ativo e do índice, porém queira voltar para um diretório funcional limpo.  O "
-"comando salva as suas alterações locais e reverte o diretório de trabalho "
-"para coincidir ao commit `HEAD`."
+msgstr "Use o comando `git stash` quando quiser gravar a condição atual do diretório ativo e do índice, porém queira voltar para um diretório funcional limpo.  O comando salva as suas alterações locais e reverte o diretório de trabalho para coincidir ao commit `HEAD`."
 
 #. type: Plain text
 #: en/git-stash.txt:39
 #, ignore-ellipsis, priority:240
 msgid "The modifications stashed away by this command can be listed with `git stash list`, inspected with `git stash show`, and restored (potentially on top of a different commit) with `git stash apply`.  Calling `git stash` without any arguments is equivalent to `git stash push`.  A stash is by default listed as \"WIP on 'branchname' ...\", but you can give a more descriptive message on the command line when you create one."
-msgstr ""
-"As alterações armazenadas por este comando podem ser listadas com o comando `"
-"git stash list`, inspecionadas com o comando `git stash show` e restauradas ("
-"potencialmente em cima de um commit diferente) com o comando `git stash "
-"apply`.  Chamar o comando `git stash` sem argumentos é o equivalente que "
-"executar o comando `git stash push`.  É predefinido que um \"stash\" seja "
-"listado como \"WIP no 'nomedoramo' ...\", porém você pode fornecer uma "
-"mensagem mais descritiva na linha de comando durante a criação de um."
+msgstr "As alterações armazenadas por este comando podem ser listadas com o comando `git stash list`, inspecionadas com o comando `git stash show` e restauradas (potencialmente em cima de um commit diferente) com o comando `git stash apply`.  Chamar o comando `git stash` sem argumentos é o equivalente que executar o comando `git stash push`.  É predefinido que um \"stash\" seja listado como \"WIP no 'nomedoramo' ...\", porém você pode fornecer uma mensagem mais descritiva na linha de comando durante a criação de um."
 
 #. type: Plain text
 #: en/git-stash.txt:46
 #, priority:240
 msgid "The latest stash you created is stored in `refs/stash`; older stashes are found in the reflog of this reference and can be named using the usual reflog syntax (e.g. `stash@{0}` is the most recently created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}` is also possible). Stashes may also be referenced by specifying just the stash index (e.g. the integer `n` is equivalent to `stash@{n}`)."
-msgstr ""
-"O último \"stash\" que você criou é armazenado em `refs/stash`; os \"stash\" "
-"mais antigos são encontrados no \"reflog\" desta referência e podem ser "
-"nomeados usando a sintaxe usual do \"reflog\" (como, por exemplo, `stash@{0}`"
-" é o \"stash\" criado mais recentemente, o `stash@{1}` é o anterior, o "
-"`stash@{2.hours.ago}` também é possível). As pilhas \"stash\" também podem "
-"ser referenciadas definindo apenas o índice \"stash\" (como, por exemplo, o "
-"número inteiro `n` é o equivalente a um `stash@{n}`)."
+msgstr "O último \"stash\" que você criou é armazenado em `refs/stash`; os \"stash\" mais antigos são encontrados no \"reflog\" desta referência e podem ser nomeados usando a sintaxe usual do \"reflog\" (como, por exemplo, `stash@{0}` é o \"stash\" criado mais recentemente, o `stash@{1}` é o anterior, o `stash@{2.hours.ago}` também é possível). As pilhas \"stash\" também podem ser referenciadas definindo apenas o índice \"stash\" (como, por exemplo, o número inteiro `n` é o equivalente a um `stash@{n}`)."
 
 #. type: Labeled list
 #: en/git-stash.txt:50
 #, ignore-ellipsis, no-wrap, priority:240
 msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--pathspec-from-file=<file> [--pathspec-file-nul]] [--] [<pathspec>...]"
-msgstr ""
-"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] "
-"[-q|--quiet] [-m|--message <mensagem>] [--pathspec-from-file=<arquivo> "
-"[--pathspec-file-nul]] [--] [<pathspec>...]"
+msgstr "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <mensagem>] [--pathspec-from-file=<arquivo> [--pathspec-file-nul]] [--] [<pathspec>...]"
 
 #. type: Plain text
 #: en/git-stash.txt:56
 #, priority:240
 msgid "Save your local modifications to a new 'stash entry' and roll them back to HEAD (in the working tree and in the index).  The <message> part is optional and gives the description along with the stashed state."
-msgstr ""
-"Salva as suas alterações locais em uma novo lançamento na 'stash' e reverta-"
-"as para `HEAD` (na árvore de trabalho e no índice).  A parte da <mensagem> é "
-"opcional e dá a descrição junto com a condição do empilhamento."
+msgstr "Salva as suas alterações locais em uma novo lançamento na 'stash' e reverta-as para `HEAD` (na árvore de trabalho e no índice).  A parte da <mensagem> é opcional e dá a descrição junto com a condição do empilhamento."
 
 #. type: Plain text
 #: en/git-stash.txt:62
 #, priority:240
 msgid "For quickly making a snapshot, you can omit \"push\".  In this mode, non-option arguments are not allowed to prevent a misspelled subcommand from making an unwanted stash entry.  The two exceptions to this are `stash -p` which acts as alias for `stash push -p` and pathspec elements, which are allowed after a double hyphen `--` for disambiguation."
-msgstr ""
-"Para fazer um instantâneo de forma rápida, você pode omitir o \"push\".  "
-"Neste modo, os argumentos não opcionais não são permitidos, visam impedir "
-"que um subcomando com erro de ortografia faça uma entrada na pilha "
-"indesejada.  As duas exceções são `stash -p`, que atua como um alias para o `"
-"stash push -p` e os elementos pathspec, que são permitidos após um hífen "
-"duplo `--` para desambiguação."
+msgstr "Para fazer um instantâneo de forma rápida, você pode omitir o \"push\".  Neste modo, os argumentos não opcionais não são permitidos, visam impedir que um subcomando com erro de ortografia faça uma entrada na pilha indesejada.  As duas exceções são `stash -p`, que atua como um alias para o `stash push -p` e os elementos pathspec, que são permitidos após um hífen duplo `--` para desambiguação."
 
 #. type: Labeled list
 #: en/git-stash.txt:63
@@ -57282,10 +49872,7 @@ msgstr "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--
 #: en/git-stash.txt:69
 #, priority:240
 msgid "This option is deprecated in favour of 'git stash push'.  It differs from \"stash push\" in that it cannot take pathspec.  Instead, all non-option arguments are concatenated to form the stash message."
-msgstr ""
-"Esta opção já está obsoleta em favor da opção 'git stash push'.  Difere do "
-"\"stash push\", pois não pode lidar com o pathspec.  Em vez disso, todos os "
-"argumentos não opcionais são concatenados para formar a mensagem \"stash\"."
+msgstr "Esta opção já está obsoleta em favor da opção 'git stash push'.  Difere do \"stash push\", pois não pode lidar com o pathspec.  Em vez disso, todos os argumentos não opcionais são concatenados para formar a mensagem \"stash\"."
 
 #. type: Labeled list
 #: en/git-stash.txt:70
@@ -57297,12 +49884,7 @@ msgstr "list [<opções>]"
 #: en/git-stash.txt:77
 #, priority:240
 msgid "List the stash entries that you currently have.  Each 'stash entry' is listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is the one before, etc.), the name of the branch that was current when the entry was made, and a short description of the commit the entry was based on."
-msgstr ""
-"Lista as entradas acumuladas ('stash') que você possui atualmente.  Cada "
-"'entrada stash' é listada com o seu nome (como por exemplo, `stash@{0}` é o "
-"lançamento mais recente, `stash@{1}` é o lançamento anterior etc.), o nome "
-"do ramo que estava atual quando o foi feito um lançamento e uma breve "
-"descrição do commit onde a entrada teve base."
+msgstr "Lista as entradas acumuladas ('stash') que você possui atualmente.  Cada 'entrada stash' é listada com o seu nome (como por exemplo, `stash@{0}` é o lançamento mais recente, `stash@{1}` é o lançamento anterior etc.), o nome do ramo que estava atual quando o foi feito um lançamento e uma breve descrição do commit onde a entrada teve base."
 
 #. type: delimited block -
 #: en/git-stash.txt:81
@@ -57330,14 +49912,7 @@ msgstr "show [<opções>] [<stash>]"
 #: en/git-stash.txt:96
 #, priority:240
 msgid "Show the changes recorded in the stash entry as a diff between the stashed contents and the commit back when the stash entry was first created.  By default, the command shows the diffstat, but it will accept any format known to 'git diff' (e.g., `git stash show -p stash@{1}` to view the second most recent entry in patch form).  You can use stash.showStat and/or stash.showPatch config variables to change the default behavior."
-msgstr ""
-"Exiba as alterações registradas na entrada 'stash' como uma diferença entre "
-"o conteúdo oculto e o commit quando a entrada stash for criada.  É "
-"predefinido que o comando exiba o \"diffstat\", porém aceite qualquer "
-"formato informado pelo comando 'git diff' (como por exemplo, `git stash show "
-"-p stash@{1}` para exibir a segunda entrada mais recente em formato patch).  "
-"Você pode usar as variáveis de configuração `stash.showStat` e/ou `stash."
-"showPatch` para alterar o comportamento predefinido."
+msgstr "Exiba as alterações registradas na entrada 'stash' como uma diferença entre o conteúdo oculto e o commit quando a entrada stash for criada.  É predefinido que o comando exiba o \"diffstat\", porém aceite qualquer formato informado pelo comando 'git diff' (como por exemplo, `git stash show -p stash@{1}` para exibir a segunda entrada mais recente em formato patch).  Você pode usar as variáveis de configuração `stash.showStat` e/ou `stash.showPatch` para alterar o comportamento predefinido."
 
 #. type: Labeled list
 #: en/git-stash.txt:97
@@ -57349,20 +49924,13 @@ msgstr "pop [--index] [-q|--quiet] [<stash>]"
 #: en/git-stash.txt:103
 #, priority:240
 msgid "Remove a single stashed state from the stash list and apply it on top of the current working tree state, i.e., do the inverse operation of `git stash push`. The working directory must match the index."
-msgstr ""
-"Remova a única condição do empilhamento da lista e aplique-o sobre a "
-"condição atual da árvore de trabalho, ou seja, faça a operação inversa do "
-"comando `git stash push`. O diretório de trabalho deve corresponder ao "
-"índice. O diretório de trabalho deve coincidir com o índice."
+msgstr "Remova a única condição do empilhamento da lista e aplique-o sobre a condição atual da árvore de trabalho, ou seja, faça a operação inversa do comando `git stash push`. O diretório de trabalho deve corresponder ao índice. O diretório de trabalho deve coincidir com o índice."
 
 #. type: Plain text
 #: en/git-stash.txt:107
 #, priority:240
 msgid "Applying the state can fail with conflicts; in this case, it is not removed from the stash list. You need to resolve the conflicts by hand and call `git stash drop` manually afterwards."
-msgstr ""
-"A aplicação da condição pode falhar com conflitos; neste caso, ele não é "
-"removido da lista de estoque 'stash'. É necessário resolver os conflitos "
-"manualmente e chamar o comando `git stash drop` manualmente depois."
+msgstr "A aplicação da condição pode falhar com conflitos; neste caso, ele não é removido da lista de estoque 'stash'. É necessário resolver os conflitos manualmente e chamar o comando `git stash drop` manualmente depois."
 
 #. type: Labeled list
 #: en/git-stash.txt:108
@@ -57374,10 +49942,7 @@ msgstr "apply [--index] [-q|--quiet] [<stash>]"
 #: en/git-stash.txt:113
 #, priority:240
 msgid "Like `pop`, but do not remove the state from the stash list. Unlike `pop`, `<stash>` may be any commit that looks like a commit created by `stash push` or `stash create`."
-msgstr ""
-"Como `pop ', porém não remova a condição da lista de estoque 'stash'. "
-"Diferente de `pop`, `<stash>` pode ser qualquer commit que se pareça com um "
-"commit criado através do comando `stash push` ou `stash create`."
+msgstr "Como `pop ', porém não remova a condição da lista de estoque 'stash'. Diferente de `pop`, `<stash>` pode ser qualquer commit que se pareça com um commit criado através do comando `stash push` ou `stash create`."
 
 #. type: Labeled list
 #: en/git-stash.txt:114
@@ -57389,23 +49954,13 @@ msgstr "branch <nome-do-ramo> [<stash>]"
 #: en/git-stash.txt:121
 #, priority:240
 msgid "Creates and checks out a new branch named `<branchname>` starting from the commit at which the `<stash>` was originally created, applies the changes recorded in `<stash>` to the new working tree and index.  If that succeeds, and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops the `<stash>`."
-msgstr ""
-"Cria e efetua a averiguação de um novo ramo chamado `<nome-do-ramo>` "
-"iniciando a partir do commit onde o `<stash>` foi criado originalmente, "
-"aplica as alterações registradas do `<stash>` na nova árvore de trabalho e "
-"no índice.  Caso seja bem-sucedido, e `<stash>` for uma referência do "
-"formulário `stash@{<revision>}`, ele liberará o `<stash>`."
+msgstr "Cria e efetua a averiguação de um novo ramo chamado `<nome-do-ramo>` iniciando a partir do commit onde o `<stash>` foi criado originalmente, aplica as alterações registradas do `<stash>` na nova árvore de trabalho e no índice.  Caso seja bem-sucedido, e `<stash>` for uma referência do formulário `stash@{<revision>}`, ele liberará o `<stash>`."
 
 #. type: Plain text
 #: en/git-stash.txt:127
 #, priority:240
 msgid "This is useful if the branch on which you ran `git stash push` has changed enough that `git stash apply` fails due to conflicts. Since the stash entry is applied on top of the commit that was HEAD at the time `git stash` was run, it restores the originally stashed state with no conflicts."
-msgstr ""
-"É útil caso o ramo onde você executou o `git stash push` mude o suficiente "
-"para que o` git stash apply` falhe devido aos conflitos. Como o acumulo da "
-"entrada é aplicada no topo do commit que era o `HEAD` no momento em que o `"
-"git stash` foi executado, ela restaura a condição originalmente acumulada "
-"sem os conflitos."
+msgstr "É útil caso o ramo onde você executou o `git stash push` mude o suficiente para que o` git stash apply` falhe devido aos conflitos. Como o acumulo da entrada é aplicada no topo do commit que era o `HEAD` no momento em que o `git stash` foi executado, ela restaura a condição originalmente acumulada sem os conflitos."
 
 #. type: Labeled list
 #: en/git-stash.txt:128
@@ -57417,10 +49972,7 @@ msgstr "clear"
 #: en/git-stash.txt:132
 #, priority:240
 msgid "Remove all the stash entries. Note that those entries will then be subject to pruning, and may be impossible to recover (see 'Examples' below for a possible strategy)."
-msgstr ""
-"Remova todos os lançamentos acumulados. Observe que estas entradas estarão "
-"sujeitas a remoção e podem ser impossíveis de serem recuperadas (consulte "
-"'Exemplos' abaixo para uma possível estratégia)."
+msgstr "Remova todos os lançamentos acumulados. Observe que estas entradas estarão sujeitas a remoção e podem ser impossíveis de serem recuperadas (consulte 'Exemplos' abaixo para uma possível estratégia)."
 
 #. type: Labeled list
 #: en/git-stash.txt:133
@@ -57444,11 +49996,7 @@ msgstr "create"
 #: en/git-stash.txt:144
 #, priority:240
 msgid "Create a stash entry (which is a regular commit object) and return its object name, without storing it anywhere in the ref namespace.  This is intended to be useful for scripts.  It is probably not the command you want to use; see \"push\" above."
-msgstr ""
-"Crie uma entrada 'stash' (que é um objeto commit comum) e retorne seu nome "
-"de objeto, sem armazená-la em qualquer outro lugar no espaço de nomes \"ref\""
-".  Isso tem a intenção de ser útil para scripts.  Provavelmente não é o "
-"comando que você deseja usar; veja o \"push\" acima."
+msgstr "Crie uma entrada 'stash' (que é um objeto commit comum) e retorne seu nome de objeto, sem armazená-la em qualquer outro lugar no espaço de nomes \"ref\".  Isso tem a intenção de ser útil para scripts.  Provavelmente não é o comando que você deseja usar; veja o \"push\" acima."
 
 #. type: Labeled list
 #: en/git-stash.txt:145
@@ -57460,12 +50008,7 @@ msgstr "store"
 #: en/git-stash.txt:151
 #, priority:240
 msgid "Store a given stash created via 'git stash create' (which is a dangling merge commit) in the stash ref, updating the stash reflog.  This is intended to be useful for scripts.  It is probably not the command you want to use; see \"push\" above."
-msgstr ""
-"Armazene um determinado \"stash\" criado através do comando 'git stash "
-"create' (que é um commit pendente de mesclagem) na \"ref\" determinada, "
-"atualizando o \"reflog\" do \"stash\".  Isso tem a intenção de ser útil para "
-"scripts.  Provavelmente não é o comando que você deseja usar; veja o \"push\""
-" acima."
+msgstr "Armazene um determinado \"stash\" criado através do comando 'git stash create' (que é um commit pendente de mesclagem) na \"ref\" determinada, atualizando o \"reflog\" do \"stash\".  Isso tem a intenção de ser útil para scripts.  Provavelmente não é o comando que você deseja usar; veja o \"push\" acima."
 
 #. type: Plain text
 #: en/git-stash.txt:157 en/git-stash.txt:164 en/git-stash.txt:180 en/git-stash.txt:186
@@ -57477,9 +50020,7 @@ msgstr "Esta opção só é válida para os comandos `push` e `save`."
 #: en/git-stash.txt:160
 #, priority:240
 msgid "All ignored and untracked files are also stashed and then cleaned up with `git clean`."
-msgstr ""
-"Todos os arquivos ignorados e não monitorados também são armazenados em "
-"cache e limpos com o comando `git clean`."
+msgstr "Todos os arquivos ignorados e não monitorados também são armazenados em cache e limpos com o comando `git clean`."
 
 #. type: Labeled list
 #: en/git-stash.txt:162
@@ -57491,9 +50032,7 @@ msgstr "--include-untracked"
 #: en/git-stash.txt:167
 #, priority:240
 msgid "All untracked files are also stashed and then cleaned up with `git clean`."
-msgstr ""
-"Todos os arquivos que não sejam monitorados também são escondidos e limpos "
-"com o `git clean`."
+msgstr "Todos os arquivos que não sejam monitorados também são escondidos e limpos com o `git clean`."
 
 #. type: Plain text
 #: en/git-stash.txt:170
@@ -57505,11 +50044,7 @@ msgstr "Esta opção só é válida para os comandos `pop` e `apply`."
 #: en/git-stash.txt:175
 #, priority:240
 msgid "Tries to reinstate not only the working tree's changes, but also the index's ones. However, this can fail, when you have conflicts (which are stored in the index, where you therefore can no longer apply the changes as they were originally)."
-msgstr ""
-"Tenta restabelecer não apenas as alterações da árvore de trabalho, mas "
-"também as do índice. No entanto, isso pode falhar quando há conflitos (que "
-"são armazenados no índice e portanto, não é mais possível aplicar as "
-"alterações como eram originalmente)."
+msgstr "Tenta restabelecer não apenas as alterações da árvore de trabalho, mas também as do índice. No entanto, isso pode falhar quando há conflitos (que são armazenados no índice e portanto, não é mais possível aplicar as alterações como eram originalmente)."
 
 #. type: Labeled list
 #: en/git-stash.txt:177
@@ -57539,9 +50074,7 @@ msgstr "Selecione a diferença entre os blocos interativamente entre HEAD e a á
 #: en/git-stash.txt:197
 #, priority:240
 msgid "The `--patch` option implies `--keep-index`.  You can use `--no-keep-index` to override this."
-msgstr ""
-"A opção `--patch` implica no uso da opção `--keep-index`.  Você pode usar a "
-"`--no-keep-index` para substituir isso."
+msgstr "A opção `--patch` implica no uso da opção `--keep-index`.  Você pode usar a `--no-keep-index` para substituir isso."
 
 #. type: Plain text
 #: en/git-stash.txt:200 en/git-stash.txt:210 en/git-stash.txt:224 en/git-stash.txt:229
@@ -57565,12 +50098,7 @@ msgstr "Separa o 'pathspec' das opções para fins de desambiguação."
 #: en/git-stash.txt:234
 #, priority:240
 msgid "The new stash entry records the modified states only for the files that match the pathspec.  The index entries and working tree files are then rolled back to the state in HEAD only for these files, too, leaving files that do not match the pathspec intact."
-msgstr ""
-"A nova entrada stash registra as condições alteradas apenas para os arquivos "
-"que coincidam com o 'pathspec'.  As entradas de índice e os arquivos da "
-"árvore de trabalho são revertidos para a condição no `HEAD` apenas para "
-"estes arquivos, deixando também os arquivos que não correspondem ao "
-"'pathspec' intactos."
+msgstr "A nova entrada stash registra as condições alteradas apenas para os arquivos que coincidam com o 'pathspec'.  As entradas de índice e os arquivos da árvore de trabalho são revertidos para a condição no `HEAD` apenas para estes arquivos, deixando também os arquivos que não correspondem ao 'pathspec' intactos."
 
 #. type: Labeled list
 #: en/git-stash.txt:237
@@ -57588,20 +50116,13 @@ msgstr "Esta opção só é válida para os comandos `apply`, `branch`, `drop`,
 #: en/git-stash.txt:243
 #, priority:240
 msgid "A reference of the form `stash@{<revision>}`. When no `<stash>` is given, the latest stash is assumed (that is, `stash@{0}`)."
-msgstr ""
-"Uma referência do formulário `stash@{<revisão>}`. Quando nenhum `<stash>` é "
-"informado, o último \"stash\" é assumido (ou seja, `stash@{0}`)."
+msgstr "Uma referência do formulário `stash@{<revisão>}`. Quando nenhum `<stash>` é informado, o último \"stash\" é assumido (ou seja, `stash@{0}`)."
 
 #. type: Plain text
 #: en/git-stash.txt:252
 #, priority:240
 msgid "A stash entry is represented as a commit whose tree records the state of the working directory, and its first parent is the commit at `HEAD` when the entry was created.  The tree of the second parent records the state of the index when the entry is made, and it is made a child of the `HEAD` commit.  The ancestry graph looks like this:"
-msgstr ""
-"Uma o lançamento no estoque 'stash' é representado como um commit cuja "
-"árvore registra a condição do diretório de trabalho e a sua primeira origem "
-"é o commit no `HEAD` quando a entrada foi criada.  A árvore da segunda "
-"origem registra a condição do índice quando o lançamento é feito, e é feito "
-"um herdeiro do commit `HEAD`.  O grafo de ascendência fica assim:"
+msgstr "Uma o lançamento no estoque 'stash' é representado como um commit cuja árvore registra a condição do diretório de trabalho e a sua primeira origem é o commit no `HEAD` quando a entrada foi criada.  A árvore da segunda origem registra a condição do índice quando o lançamento é feito, e é feito um herdeiro do commit `HEAD`.  O grafo de ascendência fica assim:"
 
 #. type: Plain text
 #: en/git-stash.txt:256
@@ -57619,9 +50140,7 @@ msgstr ""
 #: en/git-stash.txt:260
 #, priority:240
 msgid "where `H` is the `HEAD` commit, `I` is a commit that records the state of the index, and `W` is a commit that records the state of the working tree."
-msgstr ""
-"onde `H` é o commit `HEAD`, `I` é um commit que registra a condição do "
-"índice e `W` é um commit que registra a condição da árvore de trabalho."
+msgstr "onde `H` é o commit `HEAD`, `I` é um commit que registra a condição do índice e `W` é um commit que registra a condição da árvore de trabalho."
 
 #. type: Labeled list
 #: en/git-stash.txt:265
@@ -57633,21 +50152,13 @@ msgstr "Obtendo de um diretório sujo"
 #: en/git-stash.txt:271
 #, priority:240
 msgid "When you are in the middle of something, you learn that there are upstream changes that are possibly relevant to what you are doing.  When your local changes do not conflict with the changes in the upstream, a simple `git pull` will let you move forward."
-msgstr ""
-"Quando você está no meio de alguma coisa, aprende que há alterações upstream "
-"que são possivelmente relevantes para o que você está fazendo.  Quando as "
-"suas alterações locais não entrarem em conflito com as alterações na "
-"\"upstream\", um simples `git pull` permitirá que você avance."
+msgstr "Quando você está no meio de alguma coisa, aprende que há alterações upstream que são possivelmente relevantes para o que você está fazendo.  Quando as suas alterações locais não entrarem em conflito com as alterações na \"upstream\", um simples `git pull` permitirá que você avance."
 
 #. type: Plain text
 #: en/git-stash.txt:276
 #, priority:240
 msgid "However, there are cases in which your local changes do conflict with the upstream changes, and `git pull` refuses to overwrite your changes.  In such a case, you can stash your changes away, perform a pull, and then unstash, like this:"
-msgstr ""
-"No entanto, há casos onde as suas alterações locais entram em conflito com "
-"as alterações na upstream, e o `git pull` se recusa a sobrescrever as suas "
-"alterações.  Nesse caso, é possível ocultar as suas alterações, executar um "
-"'pull' e remover da pilha, da seguinte maneira:"
+msgstr "No entanto, há casos onde as suas alterações locais entram em conflito com as alterações na upstream, e o `git pull` se recusa a sobrescrever as suas alterações.  Nesse caso, é possível ocultar as suas alterações, executar um 'pull' e remover da pilha, da seguinte maneira:"
 
 #. type: delimited block -
 #: en/git-stash.txt:284
@@ -57671,11 +50182,7 @@ msgstr ""
 #: en/git-stash.txt:292
 #, priority:240
 msgid "When you are in the middle of something, your boss comes in and demands that you fix something immediately.  Traditionally, you would make a commit to a temporary branch to store your changes away, and return to your original branch to make the emergency fix, like this:"
-msgstr ""
-"Quando você está no meio de alguma coisa, seu chefe entra e exige que você "
-"conserte algo imediatamente.  Tradicionalmente, você faria um commit em um "
-"ramo temporário para armazenar as suas alterações e retornava ao ramo "
-"original para fazer a correção de emergência, assim:"
+msgstr "Quando você está no meio de alguma coisa, seu chefe entra e exige que você conserte algo imediatamente.  Tradicionalmente, você faria um commit em um ramo temporário para armazenar as suas alterações e retornava ao ramo original para fazer a correção de emergência, assim:"
 
 #. type: delimited block -
 #: en/git-stash.txt:303
@@ -57849,9 +50356,7 @@ msgstr "Forneça a saída em um formato fácil de analisar para os scripts.  Iss
 #: en/git-status.txt:46
 #, priority:280
 msgid "The version parameter is used to specify the format version.  This is optional and defaults to the original version 'v1' format."
-msgstr ""
-"O parâmetro da versão é utilizado para definir a versão do formato.  Este é "
-"opcional e retorna para a predefinição do formato da versão original 'v1'."
+msgstr "O parâmetro da versão é utilizado para definir a versão do formato.  Este é opcional e retorna para a predefinição do formato da versão original 'v1'."
 
 #. type: Plain text
 #: en/git-status.txt:49
@@ -57869,11 +50374,7 @@ msgstr "Além dos nomes dos arquivos que foram alterados, exiba também as alter
 #: en/git-status.txt:66
 #, priority:280
 msgid "The mode parameter is used to specify the handling of untracked files.  It is optional: it defaults to 'all', and if specified, it must be stuck to the option (e.g. `-uno`, but not `-u no`)."
-msgstr ""
-"O parâmetro `modo` é utilizado para definir a manipulação dos arquivos não "
-"rastreados.  É opcional: a predefinição retorna para 'all' e caso seja "
-"definido, deve estar junto a opção (como por exemplo, `-uno`, porém não `-u "
-"no`)."
+msgstr "O parâmetro `modo` é utilizado para definir a manipulação dos arquivos não rastreados.  É opcional: a predefinição retorna para 'all' e caso seja definido, deve estar junto a opção (como por exemplo, `-uno`, porém não `-u no`)."
 
 #. type: Plain text
 #: en/git-status.txt:70
@@ -57897,23 +50398,7 @@ msgstr "Quando a opção `-u` não é utilizada, os arquivos e diretórios não
 #: en/git-status.txt:101
 #, priority:280
 msgid "Ignore changes to submodules when looking for changes. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses the output of submodule summaries when the config option `status.submoduleSummary` is set)."
-msgstr ""
-"Ignore as alterações nos submódulos ao procular pelas alterações. O "
-"`<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/"
-"rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que é a predefinição.  O "
-"\"none\" considera o submódulo modificado quando houver arquivos não estejam "
-"rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado "
-"no superprojeto, pode ser utilizado para substituir qualquer configuração da "
-"opção 'ignore' (ignorar) em  linkgit:git-config[1] ou linkgit:gitmodules[5]. "
-"Quando o \"untracked\" é utilizado, os submódulos não são considerados sujos "
-"quando houver apenas  um conteúdo sem rastreamento (porém o monitoramento de "
-"alterações do seu conteúdo continua) O uso de \"dirty\" ignora todas as "
-"alterações na árvore de trabalho dos submódulos, apenas as alterações nos "
-"commit que foram armazenados no superprojeto são exibidos (esse era o "
-"comportamento anterior a versão 1.7.0). O uso de \"all\" oculta todas as "
-"alterações nos submódulos (e suprime a saída dos resumos dos submódulos "
-"quando a variável de configuração `status.submoduleSummary` estiver "
-"definida)."
+msgstr "Ignore as alterações nos submódulos ao procular pelas alterações. O `<quando>` pode ser \"none\" (nenhum), \"untracked\" (sem monitoramento/rastreamento), \"dirty\" (sujo) ou \"all\" (todos), que é a predefinição.  O \"none\" considera o submódulo modificado quando houver arquivos não estejam rastreados, modificados ou o seu `HEAD` seja diferente do commit registrado no superprojeto, pode ser utilizado para substituir qualquer configuração da opção 'ignore' (ignorar) em  linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando o \"untracked\" é utilizado, os submódulos não são considerados sujos quando houver apenas  um conteúdo sem rastreamento (porém o monitoramento de alterações do seu conteúdo continua) O uso de \"dirty\" ignora todas as alterações na árvore de trabalho dos submódulos, apenas as alterações nos commit que foram armazenados no superprojeto são exibidos (esse era o comportamento anterior a versão 1.7.0). O uso de \"all\" oculta todas as alterações nos submódulos (e suprime a saída dos resumos dos submódulos quando a variável de configuração `status.submoduleSummary` estiver definida)."
 
 #. type: Labeled list
 #: en/git-status.txt:102
@@ -57931,9 +50416,7 @@ msgstr "Exiba os arquivos ignorados também."
 #: en/git-status.txt:108
 #, priority:280
 msgid "The mode parameter is used to specify the handling of ignored files.  It is optional: it defaults to 'traditional'."
-msgstr ""
-"O parâmetro de modo é utilizado para definir o manuseio dos arquivos "
-"ignorados.  É opcional: a sua predefinição retorna para 'traditional'."
+msgstr "O parâmetro de modo é utilizado para definir o manuseio dos arquivos ignorados.  É opcional: a sua predefinição retorna para 'traditional'."
 
 #. type: Plain text
 #: en/git-status.txt:112
@@ -57975,13 +50458,7 @@ msgstr "ignora o padrão.\n"
 #: en/git-status.txt:124
 #, priority:280
 msgid "When 'matching' mode is specified, paths that explicitly match an ignored pattern are shown. If a directory matches an ignore pattern, then it is shown, but not paths contained in the ignored directory. If a directory does not match an ignore pattern, but all contents are ignored, then the directory is not shown, but all contents are shown."
-msgstr ""
-"Quando o modo 'matching' é utilizado, os caminhos que coincidam "
-"explicitamente a um padrão ignorado são exibidos. Caso um diretório "
-"coincidir com um padrão a ser ignorado, ele será exibido, mas não os "
-"caminhos existentes no diretório ignorado. Caso um diretório não coincida "
-"com um padrão a ser ignorado, mas todo o conteúdo for ignorado, o diretório "
-"não será exibido, mas todo o resto do conteúdo será."
+msgstr "Quando o modo 'matching' é utilizado, os caminhos que coincidam explicitamente a um padrão ignorado são exibidos. Caso um diretório coincidir com um padrão a ser ignorado, ele será exibido, mas não os caminhos existentes no diretório ignorado. Caso um diretório não coincida com um padrão a ser ignorado, mas todo o conteúdo for ignorado, o diretório não será exibido, mas todo o resto do conteúdo será."
 
 #. type: Plain text
 #: en/git-status.txt:129
@@ -57993,11 +50470,7 @@ msgstr "Terminar as entradas com `NUL`, em vez de `LF`.  Isto implica o formato
 #: en/git-status.txt:136
 #, priority:280
 msgid "Display untracked files in columns. See configuration variable column.status for option syntax.`--column` and `--no-column` without options are equivalent to 'always' and 'never' respectively."
-msgstr ""
-"Exiba os arquivos que não foram rastreados em colunas. Veja a variável de "
-"configuração `column.status` para conhecer a sintaxe desta opção.`--column` "
-"e `--no-column` sem as opções são equivalentes a 'always' e 'never' "
-"respectivamente."
+msgstr "Exiba os arquivos que não foram rastreados em colunas. Veja a variável de configuração `column.status` para conhecer a sintaxe desta opção.`--column` e `--no-column` sem as opções são equivalentes a 'always' e 'never' respectivamente."
 
 #. type: Labeled list
 #: en/git-status.txt:137
@@ -58015,9 +50488,7 @@ msgstr "--no-ahead-behind"
 #: en/git-status.txt:141
 #, priority:280
 msgid "Display or do not display detailed ahead/behind counts for the branch relative to its upstream branch.  Defaults to true."
-msgstr ""
-"Exiba ou não as contagens detalhadas antecipadas/atrasadas do ramo em "
-"relação a ramificação `upstream`.  A predefinição retorna para `true`."
+msgstr "Exiba ou não as contagens detalhadas antecipadas/atrasadas do ramo em relação a ramificação `upstream`.  A predefinição retorna para `true`."
 
 #. type: Labeled list
 #: en/git-status.txt:142
@@ -58087,12 +50558,7 @@ msgstr "onde `ORIG_PATH` é de onde veio o conteúdo renomeado/copiado. O `ORIG_
 #: en/git-status.txt:186
 #, priority:280
 msgid "The fields (including the `->`) are separated from each other by a single space. If a filename contains whitespace or other nonprintable characters, that field will be quoted in the manner of a C string literal: surrounded by ASCII double quote (34) characters, and with interior special characters backslash-escaped."
-msgstr ""
-"Os campos (incluindo o `->`) estão separados um do outro por um único "
-"espaço. Caso um nome do arquivo contenha um espaço ou outros caracteres não "
-"imprimíveis, este campo será citado na forma de uma string C literal: "
-"cercado por caracteres ASCII com aspas duplas (34) e com os caracteres "
-"especiais internos escapados por barra invertida."
+msgstr "Os campos (incluindo o `->`) estão separados um do outro por um único espaço. Caso um nome do arquivo contenha um espaço ou outros caracteres não imprimíveis, este campo será citado na forma de uma string C literal: cercado por caracteres ASCII com aspas duplas (34) e com os caracteres especiais internos escapados por barra invertida."
 
 #. type: Plain text
 #: en/git-status.txt:192
@@ -58417,15 +50883,12 @@ msgstr ""
 "<mW>        O modo de um arquivo octal na árvore de trabalho.\n"
 "<hH>        O nome do objeto no HEAD.\n"
 "<hI>        O nome do objeto no índice.\n"
-"<X><score>  O renomeamento ou a cópia do score \"placar\"(denota a "
-"porcentagem\n"
+"<X><score>  O renomeamento ou a cópia do score \"placar\"(denota a porcentagem\n"
 "\t    ou a similaridade entre a fonte e o destino da ação de\n"
 "\t    mover ou copiar. Por exemplo, \"R100\" ou \"C75\".\n"
-"<caminho>      O `pathname` \"nome do caminho\".  Em um lançamento de "
-"renomeação/cópia,\n"
+"<caminho>      O `pathname` \"nome do caminho\".  Em um lançamento de renomeação/cópia,\n"
 "\t    este é o caminho de destino.\n"
-"<sep>       Quando a opção `-z` for utilizada, os 2 `pathnames` são "
-"separados\n"
+"<sep>       Quando a opção `-z` for utilizada, os 2 `pathnames` são separados\n"
 "\t    com um byte `NUL` (ASCII 0x00); senão um byte tab (ASCII 0x09)\n"
 "\t    que os separam.\n"
 "<origPath>  O `pathname` dentro do commit localizado no HEAD ou no índice.\n"
@@ -58533,10 +50996,7 @@ msgstr "Quando a opção `z` é utilizada os `pathnames` são exibidos como est
 #: en/git-status.txt:399
 #, priority:280
 msgid "Without the `-z` option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
-msgstr ""
-"Sem a opção `z`, os `pathnames` com os caracteres \"incomuns\" são citados "
-"conforme explicado na variável de configuração `core.quotePath` (consulte "
-"linkgit:git-config[1])."
+msgstr "Sem a opção `z`, os `pathnames` com os caracteres \"incomuns\" são citados conforme explicado na variável de configuração `core.quotePath` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-status.txt:408
@@ -58548,28 +51008,13 @@ msgstr "O comando segue a variável `color.status` (ou `status.color`, ambos tê
 #: en/git-status.txt:412
 #, priority:280
 msgid "If the config variable `status.relativePaths` is set to false, then all paths shown are relative to the repository root, not to the current directory."
-msgstr ""
-"Se a variável de configuração `status.relativePaths` estiver configurada "
-"como `false`, todos os caminhos exibidos serão relativos à raiz do "
-"repositório e não ao diretório atual."
+msgstr "Se a variável de configuração `status.relativePaths` estiver configurada como `false`, todos os caminhos exibidos serão relativos à raiz do repositório e não ao diretório atual."
 
 #. type: Plain text
 #: en/git-status.txt:423
 #, priority:280
 msgid "If `status.submoduleSummary` is set to a non zero number or true (identical to -1 or an unlimited number), the submodule summary will be enabled for the long format and a summary of commits for modified submodules will be shown (see --summary-limit option of linkgit:git-submodule[1]). Please note that the summary output from the status command will be suppressed for all submodules when `diff.ignoreSubmodules` is set to 'all' or only for those submodules where `submodule.<name>.ignore=all`. To also view the summary for ignored submodules you can either use the --ignore-submodules=dirty command line option or the 'git submodule summary' command, which shows a similar output but does not honor these settings."
-msgstr ""
-"Se a variável `status.submoduleSummary` for definida como um número "
-"diferente de zero ou `true` (idêntico a `-1` ou um número ilimitado), o "
-"resumo do submódulo será ativado para o formato longo e um resumo dos "
-"commits para os submódulos modificados serão exibidos (consulte a opção "
-"--summary-limit de linkgit:git-submodule[1]). Por favor note que a saída "
-"resumida do comando status será suprimida para todos os submódulos quando a "
-"variável `diff.ignoreSubmodules` estiver definida como `all` ou apenas para "
-"aqueles submódulos em onde seja o mesmo que `submodule.<nome>.ignore=all`. "
-"Para visualizar também o resumo dos submódulos ignorados, você pode usar a "
-"opção de clinha de comando `--ignore-submodules=dirty ` ou o comando `git "
-"submodule summary`, que exibe uma saída semelhante porém não respeita estas "
-"configurações."
+msgstr "Se a variável `status.submoduleSummary` for definida como um número diferente de zero ou `true` (idêntico a `-1` ou um número ilimitado), o resumo do submódulo será ativado para o formato longo e um resumo dos commits para os submódulos modificados serão exibidos (consulte a opção --summary-limit de linkgit:git-submodule[1]). Por favor note que a saída resumida do comando status será suprimida para todos os submódulos quando a variável `diff.ignoreSubmodules` estiver definida como `all` ou apenas para aqueles submódulos em onde seja o mesmo que `submodule.<nome>.ignore=all`. Para visualizar também o resumo dos submódulos ignorados, você pode usar a opção de clinha de comando `--ignore-submodules=dirty ` ou o comando `git submodule summary`, que exibe uma saída semelhante porém não respeita estas configurações."
 
 #. type: Title -
 #: en/git-status.txt:425
@@ -58609,10 +51054,7 @@ msgstr ""
 #: en/git-stripspace.txt:21
 #, priority:100
 msgid "Read text, such as commit messages, notes, tags and branch descriptions, from the standard input and clean it in the manner used by Git."
-msgstr ""
-"Leia o texto, como mensagens de commit, notas, tags e suas respectivas "
-"descrições das ramificações, da entrada padrão e limpe-o da maneira "
-"utilizada pelo Git."
+msgstr "Leia o texto, como mensagens de commit, notas, tags e suas respectivas descrições das ramificações, da entrada padrão e limpe-o da maneira utilizada pelo Git."
 
 #. type: Plain text
 #: en/git-stripspace.txt:23
@@ -58648,9 +51090,7 @@ msgstr "adiciona um '\\n' ausente à última linha se for necessário."
 #: en/git-stripspace.txt:31
 #, priority:100
 msgid "In the case where the input consists entirely of whitespace characters, no output will be produced."
-msgstr ""
-"No caso em que a entrada consiste inteiramente em caracteres de espaço, "
-"nenhuma saída será produzida."
+msgstr "No caso em que a entrada consiste inteiramente em caracteres de espaço, nenhuma saída será produzida."
 
 #. type: Plain text
 #: en/git-stripspace.txt:35
@@ -58660,8 +51100,7 @@ msgid ""
 "mode of linkgit:git-apply[1] for correcting whitespace of patches or files in\n"
 "the repository.\n"
 msgstr ""
-"* NOTA *: Destina-se à limpeza de metadados, prefira o modo "
-"`--whitespace=fix`\n"
+"* NOTA *: Destina-se à limpeza de metadados, prefira o modo `--whitespace=fix`\n"
 "do linkgit:git-apply[1] para corrigir os espaços dos patches ou os\n"
 "arquivos no repositório.\n"
 
@@ -58687,10 +51126,7 @@ msgstr "--comment-lines"
 #: en/git-stripspace.txt:47
 #, priority:100
 msgid "Prepend comment character and blank to each line. Lines will automatically be terminated with a newline. On empty lines, only the comment character will be prepended."
-msgstr ""
-"Coloque um caractere de comentário previamente com espaço em cada linha. As "
-"linhas serão automaticamente terminadas com uma nova linha. Nas linhas "
-"vazias, apenas o caractere de comentário será anexado."
+msgstr "Coloque um caractere de comentário previamente com espaço em cada linha. As linhas serão automaticamente terminadas com uma nova linha. Nas linhas vazias, apenas o caractere de comentário será anexado."
 
 #. type: Plain text
 #: en/git-stripspace.txt:52
@@ -58850,10 +51286,7 @@ msgstr "add [-b <ramo>] [-f|--force] [--name <nome>] [--reference <repositório>
 #: en/git-submodule.txt:41
 #, priority:220
 msgid "Add the given repository as a submodule at the given path to the changeset to be committed next to the current project: the current project is termed the \"superproject\"."
-msgstr ""
-"Adicione o repositório informado como um submódulo no caminho especificado "
-"ao conjunto de alterações para ser feito o commit ao lado do projeto atual: "
-"o projeto atual é chamado de \"superproject\"."
+msgstr "Adicione o repositório informado como um submódulo no caminho especificado ao conjunto de alterações para ser feito o commit ao lado do projeto atual: o projeto atual é chamado de \"superproject\"."
 
 #. type: Plain text
 #: en/git-submodule.txt:50
@@ -58871,15 +51304,7 @@ msgstr "A predefinição do ramo remoto é que ele seja monitorado pelo ramo atu
 #: en/git-submodule.txt:66
 #, priority:220
 msgid "The optional argument <path> is the relative location for the cloned submodule to exist in the superproject. If <path> is not given, the canonical part of the source repository is used (\"repo\" for \"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is already a valid Git repository, then it is staged for commit without cloning. The <path> is also used as the submodule's logical name in its configuration entries unless `--name` is used to specify a logical name."
-msgstr ""
-"O argumento opcional `<caminho>` é o local relativo para que o submódulo "
-"clonado exista no superprojeto. Caso o `<caminho>` não seja informado, a "
-"parte canônica do repositório da origem será utilizada (\"repo\" para o \"/"
-"path/to/repo.git\" e \"foo\" para o \"host.xz:foo/.git\"). Caso o `<caminho>`"
-" exista e já for um repositório Git válido, ele será preparado para o commit "
-"sem clonagem. O `<caminho>` também é utilizado como o nome lógico do sub-"
-"módulo nas suas entradas de configuração, a menos que `--name` seja "
-"utilizado para definir um nome lógico."
+msgstr "O argumento opcional `<caminho>` é o local relativo para que o submódulo clonado exista no superprojeto. Caso o `<caminho>` não seja informado, a parte canônica do repositório da origem será utilizada (\"repo\" para o \"/path/to/repo.git\" e \"foo\" para o \"host.xz:foo/.git\"). Caso o `<caminho>` exista e já for um repositório Git válido, ele será preparado para o commit sem clonagem. O `<caminho>` também é utilizado como o nome lógico do sub-módulo nas suas entradas de configuração, a menos que `--name` seja utilizado para definir um nome lógico."
 
 #. type: Plain text
 #: en/git-submodule.txt:74
@@ -58927,24 +51352,13 @@ msgstr "init [--] [<caminho>...]"
 #: en/git-submodule.txt:102
 #, priority:220
 msgid "Initialize the submodules recorded in the index (which were added and committed elsewhere) by setting `submodule.$name.url` in .git/config. It uses the same setting from `.gitmodules` as a template. If the URL is relative, it will be resolved using the default remote. If there is no default remote, the current repository will be assumed to be upstream."
-msgstr ""
-"Inicialize os submódulos registrados no índice (que foram adicionados e onde "
-"os commits foram feitos em outros lugares) configurando o `submodule.$name."
-"url` no `.git/config`. Ele usa a mesma configuração do `.gitmodules` como um "
-"modelo. Caso a URL seja relativa, será resolvido utilizando ramo remoto "
-"predefinido. Caso não nenhum ramo remoto seja predefinido, o repositório "
-"atual será reconhecido como sendo a upstream."
+msgstr "Inicialize os submódulos registrados no índice (que foram adicionados e onde os commits foram feitos em outros lugares) configurando o `submodule.$name.url` no `.git/config`. Ele usa a mesma configuração do `.gitmodules` como um modelo. Caso a URL seja relativa, será resolvido utilizando ramo remoto predefinido. Caso não nenhum ramo remoto seja predefinido, o repositório atual será reconhecido como sendo a upstream."
 
 #. type: Plain text
 #: en/git-submodule.txt:107
 #, priority:220
 msgid "Optional <path> arguments limit which submodules will be initialized.  If no path is specified and submodule.active has been configured, submodules configured to be active will be initialized, otherwise all submodules are initialized."
-msgstr ""
-"Os argumentos opcionais do `<caminho>` limitam quais foram os submódulos que "
-"serão inicializados.  Caso nenhum caminho seja informado e o `submodule."
-"active` tenha sido configurado, apenas os submódulos configurados para "
-"estarem ativos serão inicializados, caso contrário, todos os submódulos "
-"serão."
+msgstr "Os argumentos opcionais do `<caminho>` limitam quais foram os submódulos que serão inicializados.  Caso nenhum caminho seja informado e o `submodule.active` tenha sido configurado, apenas os submódulos configurados para estarem ativos serão inicializados, caso contrário, todos os submódulos serão."
 
 #. type: Plain text
 #: en/git-submodule.txt:115
@@ -58968,14 +51382,7 @@ msgstr "deinit [-f|--force] (--all|[--] <caminho>...)"
 #: en/git-submodule.txt:125
 #, priority:220
 msgid "Unregister the given submodules, i.e. remove the whole `submodule.$name` section from .git/config together with their work tree. Further calls to `git submodule update`, `git submodule foreach` and `git submodule sync` will skip any unregistered submodules until they are initialized again, so use this command if you don't want to have a local checkout of the submodule in your working tree anymore."
-msgstr ""
-"Cancele o registro dos submódulos informado, ou seja, remova toda a seção "
-"`submodule.$name` do `.git/config` junto com a sua árvore de trabalho. "
-"Outras futuras chamadas para o comando `git submodule update`, `git "
-"submodule foreach` e `git submodule sync` irão ignorar todos os submódulos "
-"não registrados até que sejam inicializados novamente, então utilize este "
-"comando caso não queira mais fazer uma verificação do submódulo na sua "
-"árvore de trabalho local."
+msgstr "Cancele o registro dos submódulos informado, ou seja, remova toda a seção `submodule.$name` do `.git/config` junto com a sua árvore de trabalho. Outras futuras chamadas para o comando `git submodule update`, `git submodule foreach` e `git submodule sync` irão ignorar todos os submódulos não registrados até que sejam inicializados novamente, então utilize este comando caso não queira mais fazer uma verificação do submódulo na sua árvore de trabalho local."
 
 #. type: Plain text
 #: en/git-submodule.txt:128
@@ -59005,16 +51412,7 @@ msgstr "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-
 #: en/git-submodule.txt:148
 #, priority:220
 msgid "Update the registered submodules to match what the superproject expects by cloning missing submodules, fetching missing commits in submodules and updating the working tree of the submodules. The \"updating\" can be done in several ways depending on command line options and the value of `submodule.<name>.update` configuration variable. The command line option takes precedence over the configuration variable. If neither is given, a 'checkout' is performed.  The 'update' procedures supported both from the command line as well as through the `submodule.<name>.update` configuration are:"
-msgstr ""
-"Atualize os submódulos registrados para que coincidam com o que o "
-"superprojeto espera, clonando os submódulos ausentes, capturando os commit "
-"que estejam ausentes nos submódulos e atualizando a árvore de trabalho dos "
-"submódulos. A \"atualização\" pode ser feita de várias maneiras, dependendo "
-"das opções da linha de comando e do valor da variável de configuração "
-"`submodule.<nome>.update`. A opção da linha de comando tem precedência sobre "
-"a variável de configuração. Caso nenhum seja informado, um 'checkout' é "
-"realizado.  Os procedimentos de 'atualização' compatíveis tanto na linha de "
-"comando quanto na configuração `submodule.<nome>.update` são:"
+msgstr "Atualize os submódulos registrados para que coincidam com o que o superprojeto espera, clonando os submódulos ausentes, capturando os commit que estejam ausentes nos submódulos e atualizando a árvore de trabalho dos submódulos. A \"atualização\" pode ser feita de várias maneiras, dependendo das opções da linha de comando e do valor da variável de configuração `submodule.<nome>.update`. A opção da linha de comando tem precedência sobre a variável de configuração. Caso nenhum seja informado, um 'checkout' é realizado.  Os procedimentos de 'atualização' compatíveis tanto na linha de comando quanto na configuração `submodule.<nome>.update` são:"
 
 #. type: Labeled list
 #: en/git-submodule.txt:149
@@ -59134,8 +51532,9 @@ msgstr "set-branch (-d|--default) [--] <caminho>"
 
 #. type: Plain text
 #: en/git-submodule.txt:187
-#, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+#, fuzzy, priority:220
+#| msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr "Define o submódulo como predefinido nos ramos monitorados remotamente. A opção `--branch` permite que o nome do ramo remoto seja definido. A opção `--default` remove a chave da configuração `submodule.<nome>.branch`, que faz com que a predefinição do ramo monitorado seja 'master'."
 
 #. type: Labeled list
@@ -59148,9 +51547,7 @@ msgstr "set-url [--] <caminho> <newurl>"
 #: en/git-submodule.txt:192
 #, priority:220
 msgid "Sets the URL of the specified submodule to <newurl>. Then, it will automatically synchronize the submodule's new remote URL configuration."
-msgstr ""
-"Define a URL do submódulo informado para `<newurl>` . Em seguida, sincronize "
-"automaticamente a nova configuração da URL remota do submódulo."
+msgstr "Define a URL do submódulo informado para `<newurl>` . Em seguida, sincronize automaticamente a nova configuração da URL remota do submódulo."
 
 #. type: Labeled list
 #: en/git-submodule.txt:193
@@ -59162,15 +51559,7 @@ msgstr "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<ca
 #: en/git-submodule.txt:202
 #, priority:220
 msgid "Show commit summary between the given commit (defaults to HEAD) and working tree/index. For a submodule in question, a series of commits in the submodule between the given super project commit and the index or working tree (switched by `--cached`) are shown. If the option `--files` is given, show the series of commits in the submodule between the index of the super project and the working tree of the submodule (this option doesn't allow to use the `--cached` option or to provide an explicit commit)."
-msgstr ""
-"Exiba o resumo do commit entre o commit informado (a predefinição retorna "
-"para `HEAD`) e a árvore de trabalho/índice. Para um submódulo em questão, "
-"são exibidas uma série de commit do submódulo entre o commit do super "
-"projeto e o índice ou a árvore de trabalho (alternada por `--cached`). Caso "
-"a opção `--files` seja utilizada, exiba a série dos commits no submódulo "
-"entre o índice do super projeto e a árvore de trabalho do submódulo (esta "
-"opção não permite a utilização da opção `--cached` ou para informar um "
-"commit de forma explícita)."
+msgstr "Exiba o resumo do commit entre o commit informado (a predefinição retorna para `HEAD`) e a árvore de trabalho/índice. Para um submódulo em questão, são exibidas uma série de commit do submódulo entre o commit do super projeto e o índice ou a árvore de trabalho (alternada por `--cached`). Caso a opção `--files` seja utilizada, exiba a série dos commits no submódulo entre o índice do super projeto e a árvore de trabalho do submódulo (esta opção não permite a utilização da opção `--cached` ou para informar um commit de forma explícita)."
 
 #. type: Plain text
 #: en/git-submodule.txt:205
@@ -59188,25 +51577,7 @@ msgstr "foreach [--recursive] <comando>"
 #: en/git-submodule.txt:227
 #, priority:220
 msgid "Evaluates an arbitrary shell command in each checked out submodule.  The command has access to the variables $name, $sm_path, $displaypath, $sha1 and $toplevel: $name is the name of the relevant submodule section in `.gitmodules`, $sm_path is the path of the submodule as recorded in the immediate superproject, $displaypath contains the relative path from the current working directory to the submodules root directory, $sha1 is the commit as recorded in the immediate superproject, and $toplevel is the absolute path to the top-level of the immediate superproject.  Note that to avoid conflicts with '$PATH' on Windows, the '$path' variable is now a deprecated synonym of '$sm_path' variable.  Any submodules defined in the superproject but not checked out are ignored by this command. Unless given `--quiet`, foreach prints the name of each submodule before evaluating the command.  If `--recursive` is given, submodules are traversed recursively (i.e.  the given shell command is evaluated in nested submodules as well).  A non-zero return from the command in any submodule causes the processing to terminate. This can be overridden by adding '|| :' to the end of the command."
-msgstr ""
-"Avalia um comando arbitrário do shell em cada sub-módulo averiguado.  O "
-"comando tem acesso às variáveis `$name`, `$sm_path`, `$displaypath`, `$sha1` "
-"e `$toplevel`: '$name' é o nome da seção do submódulo relevante no `."
-"gitmodules`, '$sm_path' é o caminho do submódulo conforme foi diretamente "
-"registrado no superprojeto, '$displaypath' contém o caminho relativo do "
-"diretório de trabalho atual para o diretório raiz dos sub-módulos, '$sha1' é "
-"o commit conforme registrado diretamente no superprojeto e '$toplevel' é o "
-"caminho absoluto e direto para o nível mais alto do superprojeto.  Observe "
-"que para evitar conflitos com '$ PATH' no Windows, a variável '$path' agora "
-"é um sinônimo obsoleto da variável '$sm_path'.  Todos os submódulos "
-"definidos no superprojeto, mas sem averiguação, são ignorados por este "
-"comando. A menos que seja utilizado a opção `--quiet`, o 'foreach' imprime o "
-"nome de cada submódulo antes de avaliar o comando.  Caso a opção "
-"`--recursive` seja utilizada, os submódulos serão percorridos de forma "
-"recursiva (ou seja, o comando shell informado também será avaliado nos "
-"submódulos aninhados).  Um retorno do comando diferente de zero em qualquer "
-"submódulo, faz com que o processamento seja finalizado. Isso pode ser "
-"alterado adicionando '|| :' até o final do comando."
+msgstr "Avalia um comando arbitrário do shell em cada sub-módulo averiguado.  O comando tem acesso às variáveis `$name`, `$sm_path`, `$displaypath`, `$sha1` e `$toplevel`: '$name' é o nome da seção do submódulo relevante no `.gitmodules`, '$sm_path' é o caminho do submódulo conforme foi diretamente registrado no superprojeto, '$displaypath' contém o caminho relativo do diretório de trabalho atual para o diretório raiz dos sub-módulos, '$sha1' é o commit conforme registrado diretamente no superprojeto e '$toplevel' é o caminho absoluto e direto para o nível mais alto do superprojeto.  Observe que para evitar conflitos com '$ PATH' no Windows, a variável '$path' agora é um sinônimo obsoleto da variável '$sm_path'.  Todos os submódulos definidos no superprojeto, mas sem averiguação, são ignorados por este comando. A menos que seja utilizado a opção `--quiet`, o 'foreach' imprime o nome de cada submódulo antes de avaliar o comando.  Caso a opção `--recursive` seja utilizada, os submódulos serão percorridos de forma recursiva (ou seja, o comando shell informado também será avaliado nos submódulos aninhados).  Um retorno do comando diferente de zero em qualquer submódulo, faz com que o processamento seja finalizado. Isso pode ser alterado adicionando '|| :' até o final do comando."
 
 #. type: Plain text
 #: en/git-submodule.txt:230
@@ -59230,12 +51601,7 @@ msgstr "sync [--recursive] [--] [<caminho>...]"
 #: en/git-submodule.txt:242
 #, priority:220
 msgid "Synchronizes submodules' remote URL configuration setting to the value specified in `.gitmodules`. It will only affect those submodules which already have a URL entry in .git/config (that is the case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly."
-msgstr ""
-"Sincroniza a configuração da URL remota dos submódulos com o valor definido "
-"em `.gitmodules`. Afetará apenas os submódulos que já possuem uma entrada da "
-"URL no `.git/config` (é o caso quando eles são inicializados ou foram "
-"adicionados recentemente). É útil quando as URLs do submódulo mudam a "
-"upstream e você precisa atualizar os seus repositórios locais de acordo."
+msgstr "Sincroniza a configuração da URL remota dos submódulos com o valor definido em `.gitmodules`. Afetará apenas os submódulos que já possuem uma entrada da URL no `.git/config` (é o caso quando eles são inicializados ou foram adicionados recentemente). É útil quando as URLs do submódulo mudam a upstream e você precisa atualizar os seus repositórios locais de acordo."
 
 #. type: Plain text
 #: en/git-submodule.txt:245
@@ -59259,12 +51625,7 @@ msgstr "absorbgitdirs"
 #: en/git-submodule.txt:256
 #, priority:220
 msgid "If a git directory of a submodule is inside the submodule, move the git directory of the submodule into its superproject's `$GIT_DIR/modules` path and then connect the git directory and its working directory by setting the `core.worktree` and adding a .git file pointing to the git directory embedded in the superprojects git directory."
-msgstr ""
-"Caso um diretório git de um submódulo estiver dentro dele, mova o diretório "
-"git do submódulo para o caminho `$GIT_DIR/modules` do superprojeto, conecte "
-"o diretório git, o seu diretório de trabalho, definindo `core.worktree` e "
-"adicionando um Arquivo .git apontando para o diretório git incorporado no "
-"diretório git dos superprojetos."
+msgstr "Caso um diretório git de um submódulo estiver dentro dele, mova o diretório git do submódulo para o caminho `$GIT_DIR/modules` do superprojeto, conecte o diretório git, o seu diretório de trabalho, definindo `core.worktree` e adicionando um Arquivo .git apontando para o diretório git incorporado no diretório git dos superprojetos."
 
 #. type: Plain text
 #: en/git-submodule.txt:260
@@ -59304,15 +51665,10 @@ msgstr "-b <ramo>"
 
 #. type: Plain text
 #: en/git-submodule.txt:288
-#, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
-msgstr ""
-"O ramo do repositório para ser adicionado como um submódulo.  O nome do ramo "
-"é registrado como `submodule.<nome>.branch` no `.gitmodules` para `update "
-"--remote`.  Um valor especial de `.` é utilizado para indicar que o nome do "
-"ramo no submódulo deve ser o mesmo nome como o da ramificação atual, no "
-"repositório atual.  Caso a opção não seja utilizada, a predefinição retorna "
-"para 'master'."
+#, fuzzy, priority:220
+#| msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
+msgstr "O ramo do repositório para ser adicionado como um submódulo.  O nome do ramo é registrado como `submodule.<nome>.branch` no `.gitmodules` para `update --remote`.  Um valor especial de `.` é utilizado para indicar que o nome do ramo no submódulo deve ser o mesmo nome como o da ramificação atual, no repositório atual.  Caso a opção não seja utilizada, a predefinição retorna para 'master'."
 
 #. type: Plain text
 #: en/git-submodule.txt:301
@@ -59358,16 +51714,10 @@ msgstr "--remote"
 
 #. type: Plain text
 #: en/git-submodule.txt:329
-#, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
-msgstr ""
-"Esta opção só é válida para o comando `update`.  Em vez de utilizar o SHA-1 "
-"registrado no superprojeto para atualizar o submódulo, utilize a condição "
-"geral do submódulo do ramo monitorado remotamente.  O ramo remoto utilizado "
-"é o ramo (`branch.<nome>.remote`)  predefinido para `origin`.  O ramo remoto "
-"costumava retornar para `master`, porém o nome do ramo pode ser substituído "
-"ao definir a opção `submodule.<nome>.branch` ou entre `.gitmodules` ou `.git/"
-"config` (onde `.git/config` tem prioridade)."
+#, fuzzy, priority:220
+#| msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgstr "Esta opção só é válida para o comando `update`.  Em vez de utilizar o SHA-1 registrado no superprojeto para atualizar o submódulo, utilize a condição geral do submódulo do ramo monitorado remotamente.  O ramo remoto utilizado é o ramo (`branch.<nome>.remote`)  predefinido para `origin`.  O ramo remoto costumava retornar para `master`, porém o nome do ramo pode ser substituído ao definir a opção `submodule.<nome>.branch` ou entre `.gitmodules` ou `.git/config` (onde `.git/config` tem prioridade)."
 
 #. type: Plain text
 #: en/git-submodule.txt:335
@@ -59385,16 +51735,7 @@ msgstr "Para garantir uma condição de monitoramento da ramificação atual, `u
 #: en/git-submodule.txt:350
 #, priority:220
 msgid "Use this option to integrate changes from the upstream subproject with your submodule's current HEAD.  Alternatively, you can run `git pull` from the submodule, which is equivalent except for the remote branch name: `update --remote` uses the default upstream repository and `submodule.<name>.branch`, while `git pull` uses the submodule's `branch.<name>.merge`.  Prefer `submodule.<name>.branch` if you want to distribute the default upstream branch with the superproject and `branch.<name>.merge` if you want a more native feel while working in the submodule itself."
-msgstr ""
-"Use esta opção para integrar as alterações a partir do subprojeto upstream "
-"ao `HEAD` atual do seu submódulo.  Como alternativa, você pode executar o "
-"comando `git pull` a partir do submódulo, que é equivalente, exceto pelo "
-"nome do ramo remoto: `update --remote` utiliza o repositório upstream "
-"predefinido e `submodule.<nome>.branch`, enquanto `git pull` utiliza o "
-"submódulo `branch.<nome>.merge`.  Prefira o `submodule.<nome>.branch` caso "
-"queira distribuir a ramificação upstream predefinido com o superprojeto e "
-"`branch.<nome>.merge` caso queira uma sensação mais nativa ao trabalhar no "
-"próprio submódulo."
+msgstr "Use esta opção para integrar as alterações a partir do subprojeto upstream ao `HEAD` atual do seu submódulo.  Como alternativa, você pode executar o comando `git pull` a partir do submódulo, que é equivalente, exceto pelo nome do ramo remoto: `update --remote` utiliza o repositório upstream predefinido e `submodule.<nome>.branch`, enquanto `git pull` utiliza o submódulo `branch.<nome>.merge`.  Prefira o `submodule.<nome>.branch` caso queira distribuir a ramificação upstream predefinido com o superprojeto e `branch.<nome>.merge` caso queira uma sensação mais nativa ao trabalhar no próprio submódulo."
 
 #. type: Labeled list
 #: en/git-submodule.txt:352
@@ -59520,20 +51861,13 @@ msgstr "--[no-]recommend-shallow"
 #: en/git-submodule.txt:426
 #, priority:220
 msgid "This option is only valid for the update command.  The initial clone of a submodule will use the recommended `submodule.<name>.shallow` as provided by the `.gitmodules` file by default. To ignore the suggestions use `--no-recommend-shallow`."
-msgstr ""
-"Esta opção só é válida para o comando `update`.  O clone inicial de um "
-"submódulo por predefinição, utilizará o `submodule.<nome>.shallow` "
-"recomendado conforme é fornecido pelo arquivo `.gitmodules`. Para ignorar as "
-"sugestões, utilize `--no-recommend-shallow`."
+msgstr "Esta opção só é válida para o comando `update`.  O clone inicial de um submódulo por predefinição, utilizará o `submodule.<nome>.shallow` recomendado conforme é fornecido pelo arquivo `.gitmodules`. Para ignorar as sugestões, utilize `--no-recommend-shallow`."
 
 #. type: Plain text
 #: en/git-submodule.txt:432
 #, priority:220
 msgid "This option is only valid for the update command.  Clone new submodules in parallel with as many jobs.  Defaults to the `submodule.fetchJobs` option."
-msgstr ""
-"Esta opção só é válida para o comando `update`.  Clone novos submódulos em "
-"paralelo com a mesmo quantidade de trabalhos.  A predefinição retorna para a "
-"configuração existente em `submodule.fetchJobs`."
+msgstr "Esta opção só é válida para o comando `update`.  Clone novos submódulos em paralelo com a mesmo quantidade de trabalhos.  A predefinição retorna para a configuração existente em `submodule.fetchJobs`."
 
 #. type: Plain text
 #: en/git-submodule.txt:436
@@ -59545,10 +51879,7 @@ msgstr "Esta opção só é válida para o comando `update`.  Clone apenas uma r
 #: en/git-submodule.txt:441
 #, priority:220
 msgid "Paths to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths.  (This argument is required with add)."
-msgstr ""
-"Caminhos para o submódulo(s). Quando for utilizado, restringe o comando a "
-"operar apenas nos submódulos encontrados nos caminhos informados.  (É "
-"obrigatório a utilização desta opção com o `add`)."
+msgstr "Caminhos para o submódulo(s). Quando for utilizado, restringe o comando a operar apenas nos submódulos encontrados nos caminhos informados.  (É obrigatório a utilização desta opção com o `add`)."
 
 #. type: Plain text
 #: en/git-submodule.txt:449
@@ -59590,22 +51921,13 @@ msgstr "'git svn' é um canal simples para os conjuntos das alterações entre o
 #: en/git-svn.txt:23
 #, priority:100
 msgid "'git svn' can track a standard Subversion repository, following the common \"trunk/branches/tags\" layout, with the --stdlayout option.  It can also follow branches and tags in any layout with the -T/-t/-b options (see options to 'init' below, and also the 'clone' command)."
-msgstr ""
-"O 'git svn' pode monitorar um repositório Subversion padrão, seguindo o "
-"layout comum \"trunk/branches/tags\", com a opção `--stdlayout`.  Ele também "
-"pode seguir as ramificações e as tags em qualquer layout com as opções '-T/"
-"-t/-b' (consulte as opções para 'init' abaixo e também para o comando "
-"'clone')."
+msgstr "O 'git svn' pode monitorar um repositório Subversion padrão, seguindo o layout comum \"trunk/branches/tags\", com a opção `--stdlayout`.  Ele também pode seguir as ramificações e as tags em qualquer layout com as opções '-T/-t/-b' (consulte as opções para 'init' abaixo e também para o comando 'clone')."
 
 #. type: Plain text
 #: en/git-svn.txt:27
 #, priority:100
 msgid "Once tracking a Subversion repository (with any of the above methods), the Git repository can be updated from Subversion by the 'fetch' command and Subversion updated from Git by the 'dcommit' command."
-msgstr ""
-"Depois de monitorar um repositório Subversion (com qualquer um dos métodos "
-"acima), o repositório Git pode ser atualizado no Subversion através do "
-"comando 'fetch' e o Subversion atualizado no Git através do comando "
-"'dcommit'."
+msgstr "Depois de monitorar um repositório Subversion (com qualquer um dos métodos acima), o repositório Git pode ser atualizado no Subversion através do comando 'fetch' e o Subversion atualizado no Git através do comando 'dcommit'."
 
 #. type: Labeled list
 #: en/git-svn.txt:31
@@ -59617,12 +51939,7 @@ msgstr "'init'"
 #: en/git-svn.txt:39
 #, priority:100
 msgid "Initializes an empty Git repository with additional metadata directories for 'git svn'.  The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b.  Optionally, the target directory to operate on can be specified as a second argument.  Normally this command initializes the current directory."
-msgstr ""
-"Inicializa um repositório Git vazio com diretórios de metadados adicionais "
-"para o 'git svn'.  A URL do Subversion pode ser utilizada como um argumento "
-"na linha de comando ou como uma URL completa para -T/-t/-b.  Opcionalmente, "
-"o diretório do destino para operar, pode ser definido como um segundo "
-"argumento.  Normalmente este comando inicializa o diretório atual."
+msgstr "Inicializa um repositório Git vazio com diretórios de metadados adicionais para o 'git svn'.  A URL do Subversion pode ser utilizada como um argumento na linha de comando ou como uma URL completa para -T/-t/-b.  Opcionalmente, o diretório do destino para operar, pode ser definido como um segundo argumento.  Normalmente este comando inicializa o diretório atual."
 
 #. type: Labeled list
 #: en/git-svn.txt:40
@@ -59670,16 +51987,7 @@ msgstr "--stdlayout"
 #: en/git-svn.txt:58
 #, priority:100
 msgid "These are optional command-line options for init.  Each of these flags can point to a relative repository path (--tags=project/tags) or a full url (--tags=https://foo.org/project/tags).  You can specify more than one --tags and/or --branches options, in case your Subversion repository places tags or branches under multiple paths.  The option --stdlayout is a shorthand way of setting trunk,tags,branches as the relative paths, which is the Subversion default. If any of the other options are given as well, they take precedence."
-msgstr ""
-"Estas são opções opcionais de linha de comando para o init.  Cada uma destas "
-"opções pode apontar para um caminho relativo do repositório (`--tags=project/"
-"tags`) ou uma URL completa (`--tags=https://foo.org/project/tags`).  Você "
-"pode definir mais de uma opção `--tags` e/ou `--branches`, caso o "
-"repositório do Subversion coloque tags ou ramificações em vários caminhos.  "
-"A opção `--stdlayout` é uma maneira abreviada de configurar o "
-"trunks,tags,branches como os caminhos relativos, que é a predefinição do "
-"Subversion. Se qualquer uma das outras opções também for utilizada, elas "
-"terão precedência."
+msgstr "Estas são opções opcionais de linha de comando para o init.  Cada uma destas opções pode apontar para um caminho relativo do repositório (`--tags=project/tags`) ou uma URL completa (`--tags=https://foo.org/project/tags`).  Você pode definir mais de uma opção `--tags` e/ou `--branches`, caso o repositório do Subversion coloque tags ou ramificações em vários caminhos.  A opção `--stdlayout` é uma maneira abreviada de configurar o trunks,tags,branches como os caminhos relativos, que é a predefinição do Subversion. Se qualquer uma das outras opções também for utilizada, elas terão precedência."
 
 #. type: Labeled list
 #: en/git-svn.txt:58
@@ -59691,10 +51999,7 @@ msgstr "--no-metadata"
 #: en/git-svn.txt:62
 #, priority:100
 msgid "Set the 'noMetadata' option in the [svn-remote] config.  This option is not recommended, please read the 'svn.noMetadata' section of this manpage before using this option."
-msgstr ""
-"Defina a opção 'noMetadata' na configuração [svn-remote].  Esta opção não é "
-"recomendada, leia a seção 'svn.noMetadata' desta página do manual antes de "
-"usar esta opção."
+msgstr "Defina a opção 'noMetadata' na configuração [svn-remote].  Esta opção não é recomendada, leia a seção 'svn.noMetadata' desta página do manual antes de usar esta opção."
 
 #. type: Labeled list
 #: en/git-svn.txt:62
@@ -59754,40 +52059,19 @@ msgstr "--username=<usuário>"
 #: en/git-svn.txt:75
 #, priority:100
 msgid "For transports that SVN handles authentication for (http, https, and plain svn), specify the username.  For other transports (e.g. `svn+ssh://`), you must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/project`"
-msgstr ""
-"Para transportes onde o SVN lida com a autenticação (http, https e svn "
-"simples), defina o nome de usuário.  Para os outros transportes (como por "
-"exemplo, `svn+ssh://`), você deve incluir o nome de usuário na URL, como "
-"`svn+ssh://foo@svn.bar.com/project` por exemplo"
+msgstr "Para transportes onde o SVN lida com a autenticação (http, https e svn simples), defina o nome de usuário.  Para os outros transportes (como por exemplo, `svn+ssh://`), você deve incluir o nome de usuário na URL, como `svn+ssh://foo@svn.bar.com/project` por exemplo"
 
 #. type: Plain text
 #: en/git-svn.txt:90
 #, priority:100
 msgid "This allows one to specify a prefix which is prepended to the names of remotes if trunk/branches/tags are specified.  The prefix does not automatically include a trailing slash, so be sure you include one in the argument if that is what you want.  If --branches/-b is specified, the prefix must include a trailing slash.  Setting a prefix (with a trailing slash) is strongly encouraged in any case, as your SVN-tracking refs will then be located at \"refs/remotes/$prefix/*\", which is compatible with Git's own remote-tracking ref layout (refs/remotes/$remote/*). Setting a prefix is also useful if you wish to track multiple projects that share a common repository.  By default, the prefix is set to 'origin/'."
-msgstr ""
-"Permite definir um prefixo que é anexado aos nomes dos ramos remotos caso o '"
-"trunk/branches/tags' seja definidos.  O prefixo não inclui automaticamente "
-"uma barra final, portanto, inclua uma no argumento, caso seja isso que você "
-"queira.  Caso '--branches/-b' seja utilizado, o prefixo deverá incluir uma "
-"barra final.  A configuração de um prefixo (com uma barra à direita) é "
-"fortemente incentivada em qualquer caso, pois as suas refs para "
-"monitoramento SVN estarão localizados no \"refs/remotes/$prefix/*\", que é "
-"compatível com o próprio layout da \"ref\" do monitoramento remoto do Git ('"
-"refs/remotes/$remote/*'). Definir um prefixo também é útil caso queira "
-"monitorar vários projetos que compartilhem de um repositório comum.  É "
-"predefinido que o prefixo esteja definido para 'origin/'."
+msgstr "Permite definir um prefixo que é anexado aos nomes dos ramos remotos caso o 'trunk/branches/tags' seja definidos.  O prefixo não inclui automaticamente uma barra final, portanto, inclua uma no argumento, caso seja isso que você queira.  Caso '--branches/-b' seja utilizado, o prefixo deverá incluir uma barra final.  A configuração de um prefixo (com uma barra à direita) é fortemente incentivada em qualquer caso, pois as suas refs para monitoramento SVN estarão localizados no \"refs/remotes/$prefix/*\", que é compatível com o próprio layout da \"ref\" do monitoramento remoto do Git ('refs/remotes/$remote/*'). Definir um prefixo também é útil caso queira monitorar vários projetos que compartilhem de um repositório comum.  É predefinido que o prefixo esteja definido para 'origin/'."
 
 #. type: Plain text
 #: en/git-svn.txt:97
 #, priority:100
 msgid "Before Git v2.0, the default prefix was \"\" (no prefix). This meant that SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with how Git's own remote-tracking refs are organized.  If you still want the old default, you can get it by passing `--prefix \"\"` on the command line (`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
-msgstr ""
-"Antes do Git v2.0, o prefixo padrão era \"\" (sem prefixo). Isso significava "
-"que as referências de monitoramento SVN foram colocadas no \"refs/remotes/*\""
-", o que é incompatível com a organização das referências de monitoramento "
-"remoto do Git.  Caso ainda queira o padrão antigo, utilize a opção `--"
-"prefix\" \"` na linha de comando (o `--prefix =\" \"` `pode não funcionar "
-"caso o Getopt::Long do Perl for < v2.37) ."
+msgstr "Antes do Git v2.0, o prefixo padrão era \"\" (sem prefixo). Isso significava que as referências de monitoramento SVN foram colocadas no \"refs/remotes/*\", o que é incompatível com a organização das referências de monitoramento remoto do Git.  Caso ainda queira o padrão antigo, utilize a opção `--prefix\" \"` na linha de comando (o `--prefix =\" \"` `pode não funcionar caso o Getopt::Long do Perl for < v2.37) ."
 
 #. type: Labeled list
 #: en/git-svn.txt:98 en/git-svn.txt:145
@@ -59799,10 +52083,7 @@ msgstr "--ignore-refs=<expressão-regular>"
 #: en/git-svn.txt:102
 #, priority:100
 msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key.  See 'fetch' for a description of `--ignore-refs`."
-msgstr ""
-"Quando encaminhada para o 'init' ou 'clone', essa expressão regular será "
-"preservada como uma chave de configuração.  Consulte 'fetch' para obter uma "
-"descrição da opção `--ignore-refs`."
+msgstr "Quando encaminhada para o 'init' ou 'clone', essa expressão regular será preservada como uma chave de configuração.  Consulte 'fetch' para obter uma descrição da opção `--ignore-refs`."
 
 #. type: Labeled list
 #: en/git-svn.txt:102 en/git-svn.txt:157
@@ -59814,10 +52095,7 @@ msgstr "--ignore-paths=<expressão-regular>"
 #: en/git-svn.txt:106
 #, priority:100
 msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key.  See 'fetch' for a description of `--ignore-paths`."
-msgstr ""
-"Quando encaminhada para o 'init' ou 'clone', essa expressão regular será "
-"preservada como uma chave de configuração.  Consulte 'fetch' para obter uma "
-"descrição da opção `--ignore-paths`."
+msgstr "Quando encaminhada para o 'init' ou 'clone', essa expressão regular será preservada como uma chave de configuração.  Consulte 'fetch' para obter uma descrição da opção `--ignore-paths`."
 
 #. type: Labeled list
 #: en/git-svn.txt:106 en/git-svn.txt:186
@@ -59829,10 +52107,7 @@ msgstr "--include-paths=<expressão-regular>"
 #: en/git-svn.txt:110
 #, priority:100
 msgid "When passed to 'init' or 'clone' this regular expression will be preserved as a config key.  See 'fetch' for a description of `--include-paths`."
-msgstr ""
-"Quando encaminhada para o 'init' ou 'clone', essa expressão regular será "
-"preservada como uma chave de configuração.  Consulte 'fetch' para obter uma "
-"descrição da opção `--include-paths`."
+msgstr "Quando encaminhada para o 'init' ou 'clone', essa expressão regular será preservada como uma chave de configuração.  Consulte 'fetch' para obter uma descrição da opção `--include-paths`."
 
 #. type: Labeled list
 #: en/git-svn.txt:110
@@ -59844,17 +52119,7 @@ msgstr "--no-minimize-url"
 #: en/git-svn.txt:121
 #, priority:100
 msgid "When tracking multiple directories (using --stdlayout, --branches, or --tags options), git svn will attempt to connect to the root (or highest allowed level) of the Subversion repository.  This default allows better tracking of history if entire projects are moved within a repository, but may cause issues on repositories where read access restrictions are in place.  Passing `--no-minimize-url` will allow git svn to accept URLs as-is without attempting to connect to a higher level directory.  This option is off by default when only one URL/branch is tracked (it would do little good)."
-msgstr ""
-"Ao monitorar os vários diretórios (utilizando as opções ´--stdlayout`, "
-"`--branches` ou `--tags`), o comando 'git svn' tentará se conectar à raiz ("
-"ou ao nível mais alto permitido) do repositório do Subversion.  Esta "
-"predefinição permite um melhor rastreamento do histórico caso os projetos "
-"inteiros forem movidos para dentro de um repositório, mas pode causar "
-"problemas nos repositórios dos quais exista restrições de acesso de "
-"leitura.  Utilizando a opção `--no-minimize-url` permitirá que o 'git svn' "
-"aceite as URLs como estão, sem tentar se conectar em um diretório no nível "
-"mais alto.  É predefinido que esta opção esteja desativada quando apenas uma "
-"URL/ramo for monitorada (seria de pouca utilidade)."
+msgstr "Ao monitorar os vários diretórios (utilizando as opções ´--stdlayout`, `--branches` ou `--tags`), o comando 'git svn' tentará se conectar à raiz (ou ao nível mais alto permitido) do repositório do Subversion.  Esta predefinição permite um melhor rastreamento do histórico caso os projetos inteiros forem movidos para dentro de um repositório, mas pode causar problemas nos repositórios dos quais exista restrições de acesso de leitura.  Utilizando a opção `--no-minimize-url` permitirá que o 'git svn' aceite as URLs como estão, sem tentar se conectar em um diretório no nível mais alto.  É predefinido que esta opção esteja desativada quando apenas uma URL/ramo for monitorada (seria de pouca utilidade)."
 
 #. type: Labeled list
 #: en/git-svn.txt:122
@@ -59866,18 +52131,13 @@ msgstr "'fetch'"
 #: en/git-svn.txt:127
 #, ignore-ellipsis, priority:100
 msgid "Fetch unfetched revisions from the Subversion remote we are tracking.  The name of the [svn-remote \"...\"] section in the $GIT_DIR/config file may be specified as an optional command-line argument."
-msgstr ""
-"Busque revisões não obtidas do ramo remoto do Subversion que estamos "
-"monitorando.  O nome da seção [svn-remote \"...\"] no arquivo `$GIT_DIR/"
-"config` pode ser definido como um argumento opcional da linha de comandos."
+msgstr "Busque revisões não obtidas do ramo remoto do Subversion que estamos monitorando.  O nome da seção [svn-remote \"...\"] no arquivo `$GIT_DIR/config` pode ser definido como um argumento opcional da linha de comandos."
 
 #. type: Plain text
 #: en/git-svn.txt:130 en/git-svn.txt:243
 #, priority:100
 msgid "This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details)."
-msgstr ""
-"Atualiza automaticamente o 'rev_map', caso seja necessário (para mais "
-"detalhes, consulte '$GIT_DIR/svn/\\**/.rev_map.*' na seção FILES abaixo)."
+msgstr "Atualiza automaticamente o 'rev_map', caso seja necessário (para mais detalhes, consulte '$GIT_DIR/svn/\\**/.rev_map.*' na seção FILES abaixo)."
 
 #. type: Labeled list
 #: en/git-svn.txt:131
@@ -59889,20 +52149,13 @@ msgstr "--localtime"
 #: en/git-svn.txt:135
 #, priority:100
 msgid "Store Git commit times in the local time zone instead of UTC.  This makes 'git log' (even without --date=local) show the same times that `svn log` would in the local time zone."
-msgstr ""
-"Armazene os horários dos commits do Git no fuso horário local em vez do "
-"UTC.  Faz com que 'git log' (mesmo sem `--date=local`) mostre os mesmos "
-"horários que o 'svn log' faria no fuso horário local."
+msgstr "Armazene os horários dos commits do Git no fuso horário local em vez do UTC.  Faz com que 'git log' (mesmo sem `--date=local`) mostre os mesmos horários que o 'svn log' faria no fuso horário local."
 
 #. type: Plain text
 #: en/git-svn.txt:141
 #, priority:100
 msgid "This doesn't interfere with interoperating with the Subversion repository you cloned from, but if you wish for your local Git repository to be able to interoperate with someone else's local Git repository, either don't use this option or you should both use it in the same local time zone."
-msgstr ""
-"Não interfere na interoperação com o repositório Subversion de onde você "
-"clonou, porém caso queira que o seu repositório Git local possa interoperar "
-"com o repositório Git local de outra pessoa, não utilize esta opção ou você "
-"deve usá-lo no o mesmo fuso horário local."
+msgstr "Não interfere na interoperação com o repositório Subversion de onde você clonou, porém caso queira que o seu repositório Git local possa interoperar com o repositório Git local de outra pessoa, não utilize esta opção ou você deve usá-lo no o mesmo fuso horário local."
 
 #. type: Labeled list
 #: en/git-svn.txt:142 en/git-svn.txt:536
@@ -59920,11 +52173,7 @@ msgstr "Busque apenas do parente do SVN do HEAD atual."
 #: en/git-svn.txt:150
 #, priority:100
 msgid "Ignore refs for branches or tags matching the Perl regular expression. A \"negative look-ahead assertion\" like `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` can be used to allow only certain refs."
-msgstr ""
-"Ignore as refs para as ramificações ou as tags coincidentes com a expressão "
-"regular Perl. Uma \"declaração negativa de antecipação\" como `^refs/remotes/"
-"origin/(?!tags/wanted-tag|wanted-branch).*$` Pode ser utilizada para "
-"permitir apenas determinadas referências."
+msgstr "Ignore as refs para as ramificações ou as tags coincidentes com a expressão regular Perl. Uma \"declaração negativa de antecipação\" como `^refs/remotes/origin/(?!tags/wanted-tag|wanted-branch).*$` Pode ser utilizada para permitir apenas determinadas referências."
 
 #. type: Plain text
 #: en/git-svn.txt:153
@@ -59936,20 +52185,13 @@ msgstr "config key: svn-remote.<nome>.ignore-refs\n"
 #: en/git-svn.txt:156
 #, priority:100
 msgid "If the ignore-refs configuration key is set, and the command-line option is also given, both regular expressions will be used."
-msgstr ""
-"Caso a chave de configuração 'ignore-refs' estiver definida e a opção da "
-"linha de comandos também for utilizada, ambas as expressões regulares serão "
-"utilizadas."
+msgstr "Caso a chave de configuração 'ignore-refs' estiver definida e a opção da linha de comandos também for utilizada, ambas as expressões regulares serão utilizadas."
 
 #. type: Plain text
 #: en/git-svn.txt:163
 #, priority:100
 msgid "This allows one to specify a Perl regular expression that will cause skipping of all matching paths from checkout from SVN.  The `--ignore-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository."
-msgstr ""
-"Permite definir uma expressão regular Perl que fará com que ignore todos os "
-"caminhos coincidentes do 'checkout' do SVN.  A opção `--ignore-paths` deve "
-"coincidir com cada 'busca' (incluindo buscas automáticas devido ao 'clone', "
-"'dcommit', 'rebase', etc) em um determinado repositório."
+msgstr "Permite definir uma expressão regular Perl que fará com que ignore todos os caminhos coincidentes do 'checkout' do SVN.  A opção `--ignore-paths` deve coincidir com cada 'busca' (incluindo buscas automáticas devido ao 'clone', 'dcommit', 'rebase', etc) em um determinado repositório."
 
 #. type: Plain text
 #: en/git-svn.txt:166
@@ -59961,10 +52203,7 @@ msgstr "config key: svn-remote.<nome>.ignore-paths\n"
 #: en/git-svn.txt:169
 #, priority:100
 msgid "If the ignore-paths configuration key is set, and the command-line option is also given, both regular expressions will be used."
-msgstr ""
-"Caso a chave de configuração 'ignore-paths' esteja definida e a opção da "
-"linha de comandos também for utilizada, ambas as expressões regulares serão "
-"utilizadas."
+msgstr "Caso a chave de configuração 'ignore-paths' esteja definida e a opção da linha de comandos também for utilizada, ambas as expressões regulares serão utilizadas."
 
 #. type: Labeled list
 #: en/git-svn.txt:173
@@ -59994,12 +52233,7 @@ msgstr "--ignore-paths=\"^[^/]+/(?:branches|tags)\"\n"
 #: en/git-svn.txt:193
 #, priority:100
 msgid "This allows one to specify a Perl regular expression that will cause the inclusion of only matching paths from checkout from SVN.  The `--include-paths` option should match for every 'fetch' (including automatic fetches due to 'clone', 'dcommit', 'rebase', etc) on a given repository. `--ignore-paths` takes precedence over `--include-paths`."
-msgstr ""
-"Permite definir uma expressão regular Perl que causará a inclusão apenas dos "
-"caminhos coincidentes no 'checkout' do SVN.  A opção `--include-paths` deve "
-"coincidir com cada 'busca' (incluindo buscas automáticas devido ao 'clone', "
-"'dcommit', 'rebase', etc) em um determinado repositório. A opção `--ignore-"
-"paths` tem precedência sobre `--include-paths`."
+msgstr "Permite definir uma expressão regular Perl que causará a inclusão apenas dos caminhos coincidentes no 'checkout' do SVN.  A opção `--include-paths` deve coincidir com cada 'busca' (incluindo buscas automáticas devido ao 'clone', 'dcommit', 'rebase', etc) em um determinado repositório. A opção `--ignore-paths` tem precedência sobre `--include-paths`."
 
 #. type: Plain text
 #: en/git-svn.txt:196
@@ -60017,13 +52251,7 @@ msgstr "--log-window-size=<n>"
 #: en/git-svn.txt:203
 #, priority:100
 msgid "Fetch <n> log entries per request when scanning Subversion history.  The default is 100. For very large Subversion repositories, larger values may be needed for 'clone'/'fetch' to complete in reasonable time. But overly large values may lead to higher memory usage and request timeouts."
-msgstr ""
-"Busque <n> entradas do registro log através da solicitação ao verificar o "
-"histórico do Subversion.  A predefinição é 100. Para repositórios Subversion "
-"muito grandes, os valores maiores podem ser necessários para que 'clone'/"
-"'fetch' seja concluído em um tempo razoável. Porém os valores excessivamente "
-"grandes que podem levar a uma maior utilização da memória e solicitações de "
-"tempo."
+msgstr "Busque <n> entradas do registro log através da solicitação ao verificar o histórico do Subversion.  A predefinição é 100. Para repositórios Subversion muito grandes, os valores maiores podem ser necessários para que 'clone'/'fetch' seja concluído em um tempo razoável. Porém os valores excessivamente grandes que podem levar a uma maior utilização da memória e solicitações de tempo."
 
 #. type: Labeled list
 #: en/git-svn.txt:204
@@ -60035,18 +52263,7 @@ msgstr "'clone'"
 #: en/git-svn.txt:214
 #, priority:100
 msgid "Runs 'init' and 'fetch'.  It will automatically create a directory based on the basename of the URL passed to it; or if a second argument is passed; it will create a directory and work within that.  It accepts all arguments that the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` and `--parent`.  After a repository is cloned, the 'fetch' command will be able to update revisions without affecting the working tree; and the 'rebase' command will be able to update the working tree with the latest changes."
-msgstr ""
-"Executa 'init' e 'fetch'.  Cria automaticamente um diretório com base no "
-"nome da base da URL passada para ele; ou caso um segundo argumento seja "
-"passado; ele criará um diretório e funcionará dentro dele.  Aceita todos os "
-"argumentos que os comandos 'init' e 'fetch' aceitam; com exceção de `--fetch-"
-"all` e `--parent`. Após a clonagem de um repositório, o comando 'fetch' "
-"poderá atualizar as revisões sem afetar a árvore de trabalho; e o comando "
-"'rebase' poderá atualizar a árvore de trabalho com as alterações mais "
-"recentes.  Depois do repositório ser clonado, o comando 'fetch' será capaz "
-"de atualizar as revisões sem afetar a árvore de trabalho; e o comando "
-"'rebase' poderá atualizar a árvore de trabalho com as alterações mais "
-"recentes."
+msgstr "Executa 'init' e 'fetch'.  Cria automaticamente um diretório com base no nome da base da URL passada para ele; ou caso um segundo argumento seja passado; ele criará um diretório e funcionará dentro dele.  Aceita todos os argumentos que os comandos 'init' e 'fetch' aceitam; com exceção de `--fetch-all` e `--parent`. Após a clonagem de um repositório, o comando 'fetch' poderá atualizar as revisões sem afetar a árvore de trabalho; e o comando 'rebase' poderá atualizar a árvore de trabalho com as alterações mais recentes.  Depois do repositório ser clonado, o comando 'fetch' será capaz de atualizar as revisões sem afetar a árvore de trabalho; e o comando 'rebase' poderá atualizar a árvore de trabalho com as alterações mais recentes."
 
 #. type: Labeled list
 #: en/git-svn.txt:215
@@ -60058,12 +52275,7 @@ msgstr "--preserve-empty-dirs"
 #: en/git-svn.txt:221
 #, priority:100
 msgid "Create a placeholder file in the local Git repository for each empty directory fetched from Subversion.  This includes directories that become empty by removing all entries in the Subversion repository (but not the directory itself).  The placeholder files are also tracked and removed when no longer necessary."
-msgstr ""
-"Crie um arquivo com espaço reservado no repositório Git local para cada "
-"diretório vazio que foi buscado no Subversion.  Isso inclui os diretórios "
-"que ficam vazios, removendo todas as entradas no repositório do Subversion ("
-"mas não o próprio diretório).  Os arquivos com espaço reservado também são "
-"monitorados e removidos quando não são mais necessários."
+msgstr "Crie um arquivo com espaço reservado no repositório Git local para cada diretório vazio que foi buscado no Subversion.  Isso inclui os diretórios que ficam vazios, removendo todas as entradas no repositório do Subversion (mas não o próprio diretório).  Os arquivos com espaço reservado também são monitorados e removidos quando não são mais necessários."
 
 #. type: Labeled list
 #: en/git-svn.txt:222
@@ -60075,9 +52287,7 @@ msgstr "--placeholder-filename=<nome-do-arquivo>"
 #: en/git-svn.txt:225
 #, priority:100
 msgid "Set the name of placeholder files created by --preserve-empty-dirs.  Default: \".gitignore\""
-msgstr ""
-"Define o nome dos arquivos 'placeholder' (espaço reservado) criado através "
-"da opção `--preserve-empty-dirs`.  Predefinição: \".gitignore\""
+msgstr "Define o nome dos arquivos 'placeholder' (espaço reservado) criado através da opção `--preserve-empty-dirs`.  Predefinição: \".gitignore\""
 
 #. type: Labeled list
 #: en/git-svn.txt:226
@@ -60089,43 +52299,31 @@ msgstr "'rebase'"
 #: en/git-svn.txt:229
 #, priority:100
 msgid "This fetches revisions from the SVN parent of the current HEAD and rebases the current (uncommitted to SVN) work against it."
-msgstr ""
-"Busca as revisões do pai SVN do HEAD atual e reconstrói o atual (não "
-"comprometido com o SVN) contra ele."
+msgstr "Busca as revisões do pai SVN do HEAD atual e reconstrói o atual (não comprometido com o SVN) contra ele."
 
 #. type: Plain text
 #: en/git-svn.txt:233
 #, priority:100
 msgid "This works similarly to `svn update` or 'git pull' except that it preserves linear history with 'git rebase' instead of 'git merge' for ease of dcommitting with 'git svn'."
-msgstr ""
-"Funciona da mesma maneira que o comando `svn update` ou o 'git pull', exceto "
-"que preserva o histórico linear com o comando 'git rebase' em vez do 'git "
-"merge' para facilitar a comunicação com comando 'git svn'."
+msgstr "Funciona da mesma maneira que o comando `svn update` ou o 'git pull', exceto que preserva o histórico linear com o comando 'git rebase' em vez do 'git merge' para facilitar a comunicação com comando 'git svn'."
 
 #. type: Plain text
 #: en/git-svn.txt:237
 #, priority:100
 msgid "This accepts all options that 'git svn fetch' and 'git rebase' accept.  However, `--fetch-all` only fetches from the current [svn-remote], and not all [svn-remote] definitions."
-msgstr ""
-"Isso aceita todas as opções que os comandos 'git svn fetch' e 'git rebase' "
-"aceitam.  No entanto, a opção `--fetch-all` busca apenas as definições [svn-"
-"remote] atuais mas não todas as definições [svn-remote]."
+msgstr "Isso aceita todas as opções que os comandos 'git svn fetch' e 'git rebase' aceitam.  No entanto, a opção `--fetch-all` busca apenas as definições [svn-remote] atuais mas não todas as definições [svn-remote]."
 
 #. type: Plain text
 #: en/git-svn.txt:240
 #, priority:100
 msgid "Like 'git rebase'; this requires that the working tree be clean and have no uncommitted changes."
-msgstr ""
-"Como 'git rebase'; isso requer que a árvore de trabalho esteja limpa e não "
-"tenha alterações em commits não realizados."
+msgstr "Como 'git rebase'; isso requer que a árvore de trabalho esteja limpa e não tenha alterações em commits não realizados."
 
 #. type: Plain text
 #: en/git-svn.txt:248
 #, priority:100
 msgid "Do not fetch remotely; only run 'git rebase' against the last fetched commit from the upstream SVN."
-msgstr ""
-"Não busque remotamente; execute apenas o comando 'git rebase' no último "
-"commit obtido da 'upstream SVN'."
+msgstr "Não busque remotamente; execute apenas o comando 'git rebase' no último commit obtido da 'upstream SVN'."
 
 #. type: Labeled list
 #: en/git-svn.txt:249
@@ -60137,20 +52335,13 @@ msgstr "'dcommit'"
 #: en/git-svn.txt:254
 #, priority:100
 msgid "Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head).  This will create a revision in SVN for each commit in Git."
-msgstr ""
-"Faça o commit a cada diff da ramificação atual diretamente no repositório "
-"SVN e em seguida, refaça ou a redefine (dependendo caso exista ou não uma "
-"diferença entre o SVN e o cabeçalho).  Isso criará uma revisão no SVN para "
-"cada commit no Git."
+msgstr "Faça o commit a cada diff da ramificação atual diretamente no repositório SVN e em seguida, refaça ou a redefine (dependendo caso exista ou não uma diferença entre o SVN e o cabeçalho).  Isso criará uma revisão no SVN para cada commit no Git."
 
 #. type: Plain text
 #: en/git-svn.txt:258
 #, priority:100
 msgid "When an optional Git branch name (or a Git commit object name)  is specified as an argument, the subcommand works on the specified branch, not on the current branch."
-msgstr ""
-"Quando um nome opcional do ramo Git (ou um nome do objeto do commit Git) "
-"seja definido como um argumento, o subcomando funciona no ramo definido, não "
-"no ramo atual."
+msgstr "Quando um nome opcional do ramo Git (ou um nome do objeto do commit Git) seja definido como um argumento, o subcomando funciona no ramo definido, não no ramo atual."
 
 #. type: Plain text
 #: en/git-svn.txt:260
@@ -60174,13 +52365,7 @@ msgstr "--commit-url <URL>"
 #: en/git-svn.txt:269
 #, priority:100
 msgid "Commit to this SVN URL (the full path).  This is intended to allow existing 'git svn' repositories created with one transport method (e.g. `svn://` or `http://` for anonymous read) to be reused if a user is later given access to an alternate transport method (e.g. `svn+ssh://` or `https://`) for commit."
-msgstr ""
-"Faça o commit com esta URL SVN (o caminho completo).  Visa permitir que os "
-"repositórios 'git svn' existentes criados com um método de transporte (como "
-"por exemplo, `svn://` ou `http://` para a leitura anônima) sejam "
-"reutilizados caso um usuário tenha acesso posterior a um método de "
-"transporte alternativo (`svn + ssh://` ou `https://` por exemplo) para o "
-"commit."
+msgstr "Faça o commit com esta URL SVN (o caminho completo).  Visa permitir que os repositórios 'git svn' existentes criados com um método de transporte (como por exemplo, `svn://` ou `http://` para a leitura anônima) sejam reutilizados caso um usuário tenha acesso posterior a um método de transporte alternativo (`svn + ssh://` ou `https://` por exemplo) para o commit."
 
 #. type: Plain text
 #: en/git-svn.txt:273
@@ -60190,25 +52375,19 @@ msgid ""
 "config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)\n"
 msgstr ""
 "config key: svn-remote.<nome>.commiturl\n"
-"config key: svn.commiturl (sobrescreve todas as opções svn-remote.<nome>."
-"commiturl)\n"
+"config key: svn.commiturl (sobrescreve todas as opções svn-remote.<nome>.commiturl)\n"
 
 #. type: Plain text
 #: en/git-svn.txt:277
 #, priority:100
 msgid "Note that the SVN URL of the commiturl config key includes the SVN branch.  If you rather want to set the commit URL for an entire SVN repository use svn-remote.<name>.pushurl instead."
-msgstr ""
-"Observe que a URL SVN da chave de configuração do 'commiturl' inclui o ramo "
-"SVN.  Caso prefira definir a URL do commit para um repositório SVN inteiro, "
-"em vez disso utilize 'svn-remote.<nome>.pushurl'."
+msgstr "Observe que a URL SVN da chave de configuração do 'commiturl' inclui o ramo SVN.  Caso prefira definir a URL do commit para um repositório SVN inteiro, em vez disso utilize 'svn-remote.<nome>.pushurl'."
 
 #. type: Plain text
 #: en/git-svn.txt:280
 #, priority:100
 msgid "Using this option for any other purpose (don't ask) is very strongly discouraged."
-msgstr ""
-"O uso desta opção para qualquer outra finalidade (não pergunte) é "
-"veementemente desencorajada."
+msgstr "O uso desta opção para qualquer outra finalidade (não pergunte) é veementemente desencorajada."
 
 #. type: Labeled list
 #: en/git-svn.txt:281
@@ -60220,14 +52399,7 @@ msgstr "--mergeinfo=<mergeinfo>"
 #: en/git-svn.txt:288
 #, priority:100
 msgid "Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store this information (as a property), and svn clients starting from version 1.5 can make use of it. To specify merge information from multiple branches, use a single space character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
-msgstr ""
-"Adicione as informações da mesclagem informadas durante o 'dcommit' (como "
-"por exemplo, `--mergeinfo=\"/branches/foo:1-10\"`). Todas as versões do "
-"servidor svn podem armazenar estas informações (como uma propriedade) e a "
-"partir da versão 1.5 os clientes svn também podem usá-las. Para definir as "
-"informações da mesclagem das várias ramificações, utilize um caractere de "
-"espaço simples entre as ramificações (`--mergeinfo=\"/branches/foo:1-10 /"
-"branches/bar:3,5-6,8\"`)"
+msgstr "Adicione as informações da mesclagem informadas durante o 'dcommit' (como por exemplo, `--mergeinfo=\"/branches/foo:1-10\"`). Todas as versões do servidor svn podem armazenar estas informações (como uma propriedade) e a partir da versão 1.5 os clientes svn também podem usá-las. Para definir as informações da mesclagem das várias ramificações, utilize um caractere de espaço simples entre as ramificações (`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
 
 #. type: Plain text
 #: en/git-svn.txt:291
@@ -60239,30 +52411,19 @@ msgstr "config key: svn.pushmergeinfo\n"
 #: en/git-svn.txt:296
 #, priority:100
 msgid "This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN."
-msgstr ""
-"Esta opção fará com que o 'git-svn' tente preencher automaticamente a "
-"propriedade do 'svn:mergeinfo' no repositório SVN, quando for possível. "
-"Atualmente, isso só pode ser feito quando 'dcommitting' as mesclagens de "
-"avanço não rápido onde todos os pais, exceto o primeiro, já tenha sido "
-"inseridos no SVN."
+msgstr "Esta opção fará com que o 'git-svn' tente preencher automaticamente a propriedade do 'svn:mergeinfo' no repositório SVN, quando for possível. Atualmente, isso só pode ser feito quando 'dcommitting' as mesclagens de avanço não rápido onde todos os pais, exceto o primeiro, já tenha sido inseridos no SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:301
 #, priority:100
 msgid "Ask the user to confirm that a patch set should actually be sent to SVN.  For each patch, one may answer \"yes\" (accept this patch), \"no\" (discard this patch), \"all\" (accept all patches), or \"quit\"."
-msgstr ""
-"Peça ao usuário para confirmar que um conjunto de patches deve realmente ser "
-"enviado ao SVN.  Para cada patch, pode-se responder \"yes\" (aceitar este "
-"patch), \"no\" (descartar este patch), \"all\" (aceitar todos os patches) ou "
-"\"encerrar\"."
+msgstr "Peça ao usuário para confirmar que um conjunto de patches deve realmente ser enviado ao SVN.  Para cada patch, pode-se responder \"yes\" (aceitar este patch), \"no\" (descartar este patch), \"all\" (aceitar todos os patches) ou \"encerrar\"."
 
 #. type: Plain text
 #: en/git-svn.txt:304
 #, priority:100
 msgid "'git svn dcommit' returns immediately if answer is \"no\" or \"quit\", without committing anything to SVN."
-msgstr ""
-"O comando 'git svn dcommit' retorna imediatamente caso a resposta seja \"no\""
-" (não) ou \"quit\" (sair), sem comprometer nada com no SVN."
+msgstr "O comando 'git svn dcommit' retorna imediatamente caso a resposta seja \"no\" (não) ou \"quit\" (sair), sem comprometer nada com no SVN."
 
 #. type: Labeled list
 #: en/git-svn.txt:305
@@ -60298,9 +52459,7 @@ msgstr "--tag"
 #: en/git-svn.txt:316
 #, priority:100
 msgid "Create a tag by using the tags_subdir instead of the branches_subdir specified during git svn init."
-msgstr ""
-"Crie uma tag utilizando o 'tags_subdir' em vez do 'branches_subdir' definido "
-"durante o comando `git svn init`."
+msgstr "Crie uma tag utilizando o 'tags_subdir' em vez do 'branches_subdir' definido durante o comando `git svn init`."
 
 #. type: Labeled list
 #: en/git-svn.txt:317
@@ -60318,29 +52477,19 @@ msgstr "--destination=<caminho>"
 #: en/git-svn.txt:326
 #, priority:100
 msgid "If more than one --branches (or --tags) option was given to the 'init' or 'clone' command, you must provide the location of the branch (or tag) you wish to create in the SVN repository.  <path> specifies which path to use to create the branch or tag and should match the pattern on the left-hand side of one of the configured branches or tags refspecs.  You can see these refspecs with the commands"
-msgstr ""
-"No caso de mais de uma opção `--branches` (ou `--tags`) seja encaminhada ao "
-"comando 'init' ou 'clone', você deve informar o local do ramo (ou a 'tag') "
-"que deseja criar no repositório SVN.  o <caminho> especifica qual o caminho "
-"utilizar para criar o ramo ou a tag que deve coincidir ao padrão no lado "
-"esquerdo de um dos ramos configurados ou uma das tags refspecs.  Você pode "
-"ver estes refspecs com os comandos"
+msgstr "No caso de mais de uma opção `--branches` (ou `--tags`) seja encaminhada ao comando 'init' ou 'clone', você deve informar o local do ramo (ou a 'tag') que deseja criar no repositório SVN.  o <caminho> especifica qual o caminho utilizar para criar o ramo ou a tag que deve coincidir ao padrão no lado esquerdo de um dos ramos configurados ou uma das tags refspecs.  Você pode ver estes refspecs com os comandos"
 
 #. type: Plain text
 #: en/git-svn.txt:329
 #, priority:100
 msgid "git config --get-all svn-remote.<name>.branches git config --get-all svn-remote.<name>.tags"
-msgstr ""
-"git config --get-all svn-remote.<nome>.branches git config --get-all svn-"
-"remote.<nome>.tags"
+msgstr "git config --get-all svn-remote.<nome>.branches git config --get-all svn-remote.<nome>.tags"
 
 #. type: Plain text
 #: en/git-svn.txt:332
 #, priority:100
 msgid "where <name> is the name of the SVN repository as specified by the -R option to 'init' (or \"svn\" by default)."
-msgstr ""
-"onde <nome> é o nome do repositório SVN, conforme definido pela opção '-R' "
-"para o 'init' (ou por predefinição, o \"svn\")."
+msgstr "onde <nome> é o nome do repositório SVN, conforme definido pela opção '-R' para o 'init' (ou por predefinição, o \"svn\")."
 
 #. type: Labeled list
 #: en/git-svn.txt:333
@@ -60352,9 +52501,7 @@ msgstr "--username"
 #: en/git-svn.txt:336
 #, priority:100
 msgid "Specify the SVN username to perform the commit as.  This option overrides the 'username' configuration property."
-msgstr ""
-"Define o nome do usuário SVN para executar o commit com esta identidade.  "
-"Esta opção substitui a propriedade de configuração 'username'."
+msgstr "Define o nome do usuário SVN para executar o commit com esta identidade.  Esta opção substitui a propriedade de configuração 'username'."
 
 #. type: Labeled list
 #: en/git-svn.txt:337
@@ -60366,10 +52513,7 @@ msgstr "--commit-url"
 #: en/git-svn.txt:342
 #, priority:100
 msgid "Use the specified URL to connect to the destination Subversion repository.  This is useful in cases where the source SVN repository is read-only.  This option overrides configuration property 'commiturl'."
-msgstr ""
-"Use a URL informada para conectar-se ao repositório Subversion do destino.  "
-"É útil nos casos onde o repositório SVN da origem seja somente leitura.  "
-"Esta opção substitui a propriedade de configuração 'commiturl'."
+msgstr "Use a URL informada para conectar-se ao repositório Subversion do destino.  É útil nos casos onde o repositório SVN da origem seja somente leitura.  Esta opção substitui a propriedade de configuração 'commiturl'."
 
 #. type: Plain text
 #: en/git-svn.txt:344
@@ -60387,9 +52531,7 @@ msgstr "--parents"
 #: en/git-svn.txt:350
 #, priority:100
 msgid "Create parent folders. This parameter is equivalent to the parameter --parents on svn cp commands and is useful for non-standard repository layouts."
-msgstr ""
-"Crie diretórios parentes. Este parâmetro é equivalente a `--parents` nos "
-"comandos 'svn cp' e é útil para os layouts do repositório fora do padrão."
+msgstr "Crie diretórios parentes. Este parâmetro é equivalente a `--parents` nos comandos 'svn cp' e é útil para os layouts do repositório fora do padrão."
 
 #. type: Labeled list
 #: en/git-svn.txt:351
@@ -60401,8 +52543,7 @@ msgstr "'tag'"
 #: en/git-svn.txt:354
 #, priority:100
 msgid "Create a tag in the SVN repository. This is a shorthand for 'branch -t'."
-msgstr ""
-"Crie uma tag no repositório SVN. Esta é uma abreviação para 'branch -t'."
+msgstr "Crie uma tag no repositório SVN. Esta é uma abreviação para 'branch -t'."
 
 #. type: Labeled list
 #: en/git-svn.txt:355
@@ -60414,9 +52555,7 @@ msgstr "'log'"
 #: en/git-svn.txt:358
 #, priority:100
 msgid "This should make it easy to look up svn log messages when svn users refer to -r/--revision numbers."
-msgstr ""
-"Isso deve facilitar a consulta das mensagens 'svn log' quando os usuários "
-"svn se referem ao `-r/--revision numbers`."
+msgstr "Isso deve facilitar a consulta das mensagens 'svn log' quando os usuários svn se referem ao `-r/--revision numbers`."
 
 #. type: Plain text
 #: en/git-svn.txt:360
@@ -60440,17 +52579,13 @@ msgstr "--revision=<n>[:<n>]"
 #: en/git-svn.txt:366
 #, ignore-ellipsis, priority:100
 msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
-msgstr ""
-"é compatível, argumentos não numéricos não são: `HEAD`, `NEXT`, `BASE`, "
-"`PREV`, etc ..."
+msgstr "é compatível, argumentos não numéricos não são: `HEAD`, `NEXT`, `BASE`, `PREV`, etc ..."
 
 #. type: Plain text
 #: en/git-svn.txt:370
 #, priority:100
 msgid "it's not completely compatible with the --verbose output in svn log, but reasonably close."
-msgstr ""
-"não é completamente compatível com a saída `--verbose` no 'svn log', porém é "
-"razoavelmente próximo."
+msgstr "não é completamente compatível com a saída `--verbose` no 'svn log', porém é razoavelmente próximo."
 
 #. type: Labeled list
 #: en/git-svn.txt:370
@@ -60462,9 +52597,7 @@ msgstr "--limit=<n>"
 #: en/git-svn.txt:373
 #, priority:100
 msgid "is NOT the same as --max-count, doesn't count merged/excluded commits"
-msgstr ""
-"NÃO é o mesmo que a opção `--max-count`, não conta os commits que foram "
-"mesclados/excluídos"
+msgstr "NÃO é o mesmo que a opção `--max-count`, não conta os commits que foram mesclados/excluídos"
 
 #. type: Plain text
 #: en/git-svn.txt:375
@@ -60506,17 +52639,13 @@ msgstr "a nossa versão do `--pretty=oneline`"
 #: en/git-svn.txt:389
 #, priority:100
 msgid "SVN itself only stores times in UTC and nothing else. The regular svn client converts the UTC time to the local time (or based on the TZ= environment). This command has the same behaviour."
-msgstr ""
-"O próprio SVN armazena apenas os horários em UTC e mais nada. O cliente svn "
-"comum converte a hora UTC em hora local (ou com base no ambiente 'TZ='). "
-"Este comando tem o mesmo comportamento."
+msgstr "O próprio SVN armazena apenas os horários em UTC e mais nada. O cliente svn comum converte a hora UTC em hora local (ou com base no ambiente 'TZ='). Este comando tem o mesmo comportamento."
 
 #. type: Plain text
 #: en/git-svn.txt:391
 #, priority:100
 msgid "Any other arguments are passed directly to 'git log'"
-msgstr ""
-"Quaisquer outros argumentos são passados diretamente para o comando 'git log'"
+msgstr "Quaisquer outros argumentos são passados diretamente para o comando 'git log'"
 
 #. type: Labeled list
 #: en/git-svn.txt:392
@@ -60540,11 +52669,7 @@ msgstr "--git-format"
 #: en/git-svn.txt:405
 #, priority:100
 msgid "Produce output in the same format as 'git blame', but with SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0."
-msgstr ""
-"Gere a saída no mesmo formato que o comando 'git blame', porém com números "
-"da revisão do SVN em vez dos hashes dos commits do Git. Nesse modo, as "
-"alterações onde os commits não foram feitos no SVN (incluindo as edições "
-"locais da cópia de trabalho) são exibidas como revisão."
+msgstr "Gere a saída no mesmo formato que o comando 'git blame', porém com números da revisão do SVN em vez dos hashes dos commits do Git. Nesse modo, as alterações onde os commits não foram feitos no SVN (incluindo as edições locais da cópia de trabalho) são exibidas como revisão."
 
 #. type: Labeled list
 #: en/git-svn.txt:406
@@ -60556,11 +52681,7 @@ msgstr "'find-rev'"
 #: en/git-svn.txt:411
 #, priority:100
 msgid "When given an SVN revision number of the form 'rN', returns the corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched).  When given a tree-ish, returns the corresponding SVN revision number."
-msgstr ""
-"Quando recebe um número da revisão SVN no formato 'rN', retorna o hash do "
-"commit Git correspondente (isso pode ser seguido opcionalmente por um 'tree-"
-"ish' da árvore para definir qual o ramo deve ser pesquisado).  Quando "
-"informar um 'tree-ish', retorna o número da revisão SVN correspondente."
+msgstr "Quando recebe um número da revisão SVN no formato 'rN', retorna o hash do commit Git correspondente (isso pode ser seguido opcionalmente por um 'tree-ish' da árvore para definir qual o ramo deve ser pesquisado).  Quando informar um 'tree-ish', retorna o número da revisão SVN correspondente."
 
 #. type: Labeled list
 #: en/git-svn.txt:412
@@ -60578,10 +52699,7 @@ msgstr "--before"
 #: en/git-svn.txt:417
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision, instead find the commit corresponding to the state of the SVN repository (on the current branch) at the specified revision."
-msgstr ""
-"Não exija uma coincidência exata caso receba uma revisão SVN; em vez disso, "
-"encontre o commit correspondente na condição do repositório SVN (no ramo "
-"atual) na revisão informada."
+msgstr "Não exija uma coincidência exata caso receba uma revisão SVN; em vez disso, encontre o commit correspondente na condição do repositório SVN (no ramo atual) na revisão informada."
 
 #. type: Labeled list
 #: en/git-svn.txt:419
@@ -60593,10 +52711,7 @@ msgstr "--after"
 #: en/git-svn.txt:423
 #, priority:100
 msgid "Don't require an exact match if given an SVN revision; if there is not an exact match return the closest match searching forward in the history."
-msgstr ""
-"Não exija uma coincidência exata caso receba uma revisão SVN; caso não haja "
-"uma coincidência exata, retorne a coincidência mais próxima pesquisando no "
-"histórico."
+msgstr "Não exija uma coincidência exata caso receba uma revisão SVN; caso não haja uma coincidência exata, retorne a coincidência mais próxima pesquisando no histórico."
 
 #. type: Labeled list
 #: en/git-svn.txt:424
@@ -60608,14 +52723,7 @@ msgstr "'set-tree'"
 #: en/git-svn.txt:432
 #, priority:100
 msgid "You should consider using 'dcommit' instead of this command.  Commit specified commit or tree objects to SVN.  This relies on your imported fetch data being up to date.  This makes absolutely no attempts to do patching when committing to SVN, it simply overwrites files with those specified in the tree or commit.  All merging is assumed to have taken place independently of 'git svn' functions."
-msgstr ""
-"Você deve considerar a utilização do 'dcommit' em vez deste comando.  Faça o "
-"commit de determinados commits ou objetos árvore para o SVN.  Depende que os "
-"seus dados buscados estejam atualizados.  Não faz absolutamente nenhuma "
-"tentativa de fazer correções ao fazer o commit com o SVN, simplesmente "
-"substitui os arquivos pelos definidos na árvore ou pelo commit.  Supõe-se "
-"que todas as mesclagens ocorreram independentemente das funções do comando "
-"'git svn'."
+msgstr "Você deve considerar a utilização do 'dcommit' em vez deste comando.  Faça o commit de determinados commits ou objetos árvore para o SVN.  Depende que os seus dados buscados estejam atualizados.  Não faz absolutamente nenhuma tentativa de fazer correções ao fazer o commit com o SVN, simplesmente substitui os arquivos pelos definidos na árvore ou pelo commit.  Supõe-se que todas as mesclagens ocorreram independentemente das funções do comando 'git svn'."
 
 #. type: Labeled list
 #: en/git-svn.txt:433
@@ -60627,11 +52735,7 @@ msgstr "'create-ignore'"
 #: en/git-svn.txt:438
 #, priority:100
 msgid "Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a specific revision."
-msgstr ""
-"Localiza de forma recursiva a propriedade 'svn:ignore' nos diretórios e cria "
-"os arquivos `.gitignore` correspondentes. Os arquivos resultantes apenas são "
-"preparados para que os commits sejam feitos, mas não são. Utilize `-r/"
-"--revision` quando se referir a uma revisão específica."
+msgstr "Localiza de forma recursiva a propriedade 'svn:ignore' nos diretórios e cria os arquivos `.gitignore` correspondentes. Os arquivos resultantes apenas são preparados para que os commits sejam feitos, mas não são. Utilize `-r/--revision` quando se referir a uma revisão específica."
 
 #. type: Labeled list
 #: en/git-svn.txt:439
@@ -60643,9 +52747,7 @@ msgstr "'show-ignore'"
 #: en/git-svn.txt:443
 #, priority:100
 msgid "Recursively finds and lists the svn:ignore property on directories.  The output is suitable for appending to the $GIT_DIR/info/exclude file."
-msgstr ""
-"Localiza e lista recursivamente a propriedade 'svn:ignore' nos diretórios.  "
-"A saída é adequada para anexar ao arquivo `$GIT_DIR/info/exclude`."
+msgstr "Localiza e lista recursivamente a propriedade 'svn:ignore' nos diretórios.  A saída é adequada para anexar ao arquivo `$GIT_DIR/info/exclude`."
 
 #. type: Labeled list
 #: en/git-svn.txt:444
@@ -60657,14 +52759,7 @@ msgstr "'mkdirs'"
 #: en/git-svn.txt:452
 #, priority:100
 msgid "Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files.  Empty directories are automatically recreated when using \"git svn clone\" and \"git svn rebase\", so \"mkdirs\" is intended for use after commands like \"git checkout\" or \"git reset\".  (See the svn-remote.<name>.automkdirs config file option for more information.)"
-msgstr ""
-"As tentativas de recriar os diretórios vazios que o Git principal não pode "
-"rastrear com base nas informações dos arquivos '$GIT_DIR/svn/<refname>/"
-"unhandled.log'.  Os diretórios vazios são recriados automaticamente ao "
-"utilizar o comando \"git svn clone\" e o \"git svn rebase\"; portanto, o "
-"comando \"mkdirs\" deve ser utilizado após os comandos como \"git checkout\" "
-"ou \"git reset\".  (Para mais informações, consulte a opção do arquivo de "
-"configuração 'svn-remote.<nome>.automkdirs'.)"
+msgstr "As tentativas de recriar os diretórios vazios que o Git principal não pode rastrear com base nas informações dos arquivos '$GIT_DIR/svn/<refname>/unhandled.log'.  Os diretórios vazios são recriados automaticamente ao utilizar o comando \"git svn clone\" e o \"git svn rebase\"; portanto, o comando \"mkdirs\" deve ser utilizado após os comandos como \"git checkout\" ou \"git reset\".  (Para mais informações, consulte a opção do arquivo de configuração 'svn-remote.<nome>.automkdirs'.)"
 
 #. type: Labeled list
 #: en/git-svn.txt:453
@@ -60676,32 +52771,19 @@ msgstr "'commit-diff'"
 #: en/git-svn.txt:462
 #, priority:100
 msgid "Commits the diff of two tree-ish arguments from the command-line.  This command does not rely on being inside a `git svn init`-ed repository.  This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository.  The final argument (URL) may be omitted if you are working from a 'git svn'-aware repository (that has been `init`-ed with 'git svn').  The -r<revision> option is required for this."
-msgstr ""
-"Faz o commit da diferença entre dois argumentos da árvore na linha de "
-"comando.  Este comando não depende de estar dentro de um repositório `git "
-"svn init`.  Este comando utiliza três argumentos, (a) a árvore original que "
-"será comparada, (b) o novo resultado da árvore, (c) a URL do repositório de "
-"destino do Subversion.  O argumento final (URL) pode ser omitido caso você "
-"esteja trabalhando em um repositório compatível com o comando 'git svn' (que "
-"foi iniciado com 'git svn').  Para isso, a opção -r <revisão> é necessária."
+msgstr "Faz o commit da diferença entre dois argumentos da árvore na linha de comando.  Este comando não depende de estar dentro de um repositório `git svn init`.  Este comando utiliza três argumentos, (a) a árvore original que será comparada, (b) o novo resultado da árvore, (c) a URL do repositório de destino do Subversion.  O argumento final (URL) pode ser omitido caso você esteja trabalhando em um repositório compatível com o comando 'git svn' (que foi iniciado com 'git svn').  Para isso, a opção -r <revisão> é necessária."
 
 #. type: Plain text
 #: en/git-svn.txt:467
 #, priority:100
 msgid "The commit message is supplied either directly with the `-m` or `-F` option, or indirectly from the tag or commit when the second tree-ish denotes such an object, or it is requested by invoking an editor (see `--edit` option below)."
-msgstr ""
-"A mensagem do commit é informada diretamente com a opção `-m` ou `-F`, ou "
-"indiretamente da tag ou commit quando a segunda 'tree-ish' denota este "
-"objeto ou é solicitada pela chamada de um editor (consulte a opção `--edit` "
-"abaixo)."
+msgstr "A mensagem do commit é informada diretamente com a opção `-m` ou `-F`, ou indiretamente da tag ou commit quando a segunda 'tree-ish' denota este objeto ou é solicitada pela chamada de um editor (consulte a opção `--edit` abaixo)."
 
 #. type: Plain text
 #: en/git-svn.txt:472
 #, priority:100
 msgid "Use the given `msg` as the commit message. This option disables the `--edit` option."
-msgstr ""
-"Utilize a `msg` informada como a mensagem do commit. Esta opção desativa a "
-"opção `--edit`."
+msgstr "Utilize a `msg` informada como a mensagem do commit. Esta opção desativa a opção `--edit`."
 
 #. type: Labeled list
 #: en/git-svn.txt:473
@@ -60731,11 +52813,7 @@ msgstr "'info'"
 #: en/git-svn.txt:483
 #, priority:100
 msgid "Shows information about a file or directory similar to what `svn info' provides.  Does not currently support a -r/--revision argument.  Use the --url option to output only the value of the 'URL:' field."
-msgstr ""
-"Exibe as informações sobre um arquivo ou diretório semelhante ao que o `svn "
-"info` provê.  Atualmente não é compatível com o argumento da opção '-r/--"
-"revision'.  Utilize a opção `--url` para gerar apenas o valor do campo "
-"'URL:'."
+msgstr "Exibe as informações sobre um arquivo ou diretório semelhante ao que o `svn info` provê.  Atualmente não é compatível com o argumento da opção '-r/--revision'.  Utilize a opção `--url` para gerar apenas o valor do campo 'URL:'."
 
 #. type: Labeled list
 #: en/git-svn.txt:484
@@ -60747,10 +52825,7 @@ msgstr "'proplist'"
 #: en/git-svn.txt:488
 #, priority:100
 msgid "Lists the properties stored in the Subversion repository about a given file or directory.  Use -r/--revision to refer to a specific Subversion revision."
-msgstr ""
-"Lista as propriedades armazenadas no repositório do Subversion sobre um "
-"determinado arquivo ou diretório.  Utilize '-r/--revision' para se referir a "
-"uma revisão específica do Subversion."
+msgstr "Lista as propriedades armazenadas no repositório do Subversion sobre um determinado arquivo ou diretório.  Utilize '-r/--revision' para se referir a uma revisão específica do Subversion."
 
 #. type: Labeled list
 #: en/git-svn.txt:489
@@ -60762,10 +52837,7 @@ msgstr "'propget'"
 #: en/git-svn.txt:492
 #, priority:100
 msgid "Gets the Subversion property given as the first argument, for a file.  A specific revision can be specified with -r/--revision."
-msgstr ""
-"Obtém a propriedade do Subversion informado como o primeiro argumento, para "
-"um arquivo.  Uma revisão específica pode ser definida através da opção "
-"`-r`/`--revision`."
+msgstr "Obtém a propriedade do Subversion informado como o primeiro argumento, para um arquivo.  Uma revisão específica pode ser definida através da opção `-r`/`--revision`."
 
 #. type: Labeled list
 #: en/git-svn.txt:493
@@ -60777,10 +52849,7 @@ msgstr "'propset'"
 #: en/git-svn.txt:497
 #, priority:100
 msgid "Sets the Subversion property given as the first argument, to the value given as the second argument for the file given as the third argument."
-msgstr ""
-"Define a propriedade Subversion informada como o primeiro argumento, como o "
-"valor fornecido como o segundo argumento para o arquivo informado como o "
-"terceiro argumento."
+msgstr "Define a propriedade Subversion informada como o primeiro argumento, como o valor fornecido como o segundo argumento para o arquivo informado como o terceiro argumento."
 
 #. type: delimited block -
 #: en/git-svn.txt:502
@@ -60792,9 +52861,7 @@ msgstr "git svn propset svn:keywords \"FreeBSD=%H\" devel/py-tipper/Makefile\n"
 #: en/git-svn.txt:506
 #, priority:100
 msgid "This will set the property 'svn:keywords' to 'FreeBSD=%H' for the file 'devel/py-tipper/Makefile'."
-msgstr ""
-"Isso definirá a propriedade 'svn:keywords' como 'FreeBSD=%H' para o arquivo '"
-"devel/py-tipper/Makefile'."
+msgstr "Isso definirá a propriedade 'svn:keywords' como 'FreeBSD=%H' para o arquivo 'devel/py-tipper/Makefile'."
 
 #. type: Labeled list
 #: en/git-svn.txt:507
@@ -60806,17 +52873,13 @@ msgstr "'show-externals'"
 #: en/git-svn.txt:510
 #, priority:100
 msgid "Shows the Subversion externals.  Use -r/--revision to specify a specific revision."
-msgstr ""
-"Exibe os externos do Subversion.  Utilize '-r/--revision' para definir uma "
-"revisão específica."
+msgstr "Exibe os externos do Subversion.  Utilize '-r/--revision' para definir uma revisão específica."
 
 #. type: Plain text
 #: en/git-svn.txt:514
 #, priority:100
 msgid "Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/<refname>/index files."
-msgstr ""
-"Compacte os arquivos `$GIT_DIR/svn/<refname>/unhandled.log` e remova os "
-"arquivos `$GIT_DIR/svn/<refname>/index`."
+msgstr "Compacte os arquivos `$GIT_DIR/svn/<refname>/unhandled.log` e remova os arquivos `$GIT_DIR/svn/<refname>/index`."
 
 #. type: Labeled list
 #: en/git-svn.txt:515
@@ -60828,26 +52891,13 @@ msgstr "'reset'"
 #: en/git-svn.txt:525
 #, priority:100
 msgid "Undoes the effects of 'fetch' back to the specified revision.  This allows you to re-'fetch' an SVN revision.  Normally the contents of an SVN revision should never change and 'reset' should not be necessary.  However, if SVN permissions change, or if you alter your --ignore-paths option, a 'fetch' may fail with \"not found in commit\" (file not previously visible) or \"checksum mismatch\" (missed a modification).  If the problem file cannot be ignored forever (with --ignore-paths) the only way to repair the repo is to use 'reset'."
-msgstr ""
-"Desfaz os efeitos do 'fetch' de volta à revisão informada.  Permite que você "
-"refaça um 'fetch' de uma revisão SVN.  Normalmente, o conteúdo de uma "
-"revisão SVN nunca deve mudar e o 'reset' não deve ser necessário.  No "
-"entanto, caso as permissões SVN mudem, ou caso você altere a opção `--ignore-"
-"paths`, um 'fetch' poderá falhar com \"não encontrado no commit\" (arquivo "
-"não visível anteriormente) ou \"houve uma incompatibilidade com o checksum\" "
-"(perdeu uma alteração).  Caso o arquivo com problema não puder ser ignorado "
-"para sempre (com a opção `--ignore-paths`), a única maneira de reparar o "
-"repositório é usando 'reset'."
+msgstr "Desfaz os efeitos do 'fetch' de volta à revisão informada.  Permite que você refaça um 'fetch' de uma revisão SVN.  Normalmente, o conteúdo de uma revisão SVN nunca deve mudar e o 'reset' não deve ser necessário.  No entanto, caso as permissões SVN mudem, ou caso você altere a opção `--ignore-paths`, um 'fetch' poderá falhar com \"não encontrado no commit\" (arquivo não visível anteriormente) ou \"houve uma incompatibilidade com o checksum\" (perdeu uma alteração).  Caso o arquivo com problema não puder ser ignorado para sempre (com a opção `--ignore-paths`), a única maneira de reparar o repositório é usando 'reset'."
 
 #. type: Plain text
 #: en/git-svn.txt:530
 #, priority:100
 msgid "Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\**/.rev_map.*' in the FILES section below for details).  Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move local branches onto the new tree."
-msgstr ""
-"Somente o 'rev_map' e o 'refs/remotes/git-svn' são alterados (para mais "
-"detalhes, consulte '$GIT_DIR/svn/\\**/.rev_map.*' Na seção FILES abaixo).  "
-"Acompanhe 'reset' com um 'fetch' seguido do comando 'git reset' ou 'git "
-"rebase' para mover as ramificações locais para a nova árvore."
+msgstr "Somente o 'rev_map' e o 'refs/remotes/git-svn' são alterados (para mais detalhes, consulte '$GIT_DIR/svn/\\**/.rev_map.*' Na seção FILES abaixo).  Acompanhe 'reset' com um 'fetch' seguido do comando 'git reset' ou 'git rebase' para mover as ramificações locais para a nova árvore."
 
 #. type: Labeled list
 #: en/git-svn.txt:531
@@ -60865,9 +52915,7 @@ msgstr "--revision=<n>"
 #: en/git-svn.txt:535
 #, priority:100
 msgid "Specify the most recent revision to keep.  All later revisions are discarded."
-msgstr ""
-"Defina a revisão mais recente que será mantida.  Todas as revisões "
-"posteriores são descartadas."
+msgstr "Defina a revisão mais recente que será mantida.  Todas as revisões posteriores são descartadas."
 
 #. type: Plain text
 #: en/git-svn.txt:539
@@ -60879,9 +52927,7 @@ msgstr "Descarte também a revisão informada, mantendo o parente mais próximo.
 #: en/git-svn.txt:541
 #, priority:100
 msgid "Assume you have local changes in \"master\", but you need to refetch \"r2\"."
-msgstr ""
-"Suponha que você tenha alterações locais em \"master\", porém é necessário "
-"buscar \"r2\" novamente."
+msgstr "Suponha que você tenha alterações locais em \"master\", porém é necessário buscar \"r2\" novamente."
 
 #. type: delimited block -
 #: en/git-svn.txt:546
@@ -60899,9 +52945,7 @@ msgstr ""
 #: en/git-svn.txt:550
 #, priority:100
 msgid "Fix the ignore-paths or SVN permissions problem that caused \"r2\" to be incomplete in the first place.  Then:"
-msgstr ""
-"Corrija os 'ignore-paths' (ignore os caminhos) ou as permissões do SVN que "
-"em primeiro lugar, fazia com que \"r2\" estivesse incompleto.  Então:"
+msgstr "Corrija os 'ignore-paths' (ignore os caminhos) ou as permissões do SVN que em primeiro lugar, fazia com que \"r2\" estivesse incompleto.  Então:"
 
 #. type: Plain text
 #: en/git-svn.txt:554
@@ -60929,9 +52973,7 @@ msgstr ""
 #: en/git-svn.txt:564
 #, priority:100
 msgid "Then fixup \"master\" with 'git rebase'.  Do NOT use 'git merge' or your history will not be compatible with a future 'dcommit'!"
-msgstr ""
-"Então repare o \"master\" com 'git rebase'.  Não use o comando 'git merge' "
-"ou o seu histórico não será mais compatível com um futuro 'dcommit'!"
+msgstr "Então repare o \"master\" com 'git rebase'.  Não use o comando 'git merge' ou o seu histórico não será mais compatível com um futuro 'dcommit'!"
 
 #. type: Plain text
 #: en/git-svn.txt:567
@@ -60961,9 +53003,7 @@ msgstr "--shared[=(false|true|umask|group|all|world|everybody)]"
 #: en/git-svn.txt:581
 #, priority:100
 msgid "Only used with the 'init' command.  These are passed directly to 'git init'."
-msgstr ""
-"Utilizado apenas com o comando 'init'.  Estes são passados diretamente ao "
-"comando 'git init'."
+msgstr "Utilizado apenas com o comando 'init'.  Estes são passados diretamente ao comando 'git init'."
 
 #. type: Labeled list
 #: en/git-svn.txt:582
@@ -60987,18 +53027,13 @@ msgstr "Usado com o comando 'fetch' (traga)."
 #: en/git-svn.txt:589
 #, priority:100
 msgid "This allows revision ranges for partial/cauterized history to be supported.  $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER are all supported."
-msgstr ""
-"Permite que os intervalos da revisão para o histórico parcial/cauterizado "
-"sejam compatíveis.  $NUMBER, $NUMBER1:$NUMBER2 (faixas numéricas), $NUMBER:"
-"HEAD, e BASE:$NUMBER todos são compatíveis."
+msgstr "Permite que os intervalos da revisão para o histórico parcial/cauterizado sejam compatíveis.  $NUMBER, $NUMBER1:$NUMBER2 (faixas numéricas), $NUMBER:HEAD, e BASE:$NUMBER todos são compatíveis."
 
 #. type: Plain text
 #: en/git-svn.txt:593
 #, priority:100
 msgid "This can allow you to make partial mirrors when running fetch; but is generally not recommended because history will be skipped and lost."
-msgstr ""
-"Pode permitir que você faça espelhos parciais ao executar a busca; porém "
-"geralmente não é recomendado pois o histórico será ignorado e perdido."
+msgstr "Pode permitir que você faça espelhos parciais ao executar a busca; porém geralmente não é recomendado pois o histórico será ignorado e perdido."
 
 #. type: Labeled list
 #: en/git-svn.txt:594
@@ -61016,10 +53051,7 @@ msgstr "Apenas utilizado com o comando 'set-tree'."
 #: en/git-svn.txt:601
 #, priority:100
 msgid "Read a list of commits from stdin and commit them in reverse order.  Only the leading sha1 is read from each line, so 'git rev-list --pretty=oneline' output can be used."
-msgstr ""
-"Leia uma lista dos commits vinda do stdin e faça o commit deles em ordem "
-"inversa.  Apenas o SHA1 principal é lido em cada linha, portanto, a saída "
-"'git rev-list --pretty=oneline' pode ser utilizado."
+msgstr "Leia uma lista dos commits vinda do stdin e faça o commit deles em ordem inversa.  Apenas o SHA1 principal é lido em cada linha, portanto, a saída 'git rev-list --pretty=oneline' pode ser utilizado."
 
 #. type: Labeled list
 #: en/git-svn.txt:602
@@ -61037,12 +53069,7 @@ msgstr "Utilizado apenas com os comandos 'dcommit', 'set-tree' e 'commit-diff'."
 #: en/git-svn.txt:610
 #, priority:100
 msgid "Remove directories from the SVN tree if there are no files left behind.  SVN can version empty directories, and they are not removed by default if there are no files left in them.  Git cannot version empty directories.  Enabling this flag will make the commit to SVN act like Git."
-msgstr ""
-"Remova os diretórios da árvore SVN caso não haja arquivos deixados para "
-"trás.  O SVN pode dar versão a diretórios vazios, e por predefinição eles "
-"não são removidos, caso não haja arquivos neles.  O Git não pode dar versão "
-"nos diretórios vazios.  A ativação dessa opção fará com que o commit no SVN "
-"aja como o Git."
+msgstr "Remova os diretórios da árvore SVN caso não haja arquivos deixados para trás.  O SVN pode dar versão a diretórios vazios, e por predefinição eles não são removidos, caso não haja arquivos neles.  O Git não pode dar versão nos diretórios vazios.  A ativação dessa opção fará com que o commit no SVN aja como o Git."
 
 #. type: Plain text
 #: en/git-svn.txt:613
@@ -61054,10 +53081,7 @@ msgstr "config key: svn.rmdir\n"
 #: en/git-svn.txt:621
 #, priority:100
 msgid "Edit the commit message before committing to SVN.  This is off by default for objects that are commits, and forced on when committing tree objects."
-msgstr ""
-"Edite a mensagem do commit antes de fazer o commit no SVN.  A predefinição é "
-"deixar desativado para os objetos que sejam commits e é imposto que esteja "
-"ativo ao fazer o commit nos objetos da árvore."
+msgstr "Edite a mensagem do commit antes de fazer o commit no SVN.  A predefinição é deixar desativado para os objetos que sejam commits e é imposto que esteja ativo ao fazer o commit nos objetos da árvore."
 
 #. type: Plain text
 #: en/git-svn.txt:624
@@ -61097,9 +53121,7 @@ msgstr "--authors-file=<nome-do-arquivo>"
 #: en/git-svn.txt:640
 #, priority:100
 msgid "Syntax is compatible with the file used by 'git cvsimport' but an empty email address can be supplied with '<>':"
-msgstr ""
-"A sintaxe é compatível com o arquivo usado pelo comando 'git cvsimport', "
-"porém um endereço de e-mail vazio pode ser informado com '<>':"
+msgstr "A sintaxe é compatível com o arquivo usado pelo comando 'git cvsimport', porém um endereço de e-mail vazio pode ser informado com '<>':"
 
 #. type: delimited block -
 #: en/git-svn.txt:643
@@ -61111,13 +53133,7 @@ msgstr "\tloginname = Joe User <user@example.com>\n"
 #: en/git-svn.txt:650
 #, priority:100
 msgid "If this option is specified and 'git svn' encounters an SVN committer name that does not exist in the authors-file, 'git svn' will abort operation. The user will then have to add the appropriate entry.  Re-running the previous 'git svn' command after the authors-file is modified should continue operation."
-msgstr ""
-"Caso esta opção seja definida e o comando 'git svn' encontrar um nome de que "
-"fez o commit SVN que não exista no arquivo de autores, o 'git svn' "
-"interromperá a operação. É preciso que o usuário adicione a entrada "
-"apropriada.  Após a reexecução do comando 'git svn' anterior depois da "
-"devida alteração no arquivo dos autores, deve fazer com que a operação "
-"continue."
+msgstr "Caso esta opção seja definida e o comando 'git svn' encontrar um nome de que fez o commit SVN que não exista no arquivo de autores, o 'git svn' interromperá a operação. É preciso que o usuário adicione a entrada apropriada.  Após a reexecução do comando 'git svn' anterior depois da devida alteração no arquivo dos autores, deve fazer com que a operação continue."
 
 #. type: Plain text
 #: en/git-svn.txt:653
@@ -61135,22 +53151,13 @@ msgstr "--authors-prog=<nome-do-arquivo>"
 #: en/git-svn.txt:661
 #, priority:100
 msgid "If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument.  The program is expected to return a single line of the form \"Name <email>\" or \"Name <>\", which will be treated as if included in the authors file."
-msgstr ""
-"Caso esta opção seja definida, para cada nome de quem fez o commit SVN que "
-"não exista no arquivo de autores, o arquivo informado será executado com o "
-"nome do committer como o primeiro argumento.  Espera-se que o programa "
-"retorne uma única linha do formulário \"Nome <e-mail>\" ou \"Nome <>\", que "
-"será tratado como se fosse incluído no arquivo dos autores."
+msgstr "Caso esta opção seja definida, para cada nome de quem fez o commit SVN que não exista no arquivo de autores, o arquivo informado será executado com o nome do committer como o primeiro argumento.  Espera-se que o programa retorne uma única linha do formulário \"Nome <e-mail>\" ou \"Nome <>\", que será tratado como se fosse incluído no arquivo dos autores."
 
 #. type: Plain text
 #: en/git-svn.txt:666
 #, priority:100
 msgid "Due to historical reasons a relative 'filename' is first searched relative to the current directory for 'init' and 'clone' and relative to the root of the working tree for 'fetch'. If 'filename' is not found, it is searched like any other command in '$PATH'."
-msgstr ""
-"Devido a razões históricas, um 'nome do arquivo' relativo é o primeiro "
-"pesquisado em relação ao diretório atual através do 'init' e 'clone' em "
-"relação à raiz da árvore de trabalho para uma 'busca'. Caso o 'filename' não "
-"seja encontrado, ele será pesquisado como qualquer outro comando no '$PATH'."
+msgstr "Devido a razões históricas, um 'nome do arquivo' relativo é o primeiro pesquisado em relação ao diretório atual através do 'init' e 'clone' em relação à raiz da árvore de trabalho para uma 'busca'. Caso o 'filename' não seja encontrado, ele será pesquisado como qualquer outro comando no '$PATH'."
 
 #. type: Plain text
 #: en/git-svn.txt:669
@@ -61162,9 +53169,7 @@ msgstr "config key: svn.authorsProg\n"
 #: en/git-svn.txt:674
 #, priority:100
 msgid "Make 'git svn' less verbose. Specify a second time to make it even less verbose."
-msgstr ""
-"Torne 'git svn' menos loquaz. Defina uma segunda vez para torná-lo ainda "
-"menos loquaz."
+msgstr "Torne 'git svn' menos loquaz. Defina uma segunda vez para torná-lo ainda menos loquaz."
 
 #. type: Labeled list
 #: en/git-svn.txt:677
@@ -61188,40 +53193,31 @@ msgstr "Estes são usados apenas com os comandos 'dcommit' e 'rebase'."
 #: en/git-svn.txt:686
 #, priority:100
 msgid "Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot be used (see 'dcommit')."
-msgstr ""
-"Passado diretamente para o comando 'git rebase' ao utilizar o 'dcommit' caso "
-"um 'git reset' não puder ser utilizado (consulte 'dcommit')."
+msgstr "Passado diretamente para o comando 'git rebase' ao utilizar o 'dcommit' caso um 'git reset' não puder ser utilizado (consulte 'dcommit')."
 
 #. type: Plain text
 #: en/git-svn.txt:691
 #, priority:100
 msgid "This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands."
-msgstr ""
-"Isso pode ser usado com os comandos 'dcommit', 'rebase', 'branch' e 'tag'."
+msgstr "Isso pode ser usado com os comandos 'dcommit', 'rebase', 'branch' e 'tag'."
 
 #. type: Plain text
 #: en/git-svn.txt:694
 #, priority:100
 msgid "For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN."
-msgstr ""
-"Para o 'dcommit', imprima a série de opções Git que exibiriam quais os "
-"\"diffs\" seriam feitos os commits para o SVN."
+msgstr "Para o 'dcommit', imprima a série de opções Git que exibiriam quais os \"diffs\" seriam feitos os commits para o SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:698
 #, priority:100
 msgid "For 'rebase', display the local branch associated with the upstream svn repository associated with the current branch and the URL of svn repository that will be fetched from."
-msgstr ""
-"Para 'rebase', exiba o ramo local associado ao repositório 'svn upstream' "
-"associado à ramificação atual e a URL do repositório svn que será buscado."
+msgstr "Para 'rebase', exiba o ramo local associado ao repositório 'svn upstream' associado à ramificação atual e a URL do repositório svn que será buscado."
 
 #. type: Plain text
 #: en/git-svn.txt:701
 #, priority:100
 msgid "For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag."
-msgstr ""
-"Para 'ramo' e 'tag', exiba as URLs que serão utilizados para copiar durante "
-"a criação do ramo ou tag."
+msgstr "Para 'ramo' e 'tag', exiba as URLs que serão utilizados para copiar durante a criação do ramo ou tag."
 
 #. type: Labeled list
 #: en/git-svn.txt:702
@@ -61233,10 +53229,7 @@ msgstr "--use-log-author"
 #: en/git-svn.txt:706
 #, priority:100
 msgid "When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string."
-msgstr ""
-"Ao recuperar commits svn no Git (como parte das operações 'fetch', 'rebase' "
-"ou 'dcommit'), procure pela primeira linha `From:` ou `Signed off by:` na "
-"mensagem do registro log e use-a como texto do autor."
+msgstr "Ao recuperar commits svn no Git (como parte das operações 'fetch', 'rebase' ou 'dcommit'), procure pela primeira linha `From:` ou `Signed off by:` na mensagem do registro log e use-a como texto do autor."
 
 #. type: Plain text
 #: en/git-svn.txt:709
@@ -61254,13 +53247,7 @@ msgstr "--add-author-from"
 #: en/git-svn.txt:716
 #, priority:100
 msgid "When committing to svn from Git (as part of 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string.  If you use this, then `--use-log-author` will retrieve a valid author string for all commits."
-msgstr ""
-"Ao fazer o commit no svn a partir do Git (como parte das operações 'set "
-"tree' ou 'dcommit'), caso a mensagem do registro log existente ainda não "
-"tenha uma linha `From:` ou `Signed off by:`, adicione uma linha `From:` com "
-"base no texto do autor do commit do Git.  Caso você use isso, então o `--use-"
-"log-author` recuperará uma sequência de autores válidos para todos os "
-"commits."
+msgstr "Ao fazer o commit no svn a partir do Git (como parte das operações 'set tree' ou 'dcommit'), caso a mensagem do registro log existente ainda não tenha uma linha `From:` ou `Signed off by:`, adicione uma linha `From:` com base no texto do autor do commit do Git.  Caso você use isso, então o `--use-log-author` recuperará uma sequência de autores válidos para todos os commits."
 
 #. type: Plain text
 #: en/git-svn.txt:719
@@ -61290,11 +53277,7 @@ msgstr "--id <GIT_SVN_ID>"
 #: en/git-svn.txt:729
 #, priority:100
 msgid "This sets GIT_SVN_ID (instead of using the environment).  This allows the user to override the default refname to fetch from when tracking a single URL.  The 'log' and 'dcommit' commands no longer require this switch as an argument."
-msgstr ""
-"Define o `GIT_SVN_ID` (em vez de usar o ambiente).  Permite que o usuário "
-"substitua o nome da referência predefinida para buscar durante o "
-"monitoramento de uma única URL.  Os comandos 'log' e 'dcommit' não exigem "
-"mais essa opção como argumento."
+msgstr "Define o `GIT_SVN_ID` (em vez de usar o ambiente).  Permite que o usuário substitua o nome da referência predefinida para buscar durante o monitoramento de uma única URL.  Os comandos 'log' e 'dcommit' não exigem mais essa opção como argumento."
 
 #. type: Labeled list
 #: en/git-svn.txt:730
@@ -61312,10 +53295,7 @@ msgstr "--svn-remote <nome remoto>"
 #: en/git-svn.txt:735
 #, priority:100
 msgid "Specify the [svn-remote \"<remote name>\"] section to use, this allows SVN multiple repositories to be tracked.  Default: \"svn\""
-msgstr ""
-"Define a seção [svn-remote \"<nome remoto>\"] a ser utilizada, isso "
-"permitirá que vários repositórios do SVN sejam monitorados.  Predefinição: "
-"\"svn\""
+msgstr "Define a seção [svn-remote \"<nome remoto>\"] a ser utilizada, isso permitirá que vários repositórios do SVN sejam monitorados.  Predefinição: \"svn\""
 
 #. type: Labeled list
 #: en/git-svn.txt:736
@@ -61327,20 +53307,7 @@ msgstr "--follow-parent"
 #: en/git-svn.txt:751
 #, priority:100
 msgid "This option is only relevant if we are tracking branches (using one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set a suitable parent in the first Git commit for the branch.  This is especially helpful when we're tracking a directory that has been moved around within the repository.  If this feature is disabled, the branches created by 'git svn' will all be linear and not share any history, meaning that there will be no information on where branches were branched off or merged.  However, following long/convoluted histories can take a long time, so disabling this feature may speed up the cloning process. This feature is enabled by default, use --no-follow-parent to disable it."
-msgstr ""
-"Esta opção é relevante apenas caso estivermos monitorando as ramificações ("
-"usando uma das opções de layout do repositório `--trunk`, `--tags`, "
-"`--branches`, `--stdlayout`). Para cada ramo monitorado, tente descobrir de "
-"onde a sua revisão foi copiada e defina um pai adequado no primeiro commit "
-"do Git para o ramo.  Isso é especialmente útil quando monitoramos um "
-"diretório que foi movido pelo repositório.  Caso este recurso esteja "
-"desativado, os desvios criados pelo comando 'git svn' serão todos lineares e "
-"não compartilharão nenhum histórico, o que significa que não haverá "
-"informações sobre onde os desvios foram ramificados ou mesclados.  No "
-"entanto, o acompanhamento dos históricos longos/complicados podem levar "
-"muito tempo, portanto, desativar este recurso pode acelerar o processo da "
-"clonagem. É predefinido que este recurso esteja ativado, não use a opção "
-"`--no-follow-parent` para desativá-lo."
+msgstr "Esta opção é relevante apenas caso estivermos monitorando as ramificações (usando uma das opções de layout do repositório `--trunk`, `--tags`, `--branches`, `--stdlayout`). Para cada ramo monitorado, tente descobrir de onde a sua revisão foi copiada e defina um pai adequado no primeiro commit do Git para o ramo.  Isso é especialmente útil quando monitoramos um diretório que foi movido pelo repositório.  Caso este recurso esteja desativado, os desvios criados pelo comando 'git svn' serão todos lineares e não compartilharão nenhum histórico, o que significa que não haverá informações sobre onde os desvios foram ramificados ou mesclados.  No entanto, o acompanhamento dos históricos longos/complicados podem levar muito tempo, portanto, desativar este recurso pode acelerar o processo da clonagem. É predefinido que este recurso esteja ativado, não use a opção `--no-follow-parent` para desativá-lo."
 
 #. type: Plain text
 #: en/git-svn.txt:754
@@ -61376,34 +53343,19 @@ msgstr "Se livra das linhas 'git-svn-id:' no final de cada commit."
 #: en/git-svn.txt:766
 #, priority:100
 msgid "This option can only be used for one-shot imports as 'git svn' will not be able to fetch again without metadata. Additionally, if you lose your '$GIT_DIR/svn/\\**/.rev_map.*' files, 'git svn' will not be able to rebuild them."
-msgstr ""
-"Esta opção pode ser usada apenas para as importações de captura única, já "
-"que 'git svn' não poderá buscar novamente sem os metadados. Além disso, caso "
-"perca os seus arquivos '$GIT_DIR/svn/\\**/.rev_map.*', o comando 'git svn' "
-"não será capaz de reconstruí-los."
+msgstr "Esta opção pode ser usada apenas para as importações de captura única, já que 'git svn' não poderá buscar novamente sem os metadados. Além disso, caso perca os seus arquivos '$GIT_DIR/svn/\\**/.rev_map.*', o comando 'git svn' não será capaz de reconstruí-los."
 
 #. type: Plain text
 #: en/git-svn.txt:770
 #, priority:100
 msgid "The 'git svn log' command will not work on repositories using this, either.  Using this conflicts with the 'useSvmProps' option for (hopefully) obvious reasons."
-msgstr ""
-"O comando 'git svn log' também não funcionará nos repositórios que usam "
-"isso.  Usar isso entra em conflito com a opção 'useSvmProps' por (espero) "
-"razões óbvias."
+msgstr "O comando 'git svn log' também não funcionará nos repositórios que usam isso.  Usar isso entra em conflito com a opção 'useSvmProps' por (espero) razões óbvias."
 
 #. type: Plain text
 #: en/git-svn.txt:778
 #, priority:100
 msgid "This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug reports, and archives.  If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider https://github.com/newren/git-filter-repo[git-filter-repo] instead.  filter-repo also allows reformatting of metadata for ease-of-reading and rewriting authorship info for non-\"svn.authorsFile\" users."
-msgstr ""
-"Esta opção NÃO é recomendada pois dificulta o monitoramento das referências "
-"mais antigas para os números da revisão do SVN na documentação existente, "
-"nos relatórios de erros e nos arquivos.  Caso planeje eventualmente migrar "
-"do SVN para o Git e tenha certeza de descartar o histórico do SVN, em vez "
-"disso, considere a consulta no https://github.com/newren/git-filter-repo[git-"
-"filter-repo].  O 'filter-repo' também permite reformatar os metadados para "
-"facilitar a leitura e reescrever as informações da autoria para os usuários "
-"que não estejam no \"svn.authorsFile\"."
+msgstr "Esta opção NÃO é recomendada pois dificulta o monitoramento das referências mais antigas para os números da revisão do SVN na documentação existente, nos relatórios de erros e nos arquivos.  Caso planeje eventualmente migrar do SVN para o Git e tenha certeza de descartar o histórico do SVN, em vez disso, considere a consulta no https://github.com/newren/git-filter-repo[git-filter-repo].  O 'filter-repo' também permite reformatar os metadados para facilitar a leitura e reescrever as informações da autoria para os usuários que não estejam no \"svn.authorsFile\"."
 
 #. type: Labeled list
 #: en/git-svn.txt:779
@@ -61421,22 +53373,13 @@ msgstr "svn-remote.<nome>.useSvmProps"
 #: en/git-svn.txt:783
 #, priority:100
 msgid "This allows 'git svn' to re-map repository URLs and UUIDs from mirrors created using SVN::Mirror (or svk) for metadata."
-msgstr ""
-"Isso permite ao 'git svn' remapear novamente as URLs e os UUIDs do "
-"repositório a partir dos espelhos criados usando SVN::Mirror (ou svk) para o "
-"metadados."
+msgstr "Isso permite ao 'git svn' remapear novamente as URLs e os UUIDs do repositório a partir dos espelhos criados usando SVN::Mirror (ou svk) para o metadados."
 
 #. type: Plain text
 #: en/git-svn.txt:791
 #, priority:100
 msgid "If an SVN revision has a property, \"svm:headrev\", it is likely that the revision was created by SVN::Mirror (also used by SVK).  The property contains a repository UUID and a revision.  We want to make it look like we are mirroring the original URL, so introduce a helper function that returns the original identity URL and UUID, and use it when generating metadata in commit messages."
-msgstr ""
-"Caso uma revisão SVN tenha uma propriedade \"svm:headrev\", é provável que a "
-"revisão tenha sido criada através do `SVN::Mirror` (também utilizado pelo "
-"SVK).  A propriedade contém um UUID do repositório e uma revisão.  Queremos "
-"fazer parecer que estamos espelhando a URL original; portanto, introduza uma "
-"função auxiliar que retorne a URL da identidade original e seu UUID e "
-"utilize-a ao gerar os metadados nas mensagens dos commits."
+msgstr "Caso uma revisão SVN tenha uma propriedade \"svm:headrev\", é provável que a revisão tenha sido criada através do `SVN::Mirror` (também utilizado pelo SVK).  A propriedade contém um UUID do repositório e uma revisão.  Queremos fazer parecer que estamos espelhando a URL original; portanto, introduza uma função auxiliar que retorne a URL da identidade original e seu UUID e utilize-a ao gerar os metadados nas mensagens dos commits."
 
 #. type: Labeled list
 #: en/git-svn.txt:792
@@ -61454,9 +53397,7 @@ msgstr "svn-remote.<nome>.useSvnsyncprops"
 #: en/git-svn.txt:797
 #, priority:100
 msgid "Similar to the useSvmProps option; this is for users of the svnsync(1) command distributed with SVN 1.4.x and later."
-msgstr ""
-"Semelhante à opção 'useSvmProps'; isso serve para usuários do comando "
-"svnsync(1) distribuído com o SVN 1.4.x e mais recentes."
+msgstr "Semelhante à opção 'useSvmProps'; isso serve para usuários do comando svnsync(1) distribuído com o SVN 1.4.x e mais recentes."
 
 #. type: Labeled list
 #: en/git-svn.txt:798
@@ -61468,12 +53409,7 @@ msgstr "svn-remote.<nome>.rewriteRoot"
 #: en/git-svn.txt:804
 #, priority:100
 msgid "This allows users to create repositories from alternate URLs.  For example, an administrator could run 'git svn' on the server locally (accessing via file://) but wish to distribute the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL."
-msgstr ""
-"Permite que os usuários criem repositórios a partir das URLs alternativas.  "
-"Como, por exemplo, um administrador pode executar o comando 'git svn' no "
-"servidor localmente (acessando através do file://), mas queira distribuir o "
-"repositório com uma URL pública 'http://' ou 'svn://' nos metadados para que "
-"os usuários vejam a URL pública."
+msgstr "Permite que os usuários criem repositórios a partir das URLs alternativas.  Como, por exemplo, um administrador pode executar o comando 'git svn' no servidor localmente (acessando através do file://), mas queira distribuir o repositório com uma URL pública 'http://' ou 'svn://' nos metadados para que os usuários vejam a URL pública."
 
 #. type: Labeled list
 #: en/git-svn.txt:805
@@ -61485,10 +53421,7 @@ msgstr "svn-remote.<nome>.rewriteUUID"
 #: en/git-svn.txt:810
 #, priority:100
 msgid "Similar to the useSvmProps option; this is for users who need to remap the UUID manually. This may be useful in situations where the original UUID is not available via either useSvmProps or useSvnsyncProps."
-msgstr ""
-"Semelhante à opção 'useSvmProps'; isso serve para os usuários que precisam "
-"remapear o UUID manualmente. Pode ser útil em situações onde o UUID original "
-"não está disponível através do 'useSvmProps' ou o 'useSvnsyncProps'."
+msgstr "Semelhante à opção 'useSvmProps'; isso serve para os usuários que precisam remapear o UUID manualmente. Pode ser útil em situações onde o UUID original não está disponível através do 'useSvmProps' ou o 'useSvnsyncProps'."
 
 #. type: Labeled list
 #: en/git-svn.txt:811
@@ -61500,14 +53433,7 @@ msgstr "svn-remote.<nome>.pushurl"
 #: en/git-svn.txt:820
 #, priority:100
 msgid "Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes precedence."
-msgstr ""
-"Semelhante ao `remote.<nome>.pushurl` do Git, essa chave é projetada para "
-"ser usada nos casos onde a 'url' apontr para um repositório SVN através de "
-"um transporte de leitura apenas, fornecendo um transporte alternativo de "
-"leitura/gravação. Supõe-se que ambas as chaves apontem para o mesmo "
-"repositório. Ao contrário do 'commiturl', 'pushurl' é um caminho da base. "
-"Caso 'commiturl' ou 'pushurl' puder ser usado, o 'commiturl' terá "
-"precedência."
+msgstr "Semelhante ao `remote.<nome>.pushurl` do Git, essa chave é projetada para ser usada nos casos onde a 'url' apontr para um repositório SVN através de um transporte de leitura apenas, fornecendo um transporte alternativo de leitura/gravação. Supõe-se que ambas as chaves apontem para o mesmo repositório. Ao contrário do 'commiturl', 'pushurl' é um caminho da base. Caso 'commiturl' ou 'pushurl' puder ser usado, o 'commiturl' terá precedência."
 
 #. type: Labeled list
 #: en/git-svn.txt:821
@@ -61519,15 +53445,7 @@ msgstr "svn.brokenSymlinkWorkaround"
 #: en/git-svn.txt:829
 #, priority:100
 msgid "This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients.  Set this option to \"false\" if you track a SVN repository with many empty blobs that are not symlinks.  This option may be changed while 'git svn' is running and take effect on the next revision fetched.  If unset, 'git svn' assumes this option to be \"true\"."
-msgstr ""
-"Desabilita as verificações potencialmente dispendiosas para solucionar os "
-"links simbólicos quebrados registrados no SVN feito por clientes "
-"problemáticos.  Defina esta opção como 'false' caso você monitore um "
-"repositório SVN com muitas bolhas vazias que não sejam links simbólicos.  "
-"Esta opção pode ser alterada enquanto o comando 'git svn' estiver em "
-"execução e entrar em vigor na busca da próxima revisão.  Caso não esteja "
-"definido, o comando 'git svn' assume que esta opção seja \"verdadeira\" "
-"(true)."
+msgstr "Desabilita as verificações potencialmente dispendiosas para solucionar os links simbólicos quebrados registrados no SVN feito por clientes problemáticos.  Defina esta opção como 'false' caso você monitore um repositório SVN com muitas bolhas vazias que não sejam links simbólicos.  Esta opção pode ser alterada enquanto o comando 'git svn' estiver em execução e entrar em vigor na busca da próxima revisão.  Caso não esteja definido, o comando 'git svn' assume que esta opção seja \"verdadeira\" (true)."
 
 #. type: Labeled list
 #: en/git-svn.txt:830
@@ -61539,12 +53457,7 @@ msgstr "svn.pathnameencoding"
 #: en/git-svn.txt:835
 #, priority:100
 msgid "This instructs git svn to recode pathnames to a given encoding.  It can be used by windows users and by those who work in non-utf8 locales to avoid corrupted file names with non-ASCII characters.  Valid encodings are the ones supported by Perl's Encode module."
-msgstr ""
-"Informa o 'git svn' para re-codificar os nomes do caminho para uma "
-"determinada codificação.  Ele pode ser utilizado pelos usuários do Windows e "
-"por aqueles que trabalham em locais que não utilizem utf8, para evitar que "
-"nomes dos arquivos sejam corrompidos com caracteres que não sejam ASCII.  "
-"Codificações válidas são compatíveis pelo módulo Encode do Perl."
+msgstr "Informa o 'git svn' para re-codificar os nomes do caminho para uma determinada codificação.  Ele pode ser utilizado pelos usuários do Windows e por aqueles que trabalham em locais que não utilizem utf8, para evitar que nomes dos arquivos sejam corrompidos com caracteres que não sejam ASCII.  Codificações válidas são compatíveis pelo módulo Encode do Perl."
 
 #. type: Labeled list
 #: en/git-svn.txt:836
@@ -61556,33 +53469,19 @@ msgstr "svn-remote.<nome>.automkdirs"
 #: en/git-svn.txt:843
 #, priority:100
 msgid "Normally, the \"git svn clone\" and \"git svn rebase\" commands attempt to recreate empty directories that are in the Subversion repository.  If this option is set to \"false\", then empty directories will only be created if the \"git svn mkdirs\" command is run explicitly.  If unset, 'git svn' assumes this option to be \"true\"."
-msgstr ""
-"Normalmente, os comandos \"git svn clone\" e o \"git svn rebase\" tentam "
-"recriar os diretórios vazios que estão no repositório do Subversion.  Caso "
-"esta opção esteja configurada como 'false', os diretórios vazios serão "
-"criados apenas caso o comando \"git svn mkdirs\" seja executado de forma "
-"explicita.  Caso não esteja definido, o comando 'git svn' assume que esta "
-"opção seja \"verdadeira\" (true)."
+msgstr "Normalmente, os comandos \"git svn clone\" e o \"git svn rebase\" tentam recriar os diretórios vazios que estão no repositório do Subversion.  Caso esta opção esteja configurada como 'false', os diretórios vazios serão criados apenas caso o comando \"git svn mkdirs\" seja executado de forma explicita.  Caso não esteja definido, o comando 'git svn' assume que esta opção seja \"verdadeira\" (true)."
 
 #. type: Plain text
 #: en/git-svn.txt:848
 #, priority:100
 msgid "Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps options all affect the metadata generated and used by 'git svn'; they *must* be set in the configuration file before any history is imported and these settings should never be changed once they are set."
-msgstr ""
-"Como as opções 'noMetadata', 'rewriteRoot', 'rewriteUUID', 'useSvnsyncProps' "
-"e 'useSvmProps' afetam os metadados gerados e usados pelo comando 'git svn'; "
-"eles *devem* ser definidos no arquivo de configuração antes que qualquer "
-"histórico seja importado e estas configurações nunca devem ser alteradas "
-"depois que forem definidas."
+msgstr "Como as opções 'noMetadata', 'rewriteRoot', 'rewriteUUID', 'useSvnsyncProps' e 'useSvmProps' afetam os metadados gerados e usados pelo comando 'git svn'; eles *devem* ser definidos no arquivo de configuração antes que qualquer histórico seja importado e estas configurações nunca devem ser alteradas depois que forem definidas."
 
 #. type: Plain text
 #: en/git-svn.txt:852
 #, priority:100
 msgid "Additionally, only one of these options can be used per svn-remote section because they affect the 'git-svn-id:' metadata line, except for rewriteRoot and rewriteUUID which can be used together."
-msgstr ""
-"Além disso, apenas uma destas opções podem ser utilizadas por uma seção 'svn-"
-"remote' porque elas afetam a linha de metadados 'git-svn-id:', exceto para "
-"`rewriteRoot` e `rewriteUUID`, que podem ser utilizadas juntas."
+msgstr "Além disso, apenas uma destas opções podem ser utilizadas por uma seção 'svn-remote' porque elas afetam a linha de metadados 'git-svn-id:', exceto para `rewriteRoot` e `rewriteUUID`, que podem ser utilizadas juntas."
 
 #. type: Title -
 #: en/git-svn.txt:855
@@ -61594,9 +53493,7 @@ msgstr "EXEMPLOS BÁSICOS"
 #: en/git-svn.txt:859
 #, priority:100
 msgid "Tracking and contributing to the trunk of a Subversion-managed project (ignoring tags and branches):"
-msgstr ""
-"Monitorando e contribuindo para o 'trunk' de um projeto gerenciado pelo "
-"Subversion (ignorando as tags e as ramificações):"
+msgstr "Monitorando e contribuindo para o 'trunk' de um projeto gerenciado pelo Subversion (ignorando as tags e as ramificações):"
 
 #. type: delimited block -
 #: en/git-svn.txt:877
@@ -61627,25 +53524,20 @@ msgstr ""
 "\tgit branch\n"
 "# Trabalhe em algo e faça o commit local:\n"
 "\tgit commit ...\n"
-"# Algum commit está feito no SVN, reconstrua as suas alterações locais "
-"contra as\n"
+"# Algum commit está feito no SVN, reconstrua as suas alterações locais contra as\n"
 "# últimas alterações no SVN:\n"
 "\tgit svn rebase\n"
-"# Agora, faça o commit das suas alterações (que foram anteriormente feitas "
-"utilizando o Git) no SVN,\n"
+"# Agora, faça o commit das suas alterações (que foram anteriormente feitas utilizando o Git) no SVN,\n"
 "# bem como atualizar automaticamente o seu HEAD de trabalho:\n"
 "\tgit svn dcommit\n"
-"# Anexe as configurações do svn:ignore ao arquivo de exclusão predefinido do "
-"Git:\n"
+"# Anexe as configurações do svn:ignore ao arquivo de exclusão predefinido do Git:\n"
 "\tgit svn show-ignore >> .git/info/exclude\n"
 
 #. type: Plain text
 #: en/git-svn.txt:881
 #, priority:100
 msgid "Tracking and contributing to an entire Subversion-managed project (complete with a trunk, tags and branches):"
-msgstr ""
-"Monitorando e contribuindo para todo um projeto gerenciado pelo Subversion ("
-"completo com um 'trunk', tags e ramificações):"
+msgstr "Monitorando e contribuindo para todo um projeto gerenciado pelo Subversion (completo com um 'trunk', tags e ramificações):"
 
 #. type: delimited block -
 #: en/git-svn.txt:896
@@ -61665,35 +53557,25 @@ msgid ""
 "# You may only dcommit to one branch/tag/trunk at a time.  The usage\n"
 "# of dcommit/rebase/show-ignore should be the same as above.\n"
 msgstr ""
-"# Clone um repositório com o layout do diretório SVN predefinido(como o git "
-"clone):\n"
+"# Clone um repositório com o layout do diretório SVN predefinido(como o git clone):\n"
 "\tgit svn clone http://svn.example.com/project --stdlayout --prefix svn/\n"
 "# Ou, se o repositório utilizar um layout de diretório fora do padrão:\n"
-"\tgit svn clone http://svn.example.com/project -T tr -b branch -t tag --"
-"prefix svn/\n"
+"\tgit svn clone http://svn.example.com/project -T tr -b branch -t tag --prefix svn/\n"
 "# Ver todos os ramos e tags que você clonou:\n"
 "\tgit branch -r\n"
 "# Crie um novo ramo no SVN\n"
 "\tgit svn branch waldo\n"
-"# Redefina o seu 'master' para 'trunk' (ou qualquer outro ramo, substituindo "
-"o 'trunk'\n"
+"# Redefina o seu 'master' para 'trunk' (ou qualquer outro ramo, substituindo o 'trunk'\n"
 "# para o nome apropriado):\n"
 "\tgit reset --hard svn/trunk\n"
-"# Você só pode fazer o commit para um ramo/tag/trunk por vez.  A forma de "
-"utilização\n"
+"# Você só pode fazer o commit para um ramo/tag/trunk por vez.  A forma de utilização\n"
 "# do dcommit/rebase/show-ignore deve ser o mesmo mostrado acima.\n"
 
 #. type: Plain text
 #: en/git-svn.txt:904
 #, priority:100
 msgid "The initial 'git svn clone' can be quite time-consuming (especially for large Subversion repositories). If multiple people (or one person with multiple machines) want to use 'git svn' to interact with the same Subversion repository, you can do the initial 'git svn clone' to a repository on a server and have each person clone that repository with 'git clone':"
-msgstr ""
-"O comando 'git svn clone' inicial pode consumir bastante tempo ("
-"especialmente para grandes repositórios Subversion). Caso várias pessoas (ou "
-"uma pessoa com várias máquinas) quiserem usar o comando 'git svn' para "
-"interagir com o mesmo repositório do Subversion, você poderá executar o "
-"comando 'git svn clone' inicial em um repositório em um servidor e fazer com "
-"que cada pessoa clone esse repositório com o comando 'clone git':"
+msgstr "O comando 'git svn clone' inicial pode consumir bastante tempo (especialmente para grandes repositórios Subversion). Caso várias pessoas (ou uma pessoa com várias máquinas) quiserem usar o comando 'git svn' para interagir com o mesmo repositório do Subversion, você poderá executar o comando 'git svn clone' inicial em um repositório em um servidor e fazer com que cada pessoa clone esse repositório com o comando 'clone git':"
 
 #. type: delimited block -
 #: en/git-svn.txt:925
@@ -61720,16 +53602,13 @@ msgid ""
 "\tgit svn rebase\n"
 msgstr ""
 "# Faça a importação inicial em um servidor\n"
-"\tssh server \"cd /pub && git svn clone http://svn.example.com/project "
-"[options...]\"\n"
-"# Clone localmente - tenha certeza se os espaços refs/remotes/ coincidem com "
-"o servidor\n"
+"\tssh server \"cd /pub && git svn clone http://svn.example.com/project [options...]\"\n"
+"# Clone localmente - tenha certeza se os espaços refs/remotes/ coincidem com o servidor\n"
 "\tmkdir project\n"
 "\tcd project\n"
 "\tgit init\n"
 "\tgit remote add origin server:/pub/project\n"
-"\tgit config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/"
-"*'\n"
+"\tgit config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'\n"
 "\tgit fetch\n"
 "# Impeça o 'fetch/pull' do servidor Git remoto no futuro,\n"
 "# queremos utilizar apenas o git svn para as atualizações futuras\n"
@@ -61737,8 +53616,7 @@ msgstr ""
 "# Crie um ramo local a partir de uma das ramificações que foram buscadas\n"
 "\tgit checkout -b master FETCH_HEAD\n"
 "# Inicialize o 'git svn' localmente (tenha certeza de utilizar a mesma URL\n"
-"# e as opções --stdlayout/-T/-b/-t/--prefix que foram utilizadas no servidor)"
-"\n"
+"# e as opções --stdlayout/-T/-b/-t/--prefix que foram utilizadas no servidor)\n"
 "\tgit svn init http://svn.example.com/project [options...]\n"
 "# Obtenha as últimas alterações do Subversion\n"
 "\tgit svn rebase\n"
@@ -61753,27 +53631,13 @@ msgstr "RECONSTRUIR VS. \"PULL/MERGE\""
 #: en/git-svn.txt:934
 #, priority:100
 msgid "Prefer to use 'git svn rebase' or 'git rebase', rather than 'git pull' or 'git merge' to synchronize unintegrated commits with a 'git svn' branch. Doing so will keep the history of unintegrated commits linear with respect to the upstream SVN repository and allow the use of the preferred 'git svn dcommit' subcommand to push unintegrated commits back into SVN."
-msgstr ""
-"Prefira usar o comando 'git svn rebase' ou o 'git rebase', em vez do comando "
-"'git pull' ou o 'git merge' para sincronizar os commits que não foram "
-"integrados a um ramo com 'git svn'. Isso manterá o histórico linear dos "
-"commits não integrados em relação ao repositório SVN 'upstream' e permitirá "
-"a utilização do subcomando 'git svn dcommit' preferido para impulsionar os "
-"commits que não foram integrados de volta ao SVN."
+msgstr "Prefira usar o comando 'git svn rebase' ou o 'git rebase', em vez do comando 'git pull' ou o 'git merge' para sincronizar os commits que não foram integrados a um ramo com 'git svn'. Isso manterá o histórico linear dos commits não integrados em relação ao repositório SVN 'upstream' e permitirá a utilização do subcomando 'git svn dcommit' preferido para impulsionar os commits que não foram integrados de volta ao SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:942
 #, priority:100
 msgid "Originally, 'git svn' recommended that developers pulled or merged from the 'git svn' branch.  This was because the author favored `git svn set-tree B` to commit a single head rather than the `git svn set-tree A..B` notation to commit multiple commits. Use of 'git pull' or 'git merge' with `git svn set-tree A..B` will cause non-linear history to be flattened when committing into SVN and this can lead to merge commits unexpectedly reversing previous commits in SVN."
-msgstr ""
-"Originalmente, o comando 'git svn' recomendava que os desenvolvedores "
-"extraíssem ou mesclassem o ramo 'git svn'.  Isso ocorreu porque o autor "
-"favoreceu o `git svn set tree B` para o commit um único cabeçalho, em vez da "
-"notação `git svn set-tree A..B` para fazer o commit de vários commits. O uso "
-"do comando 'git pull' ou do 'git merge' com o `git svn set tree A..B` fará "
-"com que o histórico não linear seja achatado ao fazer o commit no SVN e isso "
-"pode levar a uma mesclagem dos commits, revertendo de forma inesperada os "
-"commits anteriores no SVN."
+msgstr "Originalmente, o comando 'git svn' recomendava que os desenvolvedores extraíssem ou mesclassem o ramo 'git svn'.  Isso ocorreu porque o autor favoreceu o `git svn set tree B` para o commit um único cabeçalho, em vez da notação `git svn set-tree A..B` para fazer o commit de vários commits. O uso do comando 'git pull' ou do 'git merge' com o `git svn set tree A..B` fará com que o histórico não linear seja achatado ao fazer o commit no SVN e isso pode levar a uma mesclagem dos commits, revertendo de forma inesperada os commits anteriores no SVN."
 
 #. type: Title -
 #: en/git-svn.txt:944
@@ -61785,13 +53649,7 @@ msgstr "MONITORAMENTO DA MESCLAGEM"
 #: en/git-svn.txt:951
 #, priority:100
 msgid "While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users.  Therefore it is advised that users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below)."
-msgstr ""
-"Embora o 'git svn' possa monitorar a cópia do histórico (incluindo as "
-"ramificações e as tags) dos repositórios que adotam um layout padrão, ele "
-"ainda não pode representar o histórico da mesclagem que ocorreu dentro do "
-"git de volta para os usuários do SVN.  Portanto, é recomendável que os "
-"usuários mantenham o histórico o mais linear possível dentro do Git para "
-"facilitar a compatibilidade com o SVN (consulte a seção RESSALVAS abaixo)."
+msgstr "Embora o 'git svn' possa monitorar a cópia do histórico (incluindo as ramificações e as tags) dos repositórios que adotam um layout padrão, ele ainda não pode representar o histórico da mesclagem que ocorreu dentro do git de volta para os usuários do SVN.  Portanto, é recomendável que os usuários mantenham o histórico o mais linear possível dentro do Git para facilitar a compatibilidade com o SVN (consulte a seção RESSALVAS abaixo)."
 
 #. type: Title -
 #: en/git-svn.txt:953
@@ -61803,101 +53661,49 @@ msgstr "LIDANDO COM OS RAMOS DO SVN"
 #: en/git-svn.txt:961
 #, priority:100
 msgid "If 'git svn' is configured to fetch branches (and --follow-branches is in effect), it sometimes creates multiple Git branches for one SVN branch, where the additional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number).  These additional branches are created if 'git svn' cannot find a parent commit for the first commit in an SVN branch, to connect the branch to the history of the other branches."
-msgstr ""
-"Caso o 'git svn' estiver configurado para buscar as ramificações (e a opção "
-"`--follow-branches` estiver em vigor), às vezes ele criará várias "
-"ramificações Git para um ramo SVN, onde as ramificações adicionais terão "
-"nomes no formato 'nomedoramo@nnn' (onde 'nnn' é o número de revisão SVN).  "
-"Estas ramificações adicionais são criadas caso o comando 'git svn' não puder "
-"encontrar um commit parente para o primeiro commit em um ramo SVN, para "
-"conectar o ramo ao histórico das outras ramificações."
+msgstr "Caso o 'git svn' estiver configurado para buscar as ramificações (e a opção `--follow-branches` estiver em vigor), às vezes ele criará várias ramificações Git para um ramo SVN, onde as ramificações adicionais terão nomes no formato 'nomedoramo@nnn' (onde 'nnn' é o número de revisão SVN).  Estas ramificações adicionais são criadas caso o comando 'git svn' não puder encontrar um commit parente para o primeiro commit em um ramo SVN, para conectar o ramo ao histórico das outras ramificações."
 
 #. type: Plain text
 #: en/git-svn.txt:977
 #, priority:100
 msgid "Normally, the first commit in an SVN branch consists of a copy operation. 'git svn' will read this commit to get the SVN revision the branch was created from. It will then try to find the Git commit that corresponds to this SVN revision, and use that as the parent of the branch. However, it is possible that there is no suitable Git commit to serve as parent.  This will happen, among other reasons, if the SVN branch is a copy of a revision that was not fetched by 'git svn' (e.g. because it is an old revision that was skipped with `--revision`), or if in SVN a directory was copied that is not tracked by 'git svn' (such as a branch that is not tracked at all, or a subdirectory of a tracked branch). In these cases, 'git svn' will still create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the branch was copied from and create appropriate Git commits.  This is indicated by the message \"Initializing parent: <branchname>\"."
-msgstr ""
-"Normalmente, o primeiro commit em um ramo SVN consiste em uma operação de "
-"cópia. o 'git svn' irá ler este commit obtendo a revisão SVN onde o ramo foi "
-"criado. Ele tentará encontrar o commit do Git que coincida com esta revisão "
-"do SVN e vai usá-lo como o parente do ramo. Contudo, é possível que não haja "
-"um commit Git adequado para servir como parente.  Isso acontecerá, dentre "
-"outros motivos, caso o ramo SVN seja uma cópia de uma revisão que não foi "
-"buscada pelo 'git svn' (como por exemplo, porque é uma revisão antiga que "
-"foi ignorada com a opção `--revision`), ou no caso do SVN ter sido copiado "
-"de um diretório que não é monitorado pelo 'git svn' (como um ramo que não é "
-"monitorado de maneira alguma ou um subdiretório de um ramo monitorado). "
-"Nesses casos, o comando 'git svn' ainda criará um ramo Git, porém, em vez de "
-"utilizar um commit Git já existente como parente do ramo, ele lerá o "
-"histórico SVN do diretório onde o ramo foi copiado e criará os commits Git "
-"apropriadas.  Isto é indicado através da mensagem \"Initializing parent: "
-"<nome-do-ramo>\" (Inicializando parente: <nomedoramo>)."
+msgstr "Normalmente, o primeiro commit em um ramo SVN consiste em uma operação de cópia. o 'git svn' irá ler este commit obtendo a revisão SVN onde o ramo foi criado. Ele tentará encontrar o commit do Git que coincida com esta revisão do SVN e vai usá-lo como o parente do ramo. Contudo, é possível que não haja um commit Git adequado para servir como parente.  Isso acontecerá, dentre outros motivos, caso o ramo SVN seja uma cópia de uma revisão que não foi buscada pelo 'git svn' (como por exemplo, porque é uma revisão antiga que foi ignorada com a opção `--revision`), ou no caso do SVN ter sido copiado de um diretório que não é monitorado pelo 'git svn' (como um ramo que não é monitorado de maneira alguma ou um subdiretório de um ramo monitorado). Nesses casos, o comando 'git svn' ainda criará um ramo Git, porém, em vez de utilizar um commit Git já existente como parente do ramo, ele lerá o histórico SVN do diretório onde o ramo foi copiado e criará os commits Git apropriadas.  Isto é indicado através da mensagem \"Initializing parent: <nome-do-ramo>\" (Inicializando parente: <nomedoramo>)."
 
 #. type: Plain text
 #: en/git-svn.txt:984
 #, priority:100
 msgid "Additionally, it will create a special branch named '<branchname>@<SVN-Revision>', where <SVN-Revision> is the SVN revision number the branch was copied from.  This branch will point to the newly created parent commit of the branch.  If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'."
-msgstr ""
-"Além disso, ele criará um ramo especial chamado '<nome-do-ramo>@<SVN-"
-"Revision>', onde <Revisão SVN> é o número da revisão do SVN onde o ramo foi "
-"copiado.  Este ramo apontará para o commit da origem recém-criado do ramo.  "
-"Se no SVN o ramo foi excluído e posteriormente recriado a partir de uma "
-"versão diferente, haverá vários ramos com um '@'."
+msgstr "Além disso, ele criará um ramo especial chamado '<nome-do-ramo>@<SVN-Revision>', onde <Revisão SVN> é o número da revisão do SVN onde o ramo foi copiado.  Este ramo apontará para o commit da origem recém-criado do ramo.  Se no SVN o ramo foi excluído e posteriormente recriado a partir de uma versão diferente, haverá vários ramos com um '@'."
 
 #. type: Plain text
 #: en/git-svn.txt:987
 #, priority:100
 msgid "Note that this may mean that multiple Git commits are created for a single SVN revision."
-msgstr ""
-"Observe que isso pode significar que vários commits do Git sejam criados "
-"para uma única revisão do SVN."
+msgstr "Observe que isso pode significar que vários commits do Git sejam criados para uma única revisão do SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:997
 #, priority:100
 msgid "An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r.100.  In r.200, trunk/sub is branched by copying it to branches/. 'git svn clone -s' will then create a branch 'sub'. It will also create new Git commits for r.100 through r.199 and use these as the history of branch 'sub'. Thus there will be two Git commits for each revision from r.100 to r.199 (one containing trunk/, one containing trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
-msgstr ""
-"Um exemplo: em um repositório SVN com um layout predefinido de 'trunk/tags/"
-"branches', um diretório 'trunk/sub' é criado na 'r.100'.  Em 'r.200', o '"
-"trunk/sub' é ramificado ao copiá-lo para 'branches/'. O comando 'git svn "
-"clone -s' criará um ramo 'sub'. Ele também criará novos commits do Git para "
-"'r.100' até 'r.199' e os utilizará como o histórico do ramo 'sub'. Portanto, "
-"haverá dois commits do Git para cada revisão de 'r.100' até 'r.199' (um "
-"contendo 'trunk/', outro contendo 'trunk/sub/'). Finalmente será criado o "
-"ramo 'sub@200' apontando para o novo commit parente do ramo 'sub' (o commit "
-"para 'r.200' e o 'trunk/sub/' por exemplo)."
+msgstr "Um exemplo: em um repositório SVN com um layout predefinido de 'trunk/tags/branches', um diretório 'trunk/sub' é criado na 'r.100'.  Em 'r.200', o 'trunk/sub' é ramificado ao copiá-lo para 'branches/'. O comando 'git svn clone -s' criará um ramo 'sub'. Ele também criará novos commits do Git para 'r.100' até 'r.199' e os utilizará como o histórico do ramo 'sub'. Portanto, haverá dois commits do Git para cada revisão de 'r.100' até 'r.199' (um contendo 'trunk/', outro contendo 'trunk/sub/'). Finalmente será criado o ramo 'sub@200' apontando para o novo commit parente do ramo 'sub' (o commit para 'r.200' e o 'trunk/sub/' por exemplo)."
 
 #. type: Plain text
 #: en/git-svn.txt:1007
 #, priority:100
 msgid "For the sake of simplicity and interoperating with Subversion, it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations between Git repositories and branches.  The recommended method of exchanging code between Git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository."
-msgstr ""
-"Por uma questão de simplicidade e interoperação com o Subversion, é "
-"recomendável que todos os usuários do 'git svn' clonem, busquem e desfaçam "
-"um commit diretamente no servidor SVN e evitem todas as operações dos "
-"comandos 'git clone'/'pull'/'merge'/'push' entre os repositórios e as "
-"ramificações do Git.  O método recomendado da troca do código entre os ramos "
-"e os usuários do Git é 'git format-patch' e 'git am', ou apenas desfazendo o "
-"commit com 'dcommit' no repositório SVN."
+msgstr "Por uma questão de simplicidade e interoperação com o Subversion, é recomendável que todos os usuários do 'git svn' clonem, busquem e desfaçam um commit diretamente no servidor SVN e evitem todas as operações dos comandos 'git clone'/'pull'/'merge'/'push' entre os repositórios e as ramificações do Git.  O método recomendado da troca do código entre os ramos e os usuários do Git é 'git format-patch' e 'git am', ou apenas desfazendo o commit com 'dcommit' no repositório SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:1013
 #, priority:100
 msgid "Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to 'dcommit' from because Subversion users cannot see any merges you've made.  Furthermore, if you merge or pull from a Git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch."
-msgstr ""
-"Executar o comando 'git merge' ou o 'git pull' NÃO é recomendado em um ramo "
-"onde você planeja fazer um 'dcommit', porque os usuários do Subversion não "
-"podem ver nenhuma mesclagem que você tenha feito.  Além disso, caso você "
-"mescle ou extraia de um ramo Git que seja um espelho de um ramo SVN, o "
-"'dcommit' poderá fazer o commit do ramo errado."
+msgstr "Executar o comando 'git merge' ou o 'git pull' NÃO é recomendado em um ramo onde você planeja fazer um 'dcommit', porque os usuários do Subversion não podem ver nenhuma mesclagem que você tenha feito.  Além disso, caso você mescle ou extraia de um ramo Git que seja um espelho de um ramo SVN, o 'dcommit' poderá fazer o commit do ramo errado."
 
 #. type: Plain text
 #: en/git-svn.txt:1016
 #, priority:100
 msgid "If you do merge, note the following rule: 'git svn dcommit' will attempt to commit on top of the SVN commit named in"
-msgstr ""
-"Caso você mescle, observe a seguinte regra: o `git svn dcommit` tentará "
-"fazer o commit sobre o commit do SVN informado em"
+msgstr "Caso você mescle, observe a seguinte regra: o `git svn dcommit` tentará fazer o commit sobre o commit do SVN informado em"
 
 #. type: delimited block -
 #: en/git-svn.txt:1018
@@ -61909,64 +53715,31 @@ msgstr "git log --grep=^git-svn-id: --first-parent -1\n"
 #: en/git-svn.txt:1023
 #, priority:100
 msgid "You 'must' therefore ensure that the most recent commit of the branch you want to dcommit to is the 'first' parent of the merge.  Chaos will ensue otherwise, especially if the first parent is an older commit on the same SVN branch."
-msgstr ""
-"Você 'deve' garantir, portanto, que o commit mais recente do ramo que você "
-"queira fazer o commit seja o 'primeiro' pai da mesclagem.  O caos ocorrerá "
-"de outra forma, especialmente caso o primeiro pai seja um commit mais antigo "
-"no mesmo ramo SVN."
+msgstr "Você 'deve' garantir, portanto, que o commit mais recente do ramo que você queira fazer o commit seja o 'primeiro' pai da mesclagem.  O caos ocorrerá de outra forma, especialmente caso o primeiro pai seja um commit mais antigo no mesmo ramo SVN."
 
 #. type: Plain text
 #: en/git-svn.txt:1028
 #, priority:100
 msgid "'git clone' does not clone branches under the refs/remotes/ hierarchy or any 'git svn' metadata, or config.  So repositories created and managed with using 'git svn' should use 'rsync' for cloning, if cloning is to be done at all."
-msgstr ""
-"O comando 'git clone' não clona as ramificações sob a hierarquia 'refs/"
-"remotes/', qualquer metadado 'git svn' ou configuração. Portanto, os "
-"repositórios criados e gerenciados com a utilização do 'git svn' devem "
-"utilizar o 'rsync' para a clonagem, caso a clonagem precise ser feita."
+msgstr "O comando 'git clone' não clona as ramificações sob a hierarquia 'refs/remotes/', qualquer metadado 'git svn' ou configuração. Portanto, os repositórios criados e gerenciados com a utilização do 'git svn' devem utilizar o 'rsync' para a clonagem, caso a clonagem precise ser feita."
 
 #. type: Plain text
 #: en/git-svn.txt:1033
 #, priority:100
 msgid "Since 'dcommit' uses rebase internally, any Git branches you 'git push' to before 'dcommit' on will require forcing an overwrite of the existing ref on the remote repository.  This is generally considered bad practice, see the linkgit:git-push[1] documentation for details."
-msgstr ""
-"Como o 'dcommit' usa o 'rebase' internamente, qualquer ramificação do Git "
-"para onde você fez o comando 'git push' antes do 'dcommit' exigirá uma "
-"reposição da \"ref\" existente no repositório remoto.  Isso geralmente é "
-"considerado uma má prática, consulte a documentação do linkgit:git-push[1] "
-"para obter mais detalhes."
+msgstr "Como o 'dcommit' usa o 'rebase' internamente, qualquer ramificação do Git para onde você fez o comando 'git push' antes do 'dcommit' exigirá uma reposição da \"ref\" existente no repositório remoto.  Isso geralmente é considerado uma má prática, consulte a documentação do linkgit:git-push[1] para obter mais detalhes."
 
 #. type: Plain text
 #: en/git-svn.txt:1038
 #, priority:100
 msgid "Do not use the --amend option of linkgit:git-commit[1] on a change you've already dcommitted.  It is considered bad practice to --amend commits you've already pushed to a remote repository for other users, and dcommit with SVN is analogous to that."
-msgstr ""
-"Não utilize a opção `--amend` do linkgit:git-commit[1] nas alterações que "
-"você já tenha desfeito no commit.  Não é considerado uma boa prática "
-"utilizar a opção `--amend` nos commits que você já impulsionou para um "
-"repositório remoto para outros usuários, desfazer o commit com SVN é análogo "
-"a isto."
+msgstr "Não utilize a opção `--amend` do linkgit:git-commit[1] nas alterações que você já tenha desfeito no commit.  Não é considerado uma boa prática utilizar a opção `--amend` nos commits que você já impulsionou para um repositório remoto para outros usuários, desfazer o commit com SVN é análogo a isto."
 
 #. type: Plain text
 #: en/git-svn.txt:1053
 #, priority:100
 msgid "When cloning an SVN repository, if none of the options for describing the repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git svn clone' will create a Git repository with completely linear history, where branches and tags appear as separate directories in the working copy.  While this is the easiest way to get a copy of a complete repository, for projects with many branches it will lead to a working copy many times larger than just the trunk. Thus for projects using the standard directory structure (trunk/branches/tags), it is recommended to clone with option `--stdlayout`. If the project uses a non-standard structure, and/or if branches and tags are not required, it is easiest to only clone one directory (typically trunk), without giving any repository layout options.  If the full history with branches and tags is required, the options `--trunk` / `--branches` / `--tags` must be used."
-msgstr ""
-"Ao clonar um repositório SVN, caso nenhuma das opções para descrever o "
-"layout do repositório seja usada (`--trunk`, `--tags`, `--branches`, "
-"`--stdlayout`), o comando 'git svn clone' criará um repositório Git com o "
-"histórico completamente linear, onde as ramificações e as tags aparecerão "
-"como diretórios separados na cópia de trabalho.  Embora essa seja a maneira "
-"mais fácil de se obter uma cópia de um repositório completo, para os "
-"projetos com muitas ramificações, ela resultará em uma cópia de trabalho "
-"muitas vezes maior do que apenas o 'trunk'. Portanto, para os projetos que "
-"utilizem a estrutura predefinida dos diretórios ('trunk/branches/tags'), é "
-"recomendável clonar com a opção `--stdlayout`. Caso o projeto use uma "
-"estrutura fora do padrão e/ou caso as ramificações e as tags não forem "
-"necessárias, é mais fácil clonar um diretório (normalmente o 'trunk'), sem "
-"fornecer as opções do layout do repositório.  Caso o histórico completo das "
-"ramificações e das tags seja necessário, as opções `--trunk` / `--branches` /"
-" `--tags` devem ser usadas."
+msgstr "Ao clonar um repositório SVN, caso nenhuma das opções para descrever o layout do repositório seja usada (`--trunk`, `--tags`, `--branches`, `--stdlayout`), o comando 'git svn clone' criará um repositório Git com o histórico completamente linear, onde as ramificações e as tags aparecerão como diretórios separados na cópia de trabalho.  Embora essa seja a maneira mais fácil de se obter uma cópia de um repositório completo, para os projetos com muitas ramificações, ela resultará em uma cópia de trabalho muitas vezes maior do que apenas o 'trunk'. Portanto, para os projetos que utilizem a estrutura predefinida dos diretórios ('trunk/branches/tags'), é recomendável clonar com a opção `--stdlayout`. Caso o projeto use uma estrutura fora do padrão e/ou caso as ramificações e as tags não forem necessárias, é mais fácil clonar um diretório (normalmente o 'trunk'), sem fornecer as opções do layout do repositório.  Caso o histórico completo das ramificações e das tags seja necessário, as opções `--trunk` / `--branches` / `--tags` devem ser usadas."
 
 #. type: Plain text
 #: en/git-svn.txt:1060
@@ -61988,46 +53761,25 @@ msgstr ""
 #: en/git-svn.txt:1069
 #, priority:100
 msgid "We ignore all SVN properties except svn:executable.  Any unhandled properties are logged to $GIT_DIR/svn/<refname>/unhandled.log"
-msgstr ""
-"Ignoramos todas as propriedades SVN, exceto o `svn:executable`.  Quaisquer "
-"propriedades não manipuladas são registradas no `$GIT_DIR/svn/"
-"<refname>/unhandled.log`"
+msgstr "Ignoramos todas as propriedades SVN, exceto o `svn:executable`.  Quaisquer propriedades não manipuladas são registradas no `$GIT_DIR/svn/<refname>/unhandled.log`"
 
 #. type: Plain text
 #: en/git-svn.txt:1076
 #, priority:100
 msgid "Renamed and copied directories are not detected by Git and hence not tracked when committing to SVN.  I do not plan on adding support for this as it's quite difficult and time-consuming to get working for all the possible corner cases (Git doesn't do it, either).  Committing renamed and copied files is fully supported if they're similar enough for Git to detect them."
-msgstr ""
-"Os diretórios renomeados e copiados não são detectados pelo Git e portanto, "
-"não são monitorados ao fazer o commit com o SVN.  Não pretendo adicionar "
-"suporte para isso, pois é bastante difícil e demorado trabalhar para todos "
-"os casos possíveis (o Git também não faz isso).  Fazer o commit dos arquivos "
-"renomeados e copiados é totalmente compatível caso eles sejam semelhantes o "
-"suficiente para que o Git os detecte."
+msgstr "Os diretórios renomeados e copiados não são detectados pelo Git e portanto, não são monitorados ao fazer o commit com o SVN.  Não pretendo adicionar suporte para isso, pois é bastante difícil e demorado trabalhar para todos os casos possíveis (o Git também não faz isso).  Fazer o commit dos arquivos renomeados e copiados é totalmente compatível caso eles sejam semelhantes o suficiente para que o Git os detecte."
 
 #. type: Plain text
 #: en/git-svn.txt:1082
 #, priority:100
 msgid "In SVN, it is possible (though discouraged) to commit changes to a tag (because a tag is just a directory copy, thus technically the same as a branch). When cloning an SVN repository, 'git svn' cannot know if such a commit to a tag will happen in the future. Thus it acts conservatively and imports all SVN tags as branches, prefixing the tag name with 'tags/'."
-msgstr ""
-"No SVN, é possível (embora desencorajado) fazer o commit nas alterações em "
-"uma tag (porque uma tag é apenas uma cópia do diretório, portanto "
-"tecnicamente o mesmo que um ramo). Ao clonar um repositório SVN, o comando "
-"'git svn' não pode saber se tal commit com uma tag ocorrerá no futuro. "
-"Portanto, ele age de maneira conservadora e importa todas as tags SVN como "
-"ramificações, prefixando o nome da tag com 'tags/'."
+msgstr "No SVN, é possível (embora desencorajado) fazer o commit nas alterações em uma tag (porque uma tag é apenas uma cópia do diretório, portanto tecnicamente o mesmo que um ramo). Ao clonar um repositório SVN, o comando 'git svn' não pode saber se tal commit com uma tag ocorrerá no futuro. Portanto, ele age de maneira conservadora e importa todas as tags SVN como ramificações, prefixando o nome da tag com 'tags/'."
 
 #. type: Plain text
 #: en/git-svn.txt:1093
 #, priority:100
 msgid "'git svn' stores [svn-remote] configuration information in the repository $GIT_DIR/config file.  It is similar the core Git [remote] sections except 'fetch' keys do not accept glob arguments; but they are instead handled by the 'branches' and 'tags' keys.  Since some SVN repositories are oddly configured with multiple projects glob expansions such those listed below are allowed:"
-msgstr ""
-"O 'git svn' armazena as informações de configuração [svn-remote] no arquivo "
-"'$GIT_DIR/config' do repositório.  É semelhante às seções principais do Git "
-"[remote], exceto que as teclas 'fetch' não aceitam os argumentos globais; "
-"porém eles são manipulados pelas teclas 'branches' e 'tags'.  Como alguns "
-"repositórios SVN são configurados de forma estranha com vários projetos, as "
-"expansões globais são permitidas, como as listadas abaixo:"
+msgstr "O 'git svn' armazena as informações de configuração [svn-remote] no arquivo '$GIT_DIR/config' do repositório.  É semelhante às seções principais do Git [remote], exceto que as teclas 'fetch' não aceitam os argumentos globais; porém eles são manipulados pelas teclas 'branches' e 'tags'.  Como alguns repositórios SVN são configurados de forma estranha com vários projetos, as expansões globais são permitidas, como as listadas abaixo:"
 
 #. type: delimited block -
 #: en/git-svn.txt:1102
@@ -62061,15 +53813,11 @@ msgid ""
 "should be manually entered with a text-editor or using 'git config'.\n"
 msgstr ""
 "Lembre-se que o curinga `*` (asterisco) da referência local\n"
-"(à direita do `:`) *deve* ser o componente mais distante do caminho à "
-"direita;\n"
-"no entanto, o curinga remoto pode estar em qualquer lugar, desde que seja "
-"um\n"
-"componente independente do caminho (cercado por `/` ou `EOL` (um caractere "
-"que indica o final da linha)).   Este\n"
+"(à direita do `:`) *deve* ser o componente mais distante do caminho à direita;\n"
+"no entanto, o curinga remoto pode estar em qualquer lugar, desde que seja um\n"
+"componente independente do caminho (cercado por `/` ou `EOL` (um caractere que indica o final da linha)).   Este\n"
 "tipo de configuração não é criado de forma automática pelo 'init' e\n"
-"deve ser inserido manualmente com um editor de texto ou utilizando o comando "
-"'git config'.\n"
+"deve ser inserido manualmente com um editor de texto ou utilizando o comando 'git config'.\n"
 
 #. type: Plain text
 #: en/git-svn.txt:1112
@@ -62165,12 +53913,7 @@ msgstr "$ git svn branch -d branches/server release-2-3-0\n"
 #: en/git-svn.txt:1155
 #, priority:100
 msgid "Note that git-svn keeps track of the highest revision in which a branch or tag has appeared. If the subset of branches or tags is changed after fetching, then $GIT_DIR/svn/.metadata must be manually edited to remove (or reset) branches-maxRev and/or tags-maxRev as appropriate."
-msgstr ""
-"Observe que o 'git-svn' acompanha a revisão mais alta onde um ramo ou uma "
-"tag tenha aparecido. Caso o subconjunto das ramificações ou das tags seja "
-"alterada após a busca, então `$GIT_DIR/svn/.metadata` deverá ser editado "
-"manualmente para remover (ou redefinir) `branches-maxRev` e/ou `tags-maxRev`"
-", conforme seja apropriado."
+msgstr "Observe que o 'git-svn' acompanha a revisão mais alta onde um ramo ou uma tag tenha aparecido. Caso o subconjunto das ramificações ou das tags seja alterada após a busca, então `$GIT_DIR/svn/.metadata` deverá ser editado manualmente para remover (ou redefinir) `branches-maxRev` e/ou `tags-maxRev`, conforme seja apropriado."
 
 #. type: Labeled list
 #: en/git-svn.txt:1158
@@ -62182,20 +53925,13 @@ msgstr "$GIT_DIR/svn/\\**/.rev_map.*"
 #: en/git-svn.txt:1164
 #, priority:100
 msgid "Mapping between Subversion revision numbers and Git commit names.  In a repository where the noMetadata option is not set, this can be rebuilt from the git-svn-id: lines that are at the end of every commit (see the 'svn.noMetadata' section above for details)."
-msgstr ""
-"Mapeamento entre os números da revisão do Subversion e os nomes dos commits "
-"do Git.  Em um repositório onde a opção `noMetadata` não está definido, isso "
-"pode ser reconstruído a partir do 'git-svn-id': as linhas que estão no final "
-"de cada commit (consulte a seção 'svn.noMetadata' acima para obter detalhes)."
+msgstr "Mapeamento entre os números da revisão do Subversion e os nomes dos commits do Git.  Em um repositório onde a opção `noMetadata` não está definido, isso pode ser reconstruído a partir do 'git-svn-id': as linhas que estão no final de cada commit (consulte a seção 'svn.noMetadata' acima para obter detalhes)."
 
 #. type: Plain text
 #: en/git-svn.txt:1168
 #, priority:100
 msgid "'git svn fetch' and 'git svn rebase' automatically update the rev_map if it is missing or not up to date.  'git svn reset' automatically rewinds it."
-msgstr ""
-"O comando 'git svn fetch' e o 'git svn rebase' atualizam automaticamente o "
-"'rev_map' caso ele esteja ausente ou não tenha sido atualizado.  O comando "
-"'git svn reset' o o retrocede de forma automática."
+msgstr "O comando 'git svn fetch' e o 'git svn rebase' atualizam automaticamente o 'rev_map' caso ele esteja ausente ou não tenha sido atualizado.  O comando 'git svn reset' o o retrocede de forma automática."
 
 #. type: Title =
 #: en/git-switch.txt:2
@@ -62227,31 +53963,19 @@ msgstr ""
 #: en/git-switch.txt:21
 #, priority:100
 msgid "Switch to a specified branch. The working tree and the index are updated to match the branch. All new commits will be added to the tip of this branch."
-msgstr ""
-"Alterna para um ramo específico. A árvore de trabalho e o índice são "
-"atualizados para coincidir com o ramo. Todos os novos commits serão "
-"adicionadas ao cume deste ramo."
+msgstr "Alterna para um ramo específico. A árvore de trabalho e o índice são atualizados para coincidir com o ramo. Todos os novos commits serão adicionadas ao cume deste ramo."
 
 #. type: Plain text
 #: en/git-switch.txt:26
 #, priority:100
 msgid "Optionally a new branch could be created with either `-c`, `-C`, automatically from a remote branch of same name (see `--guess`), or detach the working tree from any branch with `--detach`, along with switching."
-msgstr ""
-"Opcionalmente, um novo ramo pode ser criado com `-c`, `-C`, automaticamente "
-"a partir de um ramo remoto com o mesmo nome (consulte `--guess`), ou "
-"desanexe a árvore de trabalho de qualquer outro ramo com a opção `--detach`, "
-"em conjunto com a alternância."
+msgstr "Opcionalmente, um novo ramo pode ser criado com `-c`, `-C`, automaticamente a partir de um ramo remoto com o mesmo nome (consulte `--guess`), ou desanexe a árvore de trabalho de qualquer outro ramo com a opção `--detach`, em conjunto com a alternância."
 
 #. type: Plain text
 #: en/git-switch.txt:31
 #, priority:100
 msgid "Switching branches does not require a clean index and working tree (i.e. no differences compared to `HEAD`). The operation is aborted however if the operation leads to loss of local changes, unless told otherwise with `--discard-changes` or `--merge`."
-msgstr ""
-"A alternância das ramificações não requer um índice limpo e uma árvore de "
-"trabalho (ou seja, não há diferenças em comparação com o `HEAD`). A operação "
-"é interrompida no entanto caso a operação leve à perda das alterações "
-"locais, a menos que seja dito o contrário com a opção `--discard-changes` ou "
-"`--merge`."
+msgstr "A alternância das ramificações não requer um índice limpo e uma árvore de trabalho (ou seja, não há diferenças em comparação com o `HEAD`). A operação é interrompida no entanto caso a operação leve à perda das alterações locais, a menos que seja dito o contrário com a opção `--discard-changes` ou `--merge`."
 
 #. type: Plain text
 #: en/git-switch.txt:38
@@ -62269,11 +53993,7 @@ msgstr "<novo-ramo>"
 #: en/git-switch.txt:48
 #, priority:100
 msgid "The starting point for the new branch. Specifying a `<start-point>` allows you to create a branch based on some other point in history than where HEAD currently points. (Or, in the case of `--detach`, allows you to inspect and detach from some other point.)"
-msgstr ""
-"O ponto de partida para criar o novo ramo. Definindo um `<ponto-de-partida>` "
-"permite criar um ramo com base em algum outro ponto na história que não seja "
-"o local onde o `HEAD` aponte atualmente. (Ou, no caso da opção `--detach`, "
-"permitir que você inspecione e desanexe de algum outro ponto.)"
+msgstr "O ponto de partida para criar o novo ramo. Definindo um `<ponto-de-partida>` permite criar um ramo com base em algum outro ponto na história que não seja o local onde o `HEAD` aponte atualmente. (Ou, no caso da opção `--detach`, permitir que você inspecione e desanexe de algum outro ponto.)"
 
 #. type: Plain text
 #: en/git-switch.txt:54
@@ -62297,9 +54017,7 @@ msgstr "--create <novo-ramo>"
 #: en/git-switch.txt:64
 #, priority:100
 msgid "Create a new branch named `<new-branch>` starting at `<start-point>` before switching to the branch. This is a convenient shortcut for:"
-msgstr ""
-"Crie um novo ramo chamado `<novo-ramo>` começando em `<ponto-de-partida>` "
-"antes de mudar para o ramo. Este é um atalho conveniente para:"
+msgstr "Crie um novo ramo chamado `<novo-ramo>` começando em `<ponto-de-partida>` antes de mudar para o ramo. Este é um atalho conveniente para:"
 
 #. type: delimited block -
 #: en/git-switch.txt:68
@@ -62327,9 +54045,7 @@ msgstr "--force-create <novo-ramo>"
 #: en/git-switch.txt:75
 #, priority:100
 msgid "Similar to `--create` except that if `<new-branch>` already exists, it will be reset to `<start-point>`. This is a convenient shortcut for:"
-msgstr ""
-"É similar a opção `--create` exceto quando `<novo-ramo>` já exista, ele será "
-"redefinido para o `<ponto-de-partida>`. Este é um atalho conveniente para:"
+msgstr "É similar a opção `--create` exceto quando `<novo-ramo>` já exista, ele será redefinido para o `<ponto-de-partida>`. Este é um atalho conveniente para:"
 
 #. type: delimited block -
 #: en/git-switch.txt:79
@@ -62345,10 +54061,7 @@ msgstr ""
 #: en/git-switch.txt:86
 #, priority:100
 msgid "Switch to a commit for inspection and discardable experiments. See the \"DETACHED HEAD\" section in linkgit:git-checkout[1] for details."
-msgstr ""
-"Alterne para um commit que será inspecionado e poderá ser feito experimentos "
-"descartáveis nele. Consulte a seção \"HEAD DESANEXADO\" no linkgit:git-"
-"checkout[1] para mais detalhes."
+msgstr "Alterne para um commit que será inspecionado e poderá ser feito experimentos descartáveis nele. Consulte a seção \"HEAD DESANEXADO\" no linkgit:git-checkout[1] para mais detalhes."
 
 #. type: delimited block -
 #: en/git-switch.txt:95
@@ -62360,9 +54073,7 @@ msgstr "$ git switch -c <ramo> --track <remoto>/<ramo>\n"
 #: en/git-switch.txt:106
 #, priority:100
 msgid "`--guess` is the default behavior. Use `--no-guess` to disable it."
-msgstr ""
-"`--guess` é o comportamento predefinido. Utilize a opção `--no-guess` para "
-"desativá-lo."
+msgstr "`--guess` é o comportamento predefinido. Utilize a opção `--no-guess` para desativá-lo."
 
 #. type: Plain text
 #: en/git-switch.txt:110
@@ -62380,47 +54091,25 @@ msgstr "--discard-changes"
 #: en/git-switch.txt:117
 #, priority:100
 msgid "Proceed even if the index or the working tree differs from `HEAD`. Both the index and working tree are restored to match the switching target. If `--recurse-submodules` is specified, submodule content is also restored to match the switching target. This is used to throw away local changes."
-msgstr ""
-"Prossiga mesmo que o índice ou a árvore de trabalho seja diferente do `HEAD`"
-". Ambos o índice e a árvore de trabalho são restauradas para coincidir com a "
-"alternância do destino. Caso a opção `--recurse-submodules` seja utilizada, "
-"o conteúdo do submódulo também será restaurado para coincidir a alternância "
-"do destino. Isso é utilizado para descartar as alterações locais."
+msgstr "Prossiga mesmo que o índice ou a árvore de trabalho seja diferente do `HEAD`. Ambos o índice e a árvore de trabalho são restauradas para coincidir com a alternância do destino. Caso a opção `--recurse-submodules` seja utilizada, o conteúdo do submódulo também será restaurado para coincidir a alternância do destino. Isso é utilizado para descartar as alterações locais."
 
 #. type: Plain text
 #: en/git-switch.txt:127
 #, priority:100
 msgid "If you have local modifications to one or more files that are different between the current branch and the branch to which you are switching, the command refuses to switch branches in order to preserve your modifications in context.  However, with this option, a three-way merge between the current branch, your working tree contents, and the new branch is done, and you will be on the new branch."
-msgstr ""
-"Caso tenha alterações locais em um ou mais arquivos que sejam diferentes "
-"entre o ramo atual e o ramo para onde você está alternando, o comando se "
-"recusará a alternar as ramificações visando preservar as suas alterações "
-"dada a circunstância.  Contudo, com esta opção, é feita uma mesclagem de "
-"três vias entre o ramo atual, o conteúdo da árvore de trabalho e o novo "
-"ramo, fazendo com que você esteja neste novo ramo."
+msgstr "Caso tenha alterações locais em um ou mais arquivos que sejam diferentes entre o ramo atual e o ramo para onde você está alternando, o comando se recusará a alternar as ramificações visando preservar as suas alterações dada a circunstância.  Contudo, com esta opção, é feita uma mesclagem de três vias entre o ramo atual, o conteúdo da árvore de trabalho e o novo ramo, fazendo com que você esteja neste novo ramo."
 
 #. type: Plain text
 #: en/git-switch.txt:156
 #, priority:100
 msgid "When creating a new branch, set up \"upstream\" configuration.  `-c` is implied. See `--track` in linkgit:git-branch[1] for details."
-msgstr ""
-"Ao criar uma nova ramificação, defina a configuração \"upstream\".  A opção "
-"`-c` está implícita. Para mais detalhes, consulte `--track` no linkgit:git-"
-"branch[1]."
+msgstr "Ao criar uma nova ramificação, defina a configuração \"upstream\".  A opção `-c` está implícita. Para mais detalhes, consulte `--track` no linkgit:git-branch[1]."
 
 #. type: Plain text
 #: en/git-switch.txt:166
 #, priority:100
 msgid "If no `-c` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the \"*\".  This would tell us to use `hack` as the local branch when branching off of `origin/hack` (or `remotes/origin/hack`, or even `refs/remotes/origin/hack`).  If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted.  You can explicitly give a name with `-c` in such a case."
-msgstr ""
-"Caso nenhuma opção `-c` seja utilizada, o nome do novo ramo será derivado do "
-"ramo monitorado remotamente, observando a parte local da \"refspec\" "
-"configurada para o ramo remoto correspondente e removendo a parte inicial "
-"para o \"*\" em seguida.  Isso nos diria para usar um `hack` como um ramo "
-"local ao se ramificar do `origin/hack` (ou `remotes/origin/hack` ou até  "
-"mesmo do `refs/remotes/origin/hack`).  Caso o nome informado não tenha barra "
-"ou se a dedução acima resultar em um nome vazio, a dedução será abortada.  "
-"Em tais casos, você pode explicitamente dar um nome com a opção `-c`."
+msgstr "Caso nenhuma opção `-c` seja utilizada, o nome do novo ramo será derivado do ramo monitorado remotamente, observando a parte local da \"refspec\" configurada para o ramo remoto correspondente e removendo a parte inicial para o \"*\" em seguida.  Isso nos diria para usar um `hack` como um ramo local ao se ramificar do `origin/hack` (ou `remotes/origin/hack` ou até  mesmo do `refs/remotes/origin/hack`).  Caso o nome informado não tenha barra ou se a dedução acima resultar em um nome vazio, a dedução será abortada.  Em tais casos, você pode explicitamente dar um nome com a opção `-c`."
 
 #. type: Labeled list
 #: en/git-switch.txt:171
@@ -62432,30 +54121,19 @@ msgstr "--orphan <novo-ramo>"
 #: en/git-switch.txt:174
 #, priority:100
 msgid "Create a new 'orphan' branch, named `<new-branch>`. All tracked files are removed."
-msgstr ""
-"Crie um novo ramo 'órfão', chamado `<novo-ramo>`. Todos os arquivos "
-"monitorados são removidos."
+msgstr "Crie um novo ramo 'órfão', chamado `<novo-ramo>`. Todos os arquivos monitorados são removidos."
 
 #. type: Plain text
 #: en/git-switch.txt:180
 #, priority:100
 msgid "`git switch` refuses when the wanted ref is already checked out by another worktree. This option makes it check the ref out anyway. In other words, the ref can be held by more than one worktree."
-msgstr ""
-"O comando `git switch` se recusa quando a \"ref\" desejada já está foi "
-"averiguada por uma outra árvore de trabalho. Esta opção faz com que ele "
-"averigue a \"ref\" mesmo assim. Em outras palavras, a \"ref\" pode ser "
-"mantida por mais de uma árvore de trabalho."
+msgstr "O comando `git switch` se recusa quando a \"ref\" desejada já está foi averiguada por uma outra árvore de trabalho. Esta opção faz com que ele averigue a \"ref\" mesmo assim. Em outras palavras, a \"ref\" pode ser mantida por mais de uma árvore de trabalho."
 
 #. type: Plain text
 #: en/git-switch.txt:189
 #, priority:100
 msgid "Using `--recurse-submodules` will update the content of all active submodules according to the commit recorded in the superproject. If nothing (or `--no-recurse-submodules`) is used, submodules working trees will not be updated. Just like linkgit:git-submodule[1], this will detach `HEAD` of the submodules."
-msgstr ""
-"O uso da opção `--recurse-submodules` atualizará o conteúdo de todos os "
-"submódulos ativos de acordo com commit gravado no superprojeto. Caso nada ("
-"ou a opção `--no-recurse-submodules`) seja utilizado, os submódulos que "
-"trabalham nas árvores não serão atualizados. Assim como linkgit:git-"
-"submodule[1], isso faz com que `HEAD` seja desanexando dos submódulos."
+msgstr "O uso da opção `--recurse-submodules` atualizará o conteúdo de todos os submódulos ativos de acordo com commit gravado no superprojeto. Caso nada (ou a opção `--no-recurse-submodules`) seja utilizado, os submódulos que trabalham nas árvores não serão atualizados. Assim como linkgit:git-submodule[1], isso faz com que `HEAD` seja desanexando dos submódulos."
 
 #. type: Plain text
 #: en/git-switch.txt:194
@@ -62517,9 +54195,7 @@ msgstr "$ git switch -\n"
 #: en/git-switch.txt:236
 #, priority:100
 msgid "You can grow a new branch from any commit. For example, switch to \"HEAD~3\" and create branch \"fixup\":"
-msgstr ""
-"Você pode aumentar um novo ramo a partir de qualquer commit. Por exemplo, "
-"mude para \"HEAD~3\" e crie o ramo \"fixup\":"
+msgstr "Você pode aumentar um novo ramo a partir de qualquer commit. Por exemplo, mude para \"HEAD~3\" e crie o ramo \"fixup\":"
 
 #. type: delimited block -
 #: en/git-switch.txt:240
@@ -62546,17 +54222,14 @@ msgid ""
 "Switched to a new branch 'new-topic'\n"
 msgstr ""
 "$ git switch new-topic\n"
-"O ramo 'new-topic' foi configurada para monitorar o ramo remoto 'new-topic' "
-"da 'origin'\n"
+"O ramo 'new-topic' foi configurada para monitorar o ramo remoto 'new-topic' da 'origin'\n"
 "Foi alternado para um novo ramo 'new-topic'\n"
 
 #. type: Plain text
 #: en/git-switch.txt:253
 #, priority:100
 msgid "To check out commit `HEAD~3` for temporary inspection or experiment without creating a new branch:"
-msgstr ""
-"Para averiguar o commit `HEAD~3` por inspeções temporárias ou experimentos "
-"sem criar um novo ramo:"
+msgstr "Para averiguar o commit `HEAD~3` por inspeções temporárias ou experimentos sem criar um novo ramo:"
 
 #. type: delimited block -
 #: en/git-switch.txt:257
@@ -62572,9 +54245,7 @@ msgstr ""
 #: en/git-switch.txt:261
 #, priority:100
 msgid "If it turns out whatever you have done is worth keeping, you can always create a new name for it (without switching away):"
-msgstr ""
-"Se acontecer de valer a pena manter o que você fez, é possível criar um novo "
-"nome para ele (sem precisar alternar):"
+msgstr "Se acontecer de valer a pena manter o que você fez, é possível criar um novo nome para ele (sem precisar alternar):"
 
 #. type: delimited block -
 #: en/git-switch.txt:264
@@ -62616,36 +54287,25 @@ msgstr ""
 #: en/git-symbolic-ref.txt:21
 #, priority:100
 msgid "Given one argument, reads which branch head the given symbolic ref refers to and outputs its path, relative to the `.git/` directory.  Typically you would give `HEAD` as the <name> argument to see which branch your working tree is on."
-msgstr ""
-"Ao informar uma opção, lê em qual cabeçalho do ramo a referência simbólica "
-"informada se refere e gera o seu caminho em relação ao diretório `.git/`.  "
-"Normalmente você utilizaria o `HEAD` como uma opção `<nome>` para ver em "
-"qual ramo a sua árvore de trabalho está."
+msgstr "Ao informar uma opção, lê em qual cabeçalho do ramo a referência simbólica informada se refere e gera o seu caminho em relação ao diretório `.git/`.  Normalmente você utilizaria o `HEAD` como uma opção `<nome>` para ver em qual ramo a sua árvore de trabalho está."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:24
 #, priority:100
 msgid "Given two arguments, creates or updates a symbolic ref <name> to point at the given branch <ref>."
-msgstr ""
-"Quando foi dois argumentos fortem utilizados, cria ou atualiza uma "
-"referência simbólica <nome> para apontar para o ramo <ref> informado."
+msgstr "Quando foi dois argumentos fortem utilizados, cria ou atualiza uma referência simbólica <nome> para apontar para o ramo <ref> informado."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:27
 #, priority:100
 msgid "Given `--delete` and an additional argument, deletes the given symbolic ref."
-msgstr ""
-"Ao utilizar `--delete` e um argumento adicional, exclui a referência "
-"simbólica informada."
+msgstr "Ao utilizar `--delete` e um argumento adicional, exclui a referência simbólica informada."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:31
 #, priority:100
 msgid "A symbolic ref is a regular file that stores a string that begins with `ref: refs/`.  For example, your `.git/HEAD` is a regular file whose contents is `ref: refs/heads/master`."
-msgstr ""
-"Uma 'ref' simbólica é um arquivo regular que armazena um texto 'string' que "
-"começa com `ref: refs/`.  Como por exemplo, o seu `.git/HEAD` é um arquivo "
-"regular cujo conteúdo seja `ref: refs/heads/master`."
+msgstr "Uma 'ref' simbólica é um arquivo regular que armazena um texto 'string' que começa com `ref: refs/`.  Como por exemplo, o seu `.git/HEAD` é um arquivo regular cujo conteúdo seja `ref: refs/heads/master`."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:38
@@ -62657,47 +54317,31 @@ msgstr "Exclua o <nome> da \"ref\" simbólica."
 #: en/git-symbolic-ref.txt:44
 #, priority:100
 msgid "Do not issue an error message if the <name> is not a symbolic ref but a detached HEAD; instead exit with non-zero status silently."
-msgstr ""
-"Não emita uma mensagem de erro caso o <nome> não seja uma referência "
-"simbólica, e sim um `HEAD` desanexado; em vez disso, saia com uma condição "
-"diferente de zero de forma silenciosa."
+msgstr "Não emita uma mensagem de erro caso o <nome> não seja uma referência simbólica, e sim um `HEAD` desanexado; em vez disso, saia com uma condição diferente de zero de forma silenciosa."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:48
 #, priority:100
 msgid "When showing the value of <name> as a symbolic ref, try to shorten the value, e.g. from `refs/heads/master` to `master`."
-msgstr ""
-"Ao exibir o valor de um <nome> como uma \"ref\" simbólica, tente encurtar o "
-"valor, como, por exemplo, de `refs/heads/master` para `master`."
+msgstr "Ao exibir o valor de um <nome> como uma \"ref\" simbólica, tente encurtar o valor, como, por exemplo, de `refs/heads/master` para `master`."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:52
 #, priority:100
 msgid "Update the reflog for <name> with <reason>.  This is valid only when creating or updating a symbolic ref."
-msgstr ""
-"Atualiza o \"reflog\" para um <nome> com um <motivo>.  É válido apenas "
-"durante a criação ou a atualização de uma \"ref\" simbólica."
+msgstr "Atualiza o \"reflog\" para um <nome> com um <motivo>.  É válido apenas durante a criação ou a atualização de uma \"ref\" simbólica."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:62
 #, priority:100
 msgid "In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/master`.  When we wanted to switch to another branch, we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which branch we are on, we did `readlink .git/HEAD`.  But symbolic links are not entirely portable, so they are now deprecated and symbolic refs (as described above) are used by default."
-msgstr ""
-"No passado, `.git/HEAD` era um link simbólico apontando para `refs/heads/"
-"master`.  Quando queríamos mudar para um outro ramo, fizemos `ln -sf refs/"
-"heads/newbranch .git/HEAD`, e quando queríamos descobrir em qual ramo "
-"estávamos, fazíamos `readlink .git/HEAD`.  Como os links simbólicos não são "
-"totalmente portáteis, eles agora estão obsoletos e as referências simbólicas "
-"(conforme descrito acima) são utilizada de forma predefinida."
+msgstr "No passado, `.git/HEAD` era um link simbólico apontando para `refs/heads/master`.  Quando queríamos mudar para um outro ramo, fizemos `ln -sf refs/heads/newbranch .git/HEAD`, e quando queríamos descobrir em qual ramo estávamos, fazíamos `readlink .git/HEAD`.  Como os links simbólicos não são totalmente portáteis, eles agora estão obsoletos e as referências simbólicas (conforme descrito acima) são utilizada de forma predefinida."
 
 #. type: Plain text
 #: en/git-symbolic-ref.txt:66
 #, priority:100
 msgid "'git symbolic-ref' will exit with status 0 if the contents of the symbolic ref were printed correctly, with status 1 if the requested name is not a symbolic ref, or 128 if another error occurs."
-msgstr ""
-"O comando 'git symbolic-ref' encerrará com a condição 0 caso o conteúdo da "
-"ref simbólica tenha sido impresso corretamente, com a condição 1 caso o nome "
-"solicitado não seja uma ref simbólica ou 128 caso ocorra um outro erro."
+msgstr "O comando 'git symbolic-ref' encerrará com a condição 0 caso o conteúdo da ref simbólica tenha sido impresso corretamente, com a condição 1 caso o nome solicitado não seja uma ref simbólica ou 128 caso ocorra um outro erro."
 
 #. type: Title =
 #: en/git-tag.txt:2
@@ -62709,8 +54353,7 @@ msgstr "git-tag(1)"
 #: en/git-tag.txt:7
 #, priority:240
 msgid "git-tag - Create, list, delete or verify a tag object signed with GPG"
-msgstr ""
-"git-tag - Crie, liste, exclua or verifique um objeto tag assinado com GPG"
+msgstr "git-tag - Crie, liste, exclua or verifique um objeto tag assinado com GPG"
 
 #. type: Plain text
 #: en/git-tag.txt:20
@@ -62744,66 +54387,43 @@ msgstr "Adicione uma tag de referência em `refs/tags/`, a menos que `-d/-l/-v`
 #: en/git-tag.txt:28
 #, priority:240
 msgid "Unless `-f` is given, the named tag must not yet exist."
-msgstr ""
-"A menos que `-f` seja utilizado, a tag informada não deve existir ainda."
+msgstr "A menos que `-f` seja utilizado, a tag informada não deve existir ainda."
 
 #. type: Plain text
 #: en/git-tag.txt:33
 #, priority:240
 msgid "If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' object, and requires a tag message.  Unless `-m <msg>` or `-F <file>` is given, an editor is started for the user to type in the tag message."
-msgstr ""
-"Caso um dos comandos `-a`, `-s` ou `-u <keyid>` seja informado, o comando "
-"criará um objeto 'tag' e exigirá uma mensagem para a tag.  A menos que as "
-"opções `-m <msg>` ou `-F <arquivo>` sejam utilizadas, um editor é iniciado "
-"para que o usuário digite a mensagem da tag."
+msgstr "Caso um dos comandos `-a`, `-s` ou `-u <keyid>` seja informado, o comando criará um objeto 'tag' e exigirá uma mensagem para a tag.  A menos que as opções `-m <msg>` ou `-F <arquivo>` sejam utilizadas, um editor é iniciado para que o usuário digite a mensagem da tag."
 
 #. type: Plain text
 #: en/git-tag.txt:36
 #, priority:240
 msgid "If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <keyid>` are absent, `-a` is implied."
-msgstr ""
-"Caso a opção `-m <msg>` ou `-F <arquivo>` seja utilizado e a opção `-a`, `-s`"
-" e `-u <keyid>` estiverem ausentes, a opção `-a` estará implícita."
+msgstr "Caso a opção `-m <msg>` ou `-F <arquivo>` seja utilizado e a opção `-a`, `-s` e `-u <keyid>` estiverem ausentes, a opção `-a` estará implícita."
 
 #. type: Plain text
 #: en/git-tag.txt:39
 #, priority:240
 msgid "Otherwise, a tag reference that points directly at the given object (i.e., a lightweight tag) is created."
-msgstr ""
-"Caso contrário, é criada uma tag de referência que aponte diretamente para o "
-"objeto informado (ou seja, uma tag leve)."
+msgstr "Caso contrário, é criada uma tag de referência que aponte diretamente para o objeto informado (ou seja, uma tag leve)."
 
 #. type: Plain text
 #: en/git-tag.txt:45
 #, priority:240
 msgid "A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used.  When `-u <keyid>` is not used, the committer identity for the current user is used to find the GnuPG key for signing. \tThe configuration variable `gpg.program` is used to specify custom GnuPG binary."
-msgstr ""
-"Um objeto de etiqueta assinada pelo GnuPG será criada quando `-s` ou `-u "
-"<keyid>` for utilizado.  Quando `-u <keyid>` não é utilizado, a identidade "
-"do usuário atual é utilizada para encontrar a assinatura da chave GnuPG. \tA "
-"variável de configuração `gpg.program` é usada para definir o binário "
-"personalizado do GnuPG."
+msgstr "Um objeto de etiqueta assinada pelo GnuPG será criada quando `-s` ou `-u <keyid>` for utilizado.  Quando `-u <keyid>` não é utilizado, a identidade do usuário atual é utilizada para encontrar a assinatura da chave GnuPG. \tA variável de configuração `gpg.program` é usada para definir o binário personalizado do GnuPG."
 
 #. type: Plain text
 #: en/git-tag.txt:51
 #, priority:240
 msgid "Tag objects (created with `-a`, `-s`, or `-u`) are called \"annotated\" tags; they contain a creation date, the tagger name and e-mail, a tagging message, and an optional GnuPG signature. Whereas a \"lightweight\" tag is simply a name for an object (usually a commit object)."
-msgstr ""
-"Os objetos tag (criados com `-a`, `-s` ou `-u`) são chamados de tags "
-"\"anotadas\"; eles contêm uma data de criação, o nome e o e-mail do "
-"marcador, uma mensagem de marcação e uma assinatura opcional do GnuPG. "
-"Enquanto uma tag \"leve\" é simplesmente um nome para um objeto (geralmente "
-"um objeto commit)."
+msgstr "Os objetos tag (criados com `-a`, `-s` ou `-u`) são chamados de tags \"anotadas\"; eles contêm uma data de criação, o nome e o e-mail do marcador, uma mensagem de marcação e uma assinatura opcional do GnuPG. Enquanto uma tag \"leve\" é simplesmente um nome para um objeto (geralmente um objeto commit)."
 
 #. type: Plain text
 #: en/git-tag.txt:56
 #, priority:240
 msgid "Annotated tags are meant for release while lightweight tags are meant for private or temporary object labels. For this reason, some git commands for naming objects (like `git describe`) will ignore lightweight tags by default."
-msgstr ""
-"As tags anotadas destinam-se ao lançamento, enquanto as tags leves (light) "
-"destinam-se aos rótulos dos objetos particulares ou temporários. Por este "
-"motivo que é predefinido que alguns comandos git para nomear os objetos ("
-"como `git description`) ignorem essas tags leves."
+msgstr "As tags anotadas destinam-se ao lançamento, enquanto as tags leves (light) destinam-se aos rótulos dos objetos particulares ou temporários. Por este motivo que é predefinido que alguns comandos git para nomear os objetos (como `git description`) ignorem essas tags leves."
 
 #. type: Plain text
 #: en/git-tag.txt:63
@@ -62821,11 +54441,7 @@ msgstr "--sign"
 #: en/git-tag.txt:70
 #, priority:240
 msgid "Make a GPG-signed tag, using the default e-mail address's key.  The default behavior of tag GPG-signing is controlled by `tag.gpgSign` configuration variable if it exists, or disabled otherwise.  See linkgit:git-config[1]."
-msgstr ""
-"Faça uma etiqueta assinada por GPG utilizando a chave predefinida do "
-"endereço de e-mail.  O comportamento predefinido da assinatura da tag GPG é "
-"controlado pela variável de configuração `tag.gpgSign`, se existir, caso "
-"contrário é desativada.  Consulte linkgit:git-config[1]."
+msgstr "Faça uma etiqueta assinada por GPG utilizando a chave predefinida do endereço de e-mail.  O comportamento predefinido da assinatura da tag GPG é controlado pela variável de configuração `tag.gpgSign`, se existir, caso contrário é desativada.  Consulte linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git-tag.txt:71
@@ -62837,9 +54453,7 @@ msgstr "--no-sign"
 #: en/git-tag.txt:74
 #, priority:240
 msgid "Override `tag.gpgSign` configuration variable that is set to force each and every tag to be signed."
-msgstr ""
-"Substitua a variável de configuração `tag.gpgSign` que está configurada para "
-"impor a obrigatoriedade da assinatura de cada tag."
+msgstr "Substitua a variável de configuração `tag.gpgSign` que está configurada para impor a obrigatoriedade da assinatura de cada tag."
 
 #. type: Labeled list
 #: en/git-tag.txt:75
@@ -62893,28 +54507,19 @@ msgstr "O <num> determina a quantidade das linhas de anotação, caso haja, são
 #: en/git-tag.txt:98
 #, priority:240
 msgid "The default is not to print any annotation lines.  If no number is given to `-n`, only the first line is printed.  If the tag is not annotated, the commit message is displayed instead."
-msgstr ""
-"A predefinição é não imprimir nenhuma linha de anotação.  Caso nenhum número "
-"for atribuído para  `-n ', apenas a primeira linha será impressa.  Caso a "
-"tag não seja anotada, a mensagem do commit será exibido."
+msgstr "A predefinição é não imprimir nenhuma linha de anotação.  Caso nenhum número for atribuído para  `-n ', apenas a primeira linha será impressa.  Caso a tag não seja anotada, a mensagem do commit será exibido."
 
 #. type: Plain text
 #: en/git-tag.txt:103
 #, ignore-ellipsis, priority:240
 msgid "List tags. With optional `<pattern>...`, e.g. `git tag --list 'v-*'`, list only the tags that match the pattern(s)."
-msgstr ""
-"Listar as tags. Com `<padrão>...`, exemplo, `git tag --list 'v-*'` liste "
-"apenas as tags que coincidam ao(s) padrões."
+msgstr "Listar as tags. Com `<padrão>...`, exemplo, `git tag --list 'v-*'` liste apenas as tags que coincidam ao(s) padrões."
 
 #. type: Plain text
 #: en/git-tag.txt:107
 #, priority:240
 msgid "Running \"git tag\" without arguments also lists all tags. The pattern is a shell wildcard (i.e., matched using fnmatch(3)). Multiple patterns may be given; if any of them matches, the tag is shown."
-msgstr ""
-"Executar \"tag git\" sem argumentos também lista todas as tags. O padrão é "
-"um curinga do shell (exemplo, quando coincidir ao usar fnmatch(3)). Padrões "
-"múltiplos podem ser informados; caso haja coincidência entre alguns deles, a "
-"tag será exibida."
+msgstr "Executar \"tag git\" sem argumentos também lista todas as tags. O padrão é um curinga do shell (exemplo, quando coincidir ao usar fnmatch(3)). Padrões múltiplos podem ser informados; caso haja coincidência entre alguns deles, a tag será exibida."
 
 #. type: Plain text
 #: en/git-tag.txt:111
@@ -62926,17 +54531,7 @@ msgstr "Esta opção é fornecida de forma implícita caso qualquer outra lista
 #: en/git-tag.txt:124
 #, priority:240
 msgid "Sort based on the key given.  Prefix `-` to sort in descending order of the value. You may use the --sort=<key> option multiple times, in which case the last key becomes the primary key. Also supports \"version:refname\" or \"v:refname\" (tag names are treated as versions). The \"version:refname\" sort order can also be affected by the \"versionsort.suffix\" configuration variable.  The keys supported are the same as those in `git for-each-ref`.  Sort order defaults to the value configured for the `tag.sort` variable if it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
-msgstr ""
-"Classifique com base na chave informada.  O prefixo `-` é utilizado para "
-"classificar em ordem decrescente. Você pode utilizar a opção `--sort=<chave>`"
-" mais de uma vez; nesse caso, a última chave se torna a chave primária. "
-"Também é compatível com `versão:refname` ou `v:refname` (nomes das tags são "
-"tratados como versões). A ordem de classificação `versão:refname` também "
-"pode ser afetada pela variável de configuração `versionsort.sufix`.  As "
-"chaves compatíveis são as mesmas que as do `git for-each-ref`.  A "
-"classificação da ordem retorna para a predefinição do valor configurado pela "
-"variável `tag.sort` caso exista ou então pela ordem lexicográfica. Consulte "
-"linkgit:git-config[1]."
+msgstr "Classifique com base na chave informada.  O prefixo `-` é utilizado para classificar em ordem decrescente. Você pode utilizar a opção `--sort=<chave>` mais de uma vez; nesse caso, a última chave se torna a chave primária. Também é compatível com `versão:refname` ou `v:refname` (nomes das tags são tratados como versões). A ordem de classificação `versão:refname` também pode ser afetada pela variável de configuração `versionsort.sufix`.  As chaves compatíveis são as mesmas que as do `git for-each-ref`.  A classificação da ordem retorna para a predefinição do valor configurado pela variável `tag.sort` caso exista ou então pela ordem lexicográfica. Consulte linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git-tag.txt:133
@@ -62972,25 +54567,19 @@ msgstr "Liste apenas as tags que não contenham nenhum commit em específico (`H
 #: en/git-tag.txt:153
 #, priority:240
 msgid "Only list tags whose commits are reachable from the specified commit (`HEAD` if not specified), incompatible with `--no-merged`."
-msgstr ""
-"Liste apenas as tags cujos commits sejam acessíveis de um determinado commit "
-"(`HEAD`caso não esteja definido), é incompatível com `--no-merged`."
+msgstr "Liste apenas as tags cujos commits sejam acessíveis de um determinado commit (`HEAD`caso não esteja definido), é incompatível com `--no-merged`."
 
 #. type: Plain text
 #: en/git-tag.txt:157
 #, priority:240
 msgid "Only list tags whose commits are not reachable from the specified commit (`HEAD` if not specified), incompatible with `--merged`."
-msgstr ""
-"Liste apenas as tags cujos commits não sejam acessíveis em um commit em "
-"específico (`HEAD`caso não esteja definido), é incompatível com `--merged`."
+msgstr "Liste apenas as tags cujos commits não sejam acessíveis em um commit em específico (`HEAD`caso não esteja definido), é incompatível com `--merged`."
 
 #. type: Plain text
 #: en/git-tag.txt:161
 #, priority:240
 msgid "Only list tags of the given object (HEAD if not specified). Implies `--list`."
-msgstr ""
-"Liste apenas as tags dos objetos informados (`HEAD`caso não esteja definido)"
-". Implica no uso da opção `--list`."
+msgstr "Liste apenas as tags dos objetos informados (`HEAD`caso não esteja definido). Implica no uso da opção `--list`."
 
 #. type: Plain text
 #: en/git-tag.txt:169
@@ -63002,10 +54591,7 @@ msgstr "Utilize a mensagem da tag informada (em vez de solicitar).  Caso múltip
 #: en/git-tag.txt:176
 #, priority:240
 msgid "Take the tag message from the given file.  Use '-' to read the message from the standard input.  Implies `-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
-msgstr ""
-"Assume a mensagem da tag de um determinado arquivo.  Utilize '-' para ler a "
-"mensagem da entrada padrão. Implica na utilização da opção `-a` caso nenhum "
-"`-a`, `-s` ou `-u <keyid>` seja utilizado."
+msgstr "Assume a mensagem da tag de um determinado arquivo.  Utilize '-' para ler a mensagem da entrada padrão. Implica na utilização da opção `-a` caso nenhum `-a`, `-s` ou `-u <keyid>` seja utilizado."
 
 #. type: Plain text
 #: en/git-tag.txt:182
@@ -63017,12 +54603,7 @@ msgstr "A mensagem tirada do arquivo com `-F` e a linha de comando com `-m` norm
 #: en/git-tag.txt:189
 #, priority:240
 msgid "This option sets how the tag message is cleaned up.  The '<mode>' can be one of 'verbatim', 'whitespace' and 'strip'.  The 'strip' mode is default. The 'verbatim' mode does not change message at all, 'whitespace' removes just leading/trailing whitespace lines and 'strip' removes both whitespace and commentary."
-msgstr ""
-"Esta opção define como a tag da mensagem é limpa.  O '<modo>' pode ser entre "
-"'verbatim', 'whitespace' e 'strip'.  O modo predefinido é 'strip'. O modo "
-"'verbatim' não altera a mensagem de forma alguma, 'whitespace' remove apenas "
-"as linhas de espaço iniciais/finais e 'strip' remove o espaço junto com os "
-"comentários."
+msgstr "Esta opção define como a tag da mensagem é limpa.  O '<modo>' pode ser entre 'verbatim', 'whitespace' e 'strip'.  O modo predefinido é 'strip'. O modo 'verbatim' não altera a mensagem de forma alguma, 'whitespace' remove apenas as linhas de espaço iniciais/finais e 'strip' remove o espaço junto com os comentários."
 
 #. type: Plain text
 #: en/git-tag.txt:196
@@ -63034,11 +54615,7 @@ msgstr "Cria um \"reflog\" para a tag. Para ativar globalmente, consulte `core.l
 #: en/git-tag.txt:202
 #, priority:240
 msgid "A string that interpolates `%(fieldname)` from a tag ref being shown and the object it points at.  The format is the same as that of linkgit:git-for-each-ref[1].  When unspecified, defaults to `%(refname:strip=2)`."
-msgstr ""
-"Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma "
-"referência sendo exibida e o objeto para o qual aponta.  O formato é o mesmo "
-"do linkgit:git-for-each-ref[1].  Quando não for definido, a predefinição "
-"retorna para `%(refname:strip=2)`."
+msgstr "Uma cadeia de caracteres que interpola `%(fieldname)` vindo de uma referência sendo exibida e o objeto para o qual aponta.  O formato é o mesmo do linkgit:git-for-each-ref[1].  Quando não for definido, a predefinição retorna para `%(refname:strip=2)`."
 
 #. type: Labeled list
 #: en/git-tag.txt:203
@@ -63050,11 +54627,7 @@ msgstr "<nome-da-tag>"
 #: en/git-tag.txt:208
 #, priority:240
 msgid "The name of the tag to create, delete, or describe.  The new tag name must pass all checks defined by linkgit:git-check-ref-format[1].  Some of these checks may restrict the characters allowed in a tag name."
-msgstr ""
-"O nome da tag para criar, excluir ou descrever.  O novo nome da tag que deve "
-"passar em todas as verificações definidas pelo linkgit:git-check-ref-"
-"format[1].  Algumas destas verificações podem limitar os caracteres "
-"permitidos em um nome de uma tag."
+msgstr "O nome da tag para criar, excluir ou descrever.  O novo nome da tag que deve passar em todas as verificações definidas pelo linkgit:git-check-ref-format[1].  Algumas destas verificações podem limitar os caracteres permitidos em um nome de uma tag."
 
 #. type: Labeled list
 #: en/git-tag.txt:209 en/git.txt:348
@@ -63066,20 +54639,13 @@ msgstr "<commit>"
 #: en/git-tag.txt:213
 #, priority:240
 msgid "The object that the new tag will refer to, usually a commit.  Defaults to HEAD."
-msgstr ""
-"O objeto que a nova tag terá referência, geralmente um commit.  A "
-"predefinição retorna para `HEAD`."
+msgstr "O objeto que a nova tag terá referência, geralmente um commit.  A predefinição retorna para `HEAD`."
 
 #. type: Plain text
 #: en/git-tag.txt:220
 #, priority:240
 msgid "By default, 'git tag' in sign-with-default mode (-s) will use your committer identity (of the form `Your Name <your@email.address>`) to find a key.  If you want to use a different default key, you can specify it in the repository configuration as follows:"
-msgstr ""
-"É predefinido que 'tag git' no modo de assinatura com a predefinição (-s) "
-"utilizará a identidade de quem fez o commit (no formato `Seu Nome <seu@end."
-"email>`) para encontrar uma chave.  Caso queira utilizar uma chave diferente "
-"da predefinida, especifique-a na configuração do repositório da seguinte "
-"maneira:"
+msgstr "É predefinido que 'tag git' no modo de assinatura com a predefinição (-s) utilizará a identidade de quem fez o commit (no formato `Seu Nome <seu@end.email>`) para encontrar uma chave.  Caso queira utilizar uma chave diferente da predefinida, especifique-a na configuração do repositório da seguinte maneira:"
 
 #. type: delimited block -
 #: en/git-tag.txt:224
@@ -63107,66 +54673,43 @@ msgstr "Sobre renomeação de tag"
 #: en/git-tag.txt:238
 #, priority:240
 msgid "What should you do when you tag a wrong commit and you would want to re-tag?"
-msgstr ""
-"O que você deve fazer quando marcar um commit errado e quiser marca-lo "
-"novamente?"
+msgstr "O que você deve fazer quando marcar um commit errado e quiser marca-lo novamente?"
 
 #. type: Plain text
 #: en/git-tag.txt:241
 #, priority:240
 msgid "If you never pushed anything out, just re-tag it. Use \"-f\" to replace the old one. And you're done."
-msgstr ""
-"Caso nunca tenha impulsionado nada, basta remarcá-lo. Utilize \"-f\" para "
-"substituir o antigo. E pronto."
+msgstr "Caso nunca tenha impulsionado nada, basta remarcá-lo. Utilize \"-f\" para substituir o antigo. E pronto."
 
 #. type: Plain text
 #: en/git-tag.txt:245
 #, priority:240
 msgid "But if you have pushed things out (or others could just read your repository directly), then others will have already seen the old tag. In that case you can do one of two things:"
-msgstr ""
-"Porém caso você impulsione as coisas para fora (ou as outras pessoas apenas "
-"puderam ler o seu repositório diretamente), as outras pessoas já viram a tag "
-"antiga. Nesse caso, é possível fazer uma de duas coisas:"
+msgstr "Porém caso você impulsione as coisas para fora (ou as outras pessoas apenas puderam ler o seu repositório diretamente), as outras pessoas já viram a tag antiga. Nesse caso, é possível fazer uma de duas coisas:"
 
 #. type: Plain text
 #: en/git-tag.txt:252
 #, priority:240
 msgid "The sane thing.  Just admit you screwed up, and use a different name. Others have already seen one tag-name, and if you keep the same name, you may be in the situation that two people both have \"version X\", but they actually have 'different' \"X\"'s.  So just call it \"X.1\" and be done with it."
-msgstr ""
-"A coisa sã.  Apenas admita que você estragou tudo e use um nome diferente. "
-"Outros já viram um nome da tag e se você mantiver o mesmo nome, pode estar "
-"na situação onde as duas pessoas têm a \"versão X\", porém na verdade têm \"X"
-"\" diferentes.  Então, basta chamá-lo de \"X.1\" e acabar logo com isso."
+msgstr "A coisa sã.  Apenas admita que você estragou tudo e use um nome diferente. Outros já viram um nome da tag e se você mantiver o mesmo nome, pode estar na situação onde as duas pessoas têm a \"versão X\", porém na verdade têm \"X\" diferentes.  Então, basta chamá-lo de \"X.1\" e acabar logo com isso."
 
 #. type: Plain text
 #: en/git-tag.txt:257
 #, priority:240
 msgid "The insane thing.  You really want to call the new version \"X\" too, 'even though' others have already seen the old one. So just use 'git tag -f' again, as if you hadn't already published the old one."
-msgstr ""
-"A coisa insana.  Você também quer chamar a nova versão de \"X\", mesmo que "
-"as outras pessoas já tenham visto a antiga. Portanto, basta usar 'git tag -"
-"f' novamente, como se você ainda não tivesse publicado o antigo."
+msgstr "A coisa insana.  Você também quer chamar a nova versão de \"X\", mesmo que as outras pessoas já tenham visto a antiga. Portanto, basta usar 'git tag -f' novamente, como se você ainda não tivesse publicado o antigo."
 
 #. type: Plain text
 #: en/git-tag.txt:262
 #, priority:240
 msgid "However, Git does *not* (and it should not) change tags behind users back. So if somebody already got the old tag, doing a 'git pull' on your tree shouldn't just make them overwrite the old one."
-msgstr ""
-"No entanto, o Git *não* (e não deve) alterar as tags sem o conhecimento dos "
-"usuários. Portanto, se alguém já recebeu a tag antiga, fazer um 'git pull' "
-"na sua árvore não substituirá a antiga."
+msgstr "No entanto, o Git *não* (e não deve) alterar as tags sem o conhecimento dos usuários. Portanto, se alguém já recebeu a tag antiga, fazer um 'git pull' na sua árvore não substituirá a antiga."
 
 #. type: Plain text
 #: en/git-tag.txt:269
 #, priority:240
 msgid "If somebody got a release tag from you, you cannot just change the tag for them by updating your own one. This is a big security issue, in that people MUST be able to trust their tag-names.  If you really want to do the insane thing, you need to just fess up to it, and tell people that you messed up. You can do that by making a very public announcement saying:"
-msgstr ""
-"Caso alguém tenha recebido uma etiqueta de lançamento de você, você não pode "
-"simplesmente alterá-la atualizando a sua. Esse é um grande problema de "
-"segurança, pois as pessoas DEVEM confiar nos nomes das suas tags.  Caso "
-"queira realmente fazer uma coisa insana, é necessário apenas confessar e "
-"dizer às pessoas que você errou. Você pode fazer isso fazendo um anúncio "
-"muito público dizendo:"
+msgstr "Caso alguém tenha recebido uma etiqueta de lançamento de você, você não pode simplesmente alterá-la atualizando a sua. Esse é um grande problema de segurança, pois as pessoas DEVEM confiar nos nomes das suas tags.  Caso queira realmente fazer uma coisa insana, é necessário apenas confessar e dizer às pessoas que você errou. Você pode fazer isso fazendo um anúncio muito público dizendo:"
 
 #. type: delimited block -
 #: en/git-tag.txt:273
@@ -63176,8 +54719,7 @@ msgid ""
 "then fixed something, and retagged the *fixed* tree as X again.\n"
 msgstr ""
 "Ok, eu estraguei tudo e impulsionei uma versão anterior com a tag X. Eu\n"
-"então consertei alguma coisa e marquei novamente a árvore *corrigida* como X "
-"novamente.\n"
+"então consertei alguma coisa e marquei novamente a árvore *corrigida* como X novamente.\n"
 
 #. type: delimited block -
 #: en/git-tag.txt:276
@@ -63233,10 +54775,7 @@ msgstr "Perdoe a inconveniência.\n"
 #: en/git-tag.txt:294
 #, priority:240
 msgid "Does this seem a bit complicated? It *should* be. There is no way that it would be correct to just \"fix\" it automatically.  People need to know that their tags might have been changed."
-msgstr ""
-"Isso parece um pouco complicado? *Deveria*. Não há como disto estar correto, "
-"apenas \"corrigindo-o\" de forma automática.  As pessoas precisam saber que "
-"as suas tags podem ter sido alteradas."
+msgstr "Isso parece um pouco complicado? *Deveria*. Não há como disto estar correto, apenas \"corrigindo-o\" de forma automática.  As pessoas precisam saber que as suas tags podem ter sido alteradas."
 
 #. type: Title ~
 #: en/git-tag.txt:297
@@ -63248,32 +54787,19 @@ msgstr "Na sequência automática"
 #: en/git-tag.txt:302
 #, priority:240
 msgid "If you are following somebody else's tree, you are most likely using remote-tracking branches (eg. `refs/remotes/origin/master`).  You usually want the tags from the other end."
-msgstr ""
-"Caso esteja seguindo a árvore de outra pessoa, provavelmente está utilizando "
-"os ramo monitorado remotamente (como por exemplo, `refs/remotes/origin/"
-"master`).  Você geralmente quer as tags que estão do outro lado."
+msgstr "Caso esteja seguindo a árvore de outra pessoa, provavelmente está utilizando os ramo monitorado remotamente (como por exemplo, `refs/remotes/origin/master`).  Você geralmente quer as tags que estão do outro lado."
 
 #. type: Plain text
 #: en/git-tag.txt:309
 #, priority:240
 msgid "On the other hand, if you are fetching because you would want a one-shot merge from somebody else, you typically do not want to get tags from there.  This happens more often for people near the toplevel but not limited to them.  Mere mortals when pulling from each other do not necessarily want to automatically get private anchor point tags from the other person."
-msgstr ""
-"Por outro lado, caso você esteja buscando porque deseja mesclar de uma vez o "
-"commit de outra pessoa, geralmente você não vai querer obter as tags a "
-"partir daí.  Isso acontece com mais frequência para pessoas próximas ao "
-"nível mais alto, mas não se limitando a elas.  Os meros mortais quando obtém "
-"um do outro não necessariamente querem obter automaticamente pontos de "
-"ancoragem privados vindos da outra pessoa."
+msgstr "Por outro lado, caso você esteja buscando porque deseja mesclar de uma vez o commit de outra pessoa, geralmente você não vai querer obter as tags a partir daí.  Isso acontece com mais frequência para pessoas próximas ao nível mais alto, mas não se limitando a elas.  Os meros mortais quando obtém um do outro não necessariamente querem obter automaticamente pontos de ancoragem privados vindos da outra pessoa."
 
 #. type: Plain text
 #: en/git-tag.txt:314
 #, priority:240
 msgid "Often, \"please pull\" messages on the mailing list just provide two pieces of information: a repo URL and a branch name; this is designed to be easily cut&pasted at the end of a 'git fetch' command line:"
-msgstr ""
-"Frequentemente, aparecem mensagens \"please pull\" na lista de discussão que "
-"oferecem apenas duas informações: uma URL do repo e um nome do ramo; foi "
-"projetado para ser facilmente cortado e colado no final de uma linha de "
-"comando 'git fetch':"
+msgstr "Frequentemente, aparecem mensagens \"please pull\" na lista de discussão que oferecem apenas duas informações: uma URL do repo e um nome do ramo; foi projetado para ser facilmente cortado e colado no final de uma linha de comando 'git fetch':"
 
 #. type: delimited block -
 #: en/git-tag.txt:317
@@ -63309,48 +54835,25 @@ msgstr "$ git pull git://git..../proj.git master\n"
 #: en/git-tag.txt:331
 #, priority:240
 msgid "In such a case, you do not want to automatically follow the other person's tags."
-msgstr ""
-"Neste caso, caso não queira seguir automaticamente as tags da outra pessoa."
+msgstr "Neste caso, caso não queira seguir automaticamente as tags da outra pessoa."
 
 #. type: Plain text
 #: en/git-tag.txt:339
 #, priority:240
 msgid "One important aspect of Git is its distributed nature, which largely means there is no inherent \"upstream\" or \"downstream\" in the system.  On the face of it, the above example might seem to indicate that the tag namespace is owned by the upper echelon of people and that tags only flow downwards, but that is not the case.  It only shows that the usage pattern determines who are interested in whose tags."
-msgstr ""
-"Um aspecto importante do Git é a sua natureza distribuída, o que em geral "
-"significa que não há \"upstream\" ou \"downstream\" inerente no sistema.  Em "
-"face disso, o exemplo acima pode parecer indicar que o espaço de nomes da "
-"tag pertence ao escalão superior das pessoas e que as tags fluem apenas para "
-"baixo, porém este não é o caso.  Exibe apenas que o padrão de uso determina "
-"quem está interessado em quais tags."
+msgstr "Um aspecto importante do Git é a sua natureza distribuída, o que em geral significa que não há \"upstream\" ou \"downstream\" inerente no sistema.  Em face disso, o exemplo acima pode parecer indicar que o espaço de nomes da tag pertence ao escalão superior das pessoas e que as tags fluem apenas para baixo, porém este não é o caso.  Exibe apenas que o padrão de uso determina quem está interessado em quais tags."
 
 #. type: Plain text
 #: en/git-tag.txt:351
 #, priority:240
 msgid "A one-shot pull is a sign that a commit history is now crossing the boundary between one circle of people (e.g. \"people who are primarily interested in the networking part of the kernel\") who may have their own set of tags (e.g. \"this is the third release candidate from the networking group to be proposed for general consumption with 2.6.21 release\") to another circle of people (e.g. \"people who integrate various subsystem improvements\").  The latter are usually not interested in the detailed tags used internally in the former group (that is what \"internal\" means).  That is why it is desirable not to follow tags automatically in this case."
-msgstr ""
-"Uma tentativa única é um sinal que o histórico de um commit agora está "
-"cruzando a fronteira entre um círculo de pessoas (como por exemplo, \"pessoas"
-" que estão interessadas principalmente na parte da rede do kernel\") que "
-"podem ter o seu próprio conjunto das tags (como por exemplo \"este é o "
-"terceiro candidato ao lançamento do grupo da rede que será proposto para "
-"consumo geral com o lançamento da versão 2.6.21\") para outro círculo de "
-"pessoas (como por exemplo, \"pessoas que integraram várias melhorias ao "
-"subsistema\").  Os últimos geralmente não estão interessados nas tags "
-"detalhadas utilizadas internamente no primeiro grupo (é isso que significa "
-"\"interno\").  É por isso que é desejável neste caso, não seguir as tags de "
-"maneira automática."
+msgstr "Uma tentativa única é um sinal que o histórico de um commit agora está cruzando a fronteira entre um círculo de pessoas (como por exemplo, \"pessoas que estão interessadas principalmente na parte da rede do kernel\") que podem ter o seu próprio conjunto das tags (como por exemplo \"este é o terceiro candidato ao lançamento do grupo da rede que será proposto para consumo geral com o lançamento da versão 2.6.21\") para outro círculo de pessoas (como por exemplo, \"pessoas que integraram várias melhorias ao subsistema\").  Os últimos geralmente não estão interessados nas tags detalhadas utilizadas internamente no primeiro grupo (é isso que significa \"interno\").  É por isso que é desejável neste caso, não seguir as tags de maneira automática."
 
 #. type: Plain text
 #: en/git-tag.txt:357
 #, priority:240
 msgid "It may well be that among networking people, they may want to exchange the tags internal to their group, but in that workflow they are most likely tracking each other's progress by having remote-tracking branches.  Again, the heuristic to automatically follow such tags is a good thing."
-msgstr ""
-"Pode ser que, entre as pessoas da rede, elas possam querer trocar as tags "
-"internas ao seu grupo, porém neste fluxo de trabalho eles provavelmente "
-"rastreiam o progresso um do outro por terem ramificações de rastreamento "
-"remoto.  Novamente, a heurística para seguir automaticamente estas tags é "
-"uma coisa boa."
+msgstr "Pode ser que, entre as pessoas da rede, elas possam querer trocar as tags internas ao seu grupo, porém neste fluxo de trabalho eles provavelmente rastreiam o progresso um do outro por terem ramificações de rastreamento remoto.  Novamente, a heurística para seguir automaticamente estas tags é uma coisa boa."
 
 #. type: Title ~
 #: en/git-tag.txt:360
@@ -63362,20 +54865,13 @@ msgstr "Sobre as Tags com Datas Retroativas"
 #: en/git-tag.txt:367
 #, priority:240
 msgid "If you have imported some changes from another VCS and would like to add tags for major releases of your work, it is useful to be able to specify the date to embed inside of the tag object; such data in the tag object affects, for example, the ordering of tags in the gitweb interface."
-msgstr ""
-"Caso tenha importado algumas alterações de outro VCS e queira adicionar as "
-"tags para as principais versões do seu trabalho, é útil poder informar a "
-"data que será incorporada no objeto tag; estes dados no objeto tag afetam, "
-"por exemplo, a ordem das tags na interface 'gitweb'."
+msgstr "Caso tenha importado algumas alterações de outro VCS e queira adicionar as tags para as principais versões do seu trabalho, é útil poder informar a data que será incorporada no objeto tag; estes dados no objeto tag afetam, por exemplo, a ordem das tags na interface 'gitweb'."
 
 #. type: Plain text
 #: en/git-tag.txt:371
 #, priority:240
 msgid "To set the date used in future tag objects, set the environment variable GIT_COMMITTER_DATE (see the later discussion of possible values; the most common form is \"YYYY-MM-DD HH:MM\")."
-msgstr ""
-"Para definir a data usada em objetos com tags futuras, defina a variável de "
-"ambiente `GIT_COMMITTER_DATE` (consulte a discussão posterior sobre os "
-"valores possíveis; a forma mais comum é \"AAAA-MM-DD HH:MM\")."
+msgstr "Para definir a data usada em objetos com tags futuras, defina a variável de ambiente `GIT_COMMITTER_DATE` (consulte a discussão posterior sobre os valores possíveis; a forma mais comum é \"AAAA-MM-DD HH:MM\")."
 
 #. type: delimited block -
 #: en/git-tag.txt:376
@@ -63423,39 +54919,25 @@ msgstr ""
 #: en/git.txt:24
 #, priority:100
 msgid "Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals."
-msgstr ""
-"O Git é um sistema de controle de revisão distribuído, rápido, escalável e "
-"com um conjunto de comandos incomumente rico que oferece operações de alto "
-"nível e acesso completo aos seus recursos."
+msgstr "O Git é um sistema de controle de revisão distribuído, rápido, escalável e com um conjunto de comandos incomumente rico que oferece operações de alto nível e acesso completo aos seus recursos."
 
 #. type: Plain text
 #: en/git.txt:29
 #, priority:100
 msgid "See linkgit:gittutorial[7] to get started, then see linkgit:giteveryday[7] for a useful minimum set of commands.  The link:user-manual.html[Git User's Manual] has a more in-depth introduction."
-msgstr ""
-"Para começar, consulte linkgit:gittutorial[7] e depois linkgit:giteveryday[7]"
-" para conhecer um conjunto mínimo de comandos uteis.  Para uma introdução "
-"mais aprofundada acesse o link:user-manual.html[Manual do Usuário do Git]."
+msgstr "Para começar, consulte linkgit:gittutorial[7] e depois linkgit:giteveryday[7] para conhecer um conjunto mínimo de comandos uteis.  Para uma introdução mais aprofundada acesse o link:user-manual.html[Manual do Usuário do Git]."
 
 #. type: Plain text
 #: en/git.txt:34
 #, priority:100
 msgid "After you mastered the basic concepts, you can come back to this page to learn what commands Git offers.  You can learn more about individual Git commands with \"git help command\".  linkgit:gitcli[7] manual page gives you an overview of the command-line command syntax."
-msgstr ""
-"Depois de dominar os conceitos básicos, é possível voltar para esta página "
-"para aprender quais os outros comandos o Git oferece.  É possível aprender "
-"mais sobre os comandos individuais do Git com o comando \"git help nome-do-"
-"comando\".  A página do manual linkgit:gitcli[7] fornece uma visão geral da "
-"sintaxe de comandos da linha de comando."
+msgstr "Depois de dominar os conceitos básicos, é possível voltar para esta página para aprender quais os outros comandos o Git oferece.  É possível aprender mais sobre os comandos individuais do Git com o comando \"git help nome-do-comando\".  A página do manual linkgit:gitcli[7] fornece uma visão geral da sintaxe de comandos da linha de comando."
 
 #. type: Plain text
 #: en/git.txt:38
 #, priority:100
 msgid "A formatted and hyperlinked copy of the latest Git documentation can be viewed at https://git.github.io/htmldocs/git.html or https://git-scm.com/docs."
-msgstr ""
-"Uma cópia formatada e com hiperlink da documentação mais recente do Git pode "
-"ser visualizada em https://git.github.io/htmldocs/git.html ou https://git-scm"
-".com/docs."
+msgstr "Uma cópia formatada e com hiperlink da documentação mais recente do Git pode ser visualizada em https://git.github.io/htmldocs/git.html ou https://git-scm.com/docs."
 
 #. type: Plain text
 #: en/git.txt:44
@@ -63467,20 +54949,13 @@ msgstr "Imprime a versão do pacote Git exibindo a sua origem."
 #: en/git.txt:50
 #, priority:100
 msgid "Prints the synopsis and a list of the most commonly used commands. If the option `--all` or `-a` is given then all available commands are printed. If a Git command is named this option will bring up the manual page for that command."
-msgstr ""
-"Imprime a sinopse e uma lista dos comandos mais usados. Caso a opção `--all` "
-"ou `-a` seja usada, todos os comandos disponíveis serão impressos. Caso um "
-"comando Git seja informado, esta opção exibirá a página do manual deste "
-"comando."
+msgstr "Imprime a sinopse e uma lista dos comandos mais usados. Caso a opção `--all` ou `-a` seja usada, todos os comandos disponíveis serão impressos. Caso um comando Git seja informado, esta opção exibirá a página do manual deste comando."
 
 #. type: Plain text
 #: en/git.txt:55
 #, ignore-ellipsis, priority:100
 msgid "Other options are available to control how the manual page is displayed. See linkgit:git-help[1] for more information, because `git --help ...` is converted internally into `git help ...`."
-msgstr ""
-"Outras opções estão disponíveis para controlar como a página do manual é "
-"exibida. Para mais informações, consulte linkgit:git-help[1], pois o comando "
-"`git --help ...` é convertido internamente em `git help ...`."
+msgstr "Outras opções estão disponíveis para controlar como a página do manual é exibida. Para mais informações, consulte linkgit:git-help[1], pois o comando `git --help ...` é convertido internamente em `git help ...`."
 
 #. type: Labeled list
 #: en/git.txt:56
@@ -63492,22 +54967,13 @@ msgstr "-C <caminho>"
 #: en/git.txt:62
 #, priority:100
 msgid "Run as if git was started in '<path>' instead of the current working directory.  When multiple `-C` options are given, each subsequent non-absolute `-C <path>` is interpreted relative to the preceding `-C <path>`.  If '<path>' is present but empty, e.g. `-C \"\"`, then the current working directory is left unchanged."
-msgstr ""
-"Execute como se o git tivesse sido iniciado em '<caminho>' em vez do "
-"diretório de trabalho atual.  Quando várias opções `-C` são usadas, cada `-C "
-"<caminho>` não absoluto subsequente é interpretado com relação ao `-C "
-"<caminho>` anterior.  Se '<caminho>' estiver presente, porém vazio, por "
-"exemplo, `-C \"\"`, o diretório de trabalho atual permanecerá inalterado."
+msgstr "Execute como se o git tivesse sido iniciado em '<caminho>' em vez do diretório de trabalho atual.  Quando várias opções `-C` são usadas, cada `-C <caminho>` não absoluto subsequente é interpretado com relação ao `-C <caminho>` anterior.  Se '<caminho>' estiver presente, porém vazio, por exemplo, `-C \"\"`, o diretório de trabalho atual permanecerá inalterado."
 
 #. type: Plain text
 #: en/git.txt:67
 #, priority:100
 msgid "This option affects options that expect path name like `--git-dir` and `--work-tree` in that their interpretations of the path names would be made relative to the working directory caused by the `-C` option. For example the following invocations are equivalent:"
-msgstr ""
-"Esta opção afeta as opções que esperam o nome do caminho, como `--git-dir` e "
-"`work-tree`, pois as suas interpretações dos nomes dos caminhos seriam "
-"feitas em relação ao diretório de trabalho causado pela opção `-C`. Como, "
-"por exemplo, as seguintes invocações são equivalentes:"
+msgstr "Esta opção afeta as opções que esperam o nome do caminho, como `--git-dir` e `work-tree`, pois as suas interpretações dos nomes dos caminhos seriam feitas em relação ao diretório de trabalho causado pela opção `-C`. Como, por exemplo, as seguintes invocações são equivalentes:"
 
 #. type: Plain text
 #: en/git.txt:70
@@ -63529,22 +54995,13 @@ msgstr "-c <nome>=<valor>"
 #: en/git.txt:76
 #, priority:100
 msgid "Pass a configuration parameter to the command. The value given will override values from configuration files.  The <name> is expected in the same format as listed by 'git config' (subkeys separated by dots)."
-msgstr ""
-"Encaminhe um parâmetro de configuração para o comando O valor informado "
-"substituirá os valores dos arquivos de configuração.  Um `<nome>` é esperado "
-"no mesmo formato listado pelo comando 'git config' (sub chaves separadas por "
-"pontos)."
+msgstr "Encaminhe um parâmetro de configuração para o comando O valor informado substituirá os valores dos arquivos de configuração.  Um `<nome>` é esperado no mesmo formato listado pelo comando 'git config' (sub chaves separadas por pontos)."
 
 #. type: Plain text
 #: en/git.txt:82
 #, ignore-ellipsis, priority:100
 msgid "Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo.bar` to the boolean true value (just like `[foo]bar` would in a config file). Including the equals but with an empty value (like `git -c foo.bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` will convert to `false`."
-msgstr ""
-"Note que ao omitir `=` no comando `git -c foo.bar ...` é permitido e define "
-"`foo.bar` com o valor booleano verdadeiro (assim como`[foo]bar` faria em um "
-"arquivo de configuração). Incluindo os iguais, porém com um valor vazio ("
-"como `git -c foo.bar= ...`) define `foo.bar` para a string vazia que `git "
-"config --type=bool` converterá para `false`."
+msgstr "Note que ao omitir `=` no comando `git -c foo.bar ...` é permitido e define `foo.bar` com o valor booleano verdadeiro (assim como`[foo]bar` faria em um arquivo de configuração). Incluindo os iguais, porém com um valor vazio (como `git -c foo.bar= ...`) define `foo.bar` para a string vazia que `git config --type=bool` converterá para `false`."
 
 #. type: Labeled list
 #: en/git.txt:83
@@ -63556,11 +55013,7 @@ msgstr "--exec-path[=<caminho>]"
 #: en/git.txt:88
 #, priority:100
 msgid "Path to wherever your core Git programs are installed.  This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit."
-msgstr ""
-"O caminho para onde os seus principais programas Git estão instalados.  Isso "
-"também pode ser controlado configurando a variável de ambiente "
-"`GIT_EXEC_PATH`. Caso nenhum caminho seja informado, o 'git' imprimirá a "
-"configuração atual e encerrará."
+msgstr "O caminho para onde os seus principais programas Git estão instalados.  Isso também pode ser controlado configurando a variável de ambiente `GIT_EXEC_PATH`. Caso nenhum caminho seja informado, o 'git' imprimirá a configuração atual e encerrará."
 
 #. type: Labeled list
 #: en/git.txt:89
@@ -63572,9 +55025,7 @@ msgstr "--html-path"
 #: en/git.txt:92
 #, priority:100
 msgid "Print the path, without trailing slash, where Git's HTML documentation is installed and exit."
-msgstr ""
-"Imprima o caminho, sem barra, onde a documentação HTML do Git está instalada "
-"e encerre."
+msgstr "Imprima o caminho, sem barra, onde a documentação HTML do Git está instalada e encerre."
 
 #. type: Labeled list
 #: en/git.txt:93
@@ -63586,9 +55037,7 @@ msgstr "--man-path"
 #: en/git.txt:96
 #, priority:100
 msgid "Print the manpath (see `man(1)`) for the man pages for this version of Git and exit."
-msgstr ""
-"Imprima o manpath (consulte `man(1)`) para as páginas do manual desta versão "
-"do Git e encerre."
+msgstr "Imprima o manpath (consulte `man(1)`) para as páginas do manual desta versão do Git e encerre."
 
 #. type: Labeled list
 #: en/git.txt:97
@@ -63600,9 +55049,7 @@ msgstr "--info-path"
 #: en/git.txt:100
 #, priority:100
 msgid "Print the path where the Info files documenting this version of Git are installed and exit."
-msgstr ""
-"Imprima o caminho onde os arquivos Info que documentam esta versão do Git "
-"estão instalados e encerre."
+msgstr "Imprima o caminho onde os arquivos Info que documentam esta versão do Git estão instalados e encerre."
 
 #. type: Labeled list
 #: en/git.txt:102
@@ -63614,10 +55061,7 @@ msgstr "--paginate"
 #: en/git.txt:107
 #, priority:100
 msgid "Pipe all output into 'less' (or if set, $PAGER) if standard output is a terminal.  This overrides the `pager.<cmd>` configuration options (see the \"Configuration Mechanism\" section below)."
-msgstr ""
-"Canalize toda a saída para 'less' (ou caso esteja definido, `$PAGER`) caso a "
-"saída padrão seja um terminal.  Isso substitui as opções de configuração "
-"`pager.<cmd>` (consulte a seção \"Mecanismo de Configuração\" abaixo)."
+msgstr "Canalize toda a saída para 'less' (ou caso esteja definido, `$PAGER`) caso a saída padrão seja um terminal.  Isso substitui as opções de configuração `pager.<cmd>` (consulte a seção \"Mecanismo de Configuração\" abaixo)."
 
 #. type: Labeled list
 #: en/git.txt:109
@@ -63641,24 +55085,13 @@ msgstr "--git-dir=<caminho>"
 #: en/git.txt:116
 #, priority:100
 msgid "Set the path to the repository (\".git\" directory). This can also be controlled by setting the `GIT_DIR` environment variable. It can be an absolute path or relative path to current working directory."
-msgstr ""
-"Define o caminho para o repositório (o diretório \".git\"). Isso também pode "
-"ser controlado pela configuração da variável de ambiente `GIT_DIR`. Pode ser "
-"um caminho absoluto ou relativo ao diretório de trabalho atual."
+msgstr "Define o caminho para o repositório (o diretório \".git\"). Isso também pode ser controlado pela configuração da variável de ambiente `GIT_DIR`. Pode ser um caminho absoluto ou relativo ao diretório de trabalho atual."
 
 #. type: Plain text
 #: en/git.txt:127
 #, priority:100
 msgid "Specifying the location of the \".git\" directory using this option (or `GIT_DIR` environment variable) turns off the repository discovery that tries to find a directory with \".git\" subdirectory (which is how the repository and the top-level of the working tree are discovered), and tells Git that you are at the top level of the working tree.  If you are not at the top-level directory of the working tree, you should tell Git where the top-level of the working tree is, with the `--work-tree=<path>` option (or `GIT_WORK_TREE` environment variable)"
-msgstr ""
-"A especificação do local do diretório \".git\" usando esta opção (ou a "
-"variável de ambiente `GIT_DIR`) desativa a descoberta do repositório que "
-"tenta localizar um diretório com o \".git\" dentro (que é como o repositório "
-"e o nível mais alto da descoberta da árvore de trabalho) e informa ao Git "
-"que você está no nível mais alto da árvore de trabalho.  Caso não esteja no "
-"diretório no nível mais alto da árvore de trabalho, deve informar ao Git "
-"onde está este nível da árvore de trabalho, com a opção `--work-"
-"tree=<caminho>` (ou a variável de ambiente `GIT_WORK_TREE`)"
+msgstr "A especificação do local do diretório \".git\" usando esta opção (ou a variável de ambiente `GIT_DIR`) desativa a descoberta do repositório que tenta localizar um diretório com o \".git\" dentro (que é como o repositório e o nível mais alto da descoberta da árvore de trabalho) e informa ao Git que você está no nível mais alto da árvore de trabalho.  Caso não esteja no diretório no nível mais alto da árvore de trabalho, deve informar ao Git onde está este nível da árvore de trabalho, com a opção `--work-tree=<caminho>` (ou a variável de ambiente `GIT_WORK_TREE`)"
 
 #. type: Plain text
 #: en/git.txt:130
@@ -63676,12 +55109,7 @@ msgstr "--work-tree=<caminho>"
 #: en/git.txt:138
 #, priority:100
 msgid "Set the path to the working tree. It can be an absolute path or a path relative to the current working directory.  This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion)."
-msgstr ""
-"Define o caminho para a árvore de trabalho. Pode ser um caminho absoluto ou "
-"relativo ao diretório de trabalho atual.  Também pode ser controlado atrvés "
-"da configuração da variável de ambiente `GIT_WORK_TREE` e da variável de "
-"configuração `core.worktree` (consulte `core.worktree` no linkgit:git-"
-"config[1] para uma discussão com mais detalhes)."
+msgstr "Define o caminho para a árvore de trabalho. Pode ser um caminho absoluto ou relativo ao diretório de trabalho atual.  Também pode ser controlado atrvés da configuração da variável de ambiente `GIT_WORK_TREE` e da variável de configuração `core.worktree` (consulte `core.worktree` no linkgit:git-config[1] para uma discussão com mais detalhes)."
 
 #. type: Labeled list
 #: en/git.txt:139
@@ -63693,10 +55121,7 @@ msgstr "--namespace=<caminho>"
 #: en/git.txt:143
 #, priority:100
 msgid "Set the Git namespace.  See linkgit:gitnamespaces[7] for more details.  Equivalent to setting the `GIT_NAMESPACE` environment variable."
-msgstr ""
-"Define o espaço de nomes no Git.  Para mais detalhes consulte "
-"linkgit:gitnamespaces[7].  É o mesmo que configurar a variável de ambiente "
-"`GIT_NAMESPACE`."
+msgstr "Define o espaço de nomes no Git.  Para mais detalhes consulte linkgit:gitnamespaces[7].  É o mesmo que configurar a variável de ambiente `GIT_NAMESPACE`."
 
 #. type: Labeled list
 #: en/git.txt:144
@@ -63714,9 +55139,7 @@ msgstr "Apenas para uso interno.  Set a prefix which gives a path from above a r
 #: en/git.txt:153
 #, priority:100
 msgid "Treat the repository as a bare repository.  If GIT_DIR environment is not set, it is set to the current working directory."
-msgstr ""
-"Trate o repositório como um repositório simples.  Caso o ambiente `GIT_DIR` "
-"não estiver definido, ele será definido no diretório de trabalho atual."
+msgstr "Trate o repositório como um repositório simples.  Caso o ambiente `GIT_DIR` não estiver definido, ele será definido no diretório de trabalho atual."
 
 #. type: Labeled list
 #: en/git.txt:154
@@ -63740,10 +55163,7 @@ msgstr "--literal-pathspecs"
 #: en/git.txt:162
 #, priority:100
 msgid "Treat pathspecs literally (i.e. no globbing, no pathspec magic).  This is equivalent to setting the `GIT_LITERAL_PATHSPECS` environment variable to `1`."
-msgstr ""
-"Trate os pathspecs literalmente (ou seja, sem \"globbing\", sem a magia do "
-"\"pathspec\").  É o mesmo que definir a variável de ambiente "
-"`GIT_LITERAL_PATHSPECS` como `1`."
+msgstr "Trate os pathspecs literalmente (ou seja, sem \"globbing\", sem a magia do \"pathspec\").  É o mesmo que definir a variável de ambiente `GIT_LITERAL_PATHSPECS` como `1`."
 
 #. type: Labeled list
 #: en/git.txt:163
@@ -63755,11 +55175,7 @@ msgstr "--glob-pathspecs"
 #: en/git.txt:168
 #, priority:100
 msgid "Add \"glob\" magic to all pathspec. This is equivalent to setting the `GIT_GLOB_PATHSPECS` environment variable to `1`. Disabling globbing on individual pathspecs can be done using pathspec magic \":(literal)\""
-msgstr ""
-"Adicione a magia 'glob' para todos os 'pathspec'. É como definir a variável "
-"de ambiente `GIT_GLOB_PATHSPECS` como `1`. A desativação do caractere "
-"curinga nos pathspecs individuais podem ser feitos utilizando a mágica do "
-"pathspec \": (literal)\""
+msgstr "Adicione a magia 'glob' para todos os 'pathspec'. É como definir a variável de ambiente `GIT_GLOB_PATHSPECS` como `1`. A desativação do caractere curinga nos pathspecs individuais podem ser feitos utilizando a mágica do pathspec \": (literal)\""
 
 #. type: Labeled list
 #: en/git.txt:169
@@ -63771,11 +55187,7 @@ msgstr "--noglob-pathspecs"
 #: en/git.txt:174
 #, priority:100
 msgid "Add \"literal\" magic to all pathspec. This is equivalent to setting the `GIT_NOGLOB_PATHSPECS` environment variable to `1`. Enabling globbing on individual pathspecs can be done using pathspec magic \":(glob)\""
-msgstr ""
-"Adicione a magia 'literal' a todos os \"pathspec\". É equivalente a definir "
-"a variável de ambiente `GIT_NOGLOB_PATHSPECS` para `1`. A ativação dos "
-"caracteres curinga nos \"pathspecs\" individuais podem ser feitos utilizando "
-"a mágica do pathspec \":(glob)\""
+msgstr "Adicione a magia 'literal' a todos os \"pathspec\". É equivalente a definir a variável de ambiente `GIT_NOGLOB_PATHSPECS` para `1`. A ativação dos caracteres curinga nos \"pathspecs\" individuais podem ser feitos utilizando a mágica do pathspec \":(glob)\""
 
 #. type: Labeled list
 #: en/git.txt:175
@@ -63787,9 +55199,7 @@ msgstr "--icase-pathspecs"
 #: en/git.txt:178
 #, priority:100
 msgid "Add \"icase\" magic to all pathspec. This is equivalent to setting the `GIT_ICASE_PATHSPECS` environment variable to `1`."
-msgstr ""
-"Adicione a magia 'icase' em todos os pathspec. É como definir a variável de "
-"ambiente `GIT_ICASE_PATHSPECS` como `1`."
+msgstr "Adicione a magia 'icase' em todos os pathspec. É como definir a variável de ambiente `GIT_ICASE_PATHSPECS` como `1`."
 
 #. type: Labeled list
 #: en/git.txt:179
@@ -63801,9 +55211,7 @@ msgstr "--no-optional-locks"
 #: en/git.txt:182
 #, priority:100
 msgid "Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`."
-msgstr ""
-"Não execute operações opcionais que exijam bloqueios. Isso é equivalente que "
-"definir o `GIT_OPTIONAL_LOCKS` como `0`."
+msgstr "Não execute operações opcionais que exijam bloqueios. Isso é equivalente que definir o `GIT_OPTIONAL_LOCKS` como `0`."
 
 #. type: Labeled list
 #: en/git.txt:183
@@ -63815,15 +55223,7 @@ msgstr "--list-cmds=group[,group...]"
 #: en/git.txt:192
 #, priority:100
 msgid "List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use parse-options), main (all commands in libexec directory), others (all other commands in `$PATH` that have git- prefix), list-<category> (see categories in command-list.txt), nohelpers (exclude helper commands), alias and config (retrieve command list from config variable completion.commands)"
-msgstr ""
-"Liste os comandos por grupo. Essa é uma opção interna/experimental e pode "
-"mudar ou ser removido no futuro. Os grupos compatíveis são: `builtins`, "
-"`parseopt` (comandos internos que utilizam 'parse-options´), `main` (todos "
-"os comandos no diretório 'libexec'), `others` (todos os outros comandos no "
-"`$PATH` que possuem um prefixo git), `list- <categoria>` (consulte as "
-"categorias no 'command-list.txt'), `nohelpers` (exclua os comandos "
-"auxiliares), `alias` e `config` (recupera a lista dos comandos da variável "
-"`completion.commands`)"
+msgstr "Liste os comandos por grupo. Essa é uma opção interna/experimental e pode mudar ou ser removido no futuro. Os grupos compatíveis são: `builtins`, `parseopt` (comandos internos que utilizam 'parse-options´), `main` (todos os comandos no diretório 'libexec'), `others` (todos os outros comandos no `$PATH` que possuem um prefixo git), `list- <categoria>` (consulte as categorias no 'command-list.txt'), `nohelpers` (exclua os comandos auxiliares), `alias` e `config` (recupera a lista dos comandos da variável `completion.commands`)"
 
 #. type: Title -
 #: en/git.txt:194
@@ -63835,9 +55235,7 @@ msgstr "OS COMANDOS DO GIT"
 #: en/git.txt:198
 #, priority:100
 msgid "We divide Git into high level (\"porcelain\") commands and low level (\"plumbing\") commands."
-msgstr ""
-"Dividimos o Git em comandos de alto nível (\"porcelana\") e de baixo nível ("
-"\"encanamento\")."
+msgstr "Dividimos o Git em comandos de alto nível (\"porcelana\") e de baixo nível (\"encanamento\")."
 
 #. type: Title -
 #: en/git.txt:200
@@ -63849,9 +55247,7 @@ msgstr "Comandos de alto nível (porcelana)"
 #: en/git.txt:204
 #, priority:100
 msgid "We separate the porcelain commands into the main commands and some ancillary user utilities."
-msgstr ""
-"Separamos os comandos porcelana nos comandos principais e em alguns "
-"utilitários auxiliares do usuário."
+msgstr "Separamos os comandos porcelana nos comandos principais e em alguns utilitários auxiliares do usuário."
 
 #. type: Title ~
 #: en/git.txt:206
@@ -63887,9 +55283,7 @@ msgstr "Interagindo com os outros"
 #: en/git.txt:226
 #, priority:100
 msgid "These commands are to interact with foreign SCM and with other people via patch over e-mail."
-msgstr ""
-"Estes comandos são para interagir com um SCM externo e com as outras pessoas "
-"através de patch por e-mail."
+msgstr "Estes comandos são para interagir com um SCM externo e com as outras pessoas através de patch por e-mail."
 
 #. type: Title ~
 #: en/git.txt:230
@@ -63901,44 +55295,31 @@ msgstr "Redefina, restaure e reverta"
 #: en/git.txt:233
 #, priority:100
 msgid "There are three commands with similar names: `git reset`, `git restore` and `git revert`."
-msgstr ""
-"Existem três comandos com nomes semelhantes: `git reset`, `git restore` e o `"
-"git revert`."
+msgstr "Existem três comandos com nomes semelhantes: `git reset`, `git restore` e o `git revert`."
 
 #. type: Plain text
 #: en/git.txt:236
 #, priority:100
 msgid "linkgit:git-revert[1] is about making a new commit that reverts the changes made by other commits."
-msgstr ""
-"linkgit:git-revert[1] trata de fazer um novo commit que reverte as "
-"alterações feitas por outros commit."
+msgstr "linkgit:git-revert[1] trata de fazer um novo commit que reverte as alterações feitas por outros commit."
 
 #. type: Plain text
 #: en/git.txt:241
 #, priority:100
 msgid "linkgit:git-restore[1] is about restoring files in the working tree from either the index or another commit. This command does not update your branch. The command can also be used to restore files in the index from another commit."
-msgstr ""
-"linkgit:git-restore[1] trata da restauração dos arquivos na árvore de "
-"trabalho do índice ou de outro commit. Este comando não atualiza o seu ramo. "
-"O comando também pode ser usado para restaurar os arquivos no índice do "
-"outro commit."
+msgstr "linkgit:git-restore[1] trata da restauração dos arquivos na árvore de trabalho do índice ou de outro commit. Este comando não atualiza o seu ramo. O comando também pode ser usado para restaurar os arquivos no índice do outro commit."
 
 #. type: Plain text
 #: en/git.txt:245
 #, priority:100
 msgid "linkgit:git-reset[1] is about updating your branch, moving the tip in order to add or remove commits from the branch. This operation changes the commit history."
-msgstr ""
-"linkgit:git-reset[1] trata da atualização do seu ramo, movendo o topo para "
-"adicionar ou remover os commits do ramo. Esta operação altera o histórico do "
-"commit."
+msgstr "linkgit:git-reset[1] trata da atualização do seu ramo, movendo o topo para adicionar ou remover os commits do ramo. Esta operação altera o histórico do commit."
 
 #. type: Plain text
 #: en/git.txt:248
 #, priority:100
 msgid "`git reset` can also be used to restore the index, overlapping with `git restore`."
-msgstr ""
-"O comando `git reset` também pode ser usado para restaurar o índice, "
-"sobrepondo com `git restore`."
+msgstr "O comando `git reset` também pode ser usado para restaurar o índice, sobrepondo com `git restore`."
 
 #. type: Title -
 #: en/git.txt:251
@@ -63950,32 +55331,19 @@ msgstr "Comandos de baixo nível (encanamento 'plumbing')"
 #: en/git.txt:258
 #, priority:100
 msgid "Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains.  Developers of such porcelains might start by reading about linkgit:git-update-index[1] and linkgit:git-read-tree[1]."
-msgstr ""
-"Embora o Git inclua a sua própria camada de porcelana, os seus comandos de "
-"baixo nível são suficientes para apoiar o desenvolvimento de porcelanas "
-"alternativas.  Os desenvolvedores destas porcelanas podem começar lendo "
-"sobre linkgit:git-update-index[1] e linkgit:git-read-tree[1]."
+msgstr "Embora o Git inclua a sua própria camada de porcelana, os seus comandos de baixo nível são suficientes para apoiar o desenvolvimento de porcelanas alternativas.  Os desenvolvedores destas porcelanas podem começar lendo sobre linkgit:git-update-index[1] e linkgit:git-read-tree[1]."
 
 #. type: Plain text
 #: en/git.txt:265
 #, priority:100
 msgid "The interface (input, output, set of options and the semantics)  to these low-level commands are meant to be a lot more stable than Porcelain level commands, because these commands are primarily for scripted use.  The interface to Porcelain commands on the other hand are subject to change in order to improve the end user experience."
-msgstr ""
-"A interface (entrada, saída, conjunto de opções e as semânticas) para esses "
-"comandos de baixo nível deve ser muito mais estável que os comandos "
-"porcelana, porque estes comandos são principalmente para uso com um script.  "
-"A interface para os comandos Porcelana, por outro lado, está sujeita a "
-"alterações para melhorar a experiência do usuário final."
+msgstr "A interface (entrada, saída, conjunto de opções e as semânticas) para esses comandos de baixo nível deve ser muito mais estável que os comandos porcelana, porque estes comandos são principalmente para uso com um script.  A interface para os comandos Porcelana, por outro lado, está sujeita a alterações para melhorar a experiência do usuário final."
 
 #. type: Plain text
 #: en/git.txt:271
 #, priority:100
 msgid "The following description divides the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories."
-msgstr ""
-"A descrição a seguir divide os comandos de baixo nível em comandos que "
-"manipulam os objetos (no repositório, índice e árvore de trabalho), comandos "
-"que interrogam, comparam objetos, comandos que movem objetos e suas "
-"referências entre os repositórios."
+msgstr "A descrição a seguir divide os comandos de baixo nível em comandos que manipulam os objetos (no repositório, índice e árvore de trabalho), comandos que interrogam, comparam objetos, comandos que movem objetos e suas referências entre os repositórios."
 
 #. type: Title ~
 #: en/git.txt:274
@@ -63993,9 +55361,7 @@ msgstr "Comandos de interrogação"
 #: en/git.txt:286
 #, priority:100
 msgid "In general, the interrogate commands do not touch the files in the working tree."
-msgstr ""
-"Em geral, os comandos de interrogação não tocam nos arquivos da árvore de "
-"trabalho."
+msgstr "Em geral, os comandos de interrogação não tocam nos arquivos da árvore de trabalho."
 
 #. type: Title ~
 #: en/git.txt:289
@@ -64007,9 +55373,7 @@ msgstr "Sincronizando os repositórios"
 #: en/git.txt:295
 #, priority:100
 msgid "The following are helper commands used by the above; end users typically do not use them directly."
-msgstr ""
-"A seguir, são apresentados os comandos auxiliares utilizados acima; os "
-"usuários finais normalmente não os utilizam diretamente."
+msgstr "A seguir, são apresentados os comandos auxiliares utilizados acima; os usuários finais normalmente não os utilizam diretamente."
 
 #. type: Title ~
 #: en/git.txt:300
@@ -64021,9 +55385,7 @@ msgstr "Comandos auxiliares internos"
 #: en/git.txt:304
 #, priority:100
 msgid "These are internal helper commands used by other commands; end users typically do not use them directly."
-msgstr ""
-"Estes são comandos auxiliares internos usados por outros comandos; os "
-"usuários finais normalmente não os utilizam diretamente."
+msgstr "Estes são comandos auxiliares internos usados por outros comandos; os usuários finais normalmente não os utilizam diretamente."
 
 #. type: Title -
 #: en/git.txt:309
@@ -64035,9 +55397,7 @@ msgstr "Mecanismo de Configuração"
 #: en/git.txt:314
 #, priority:100
 msgid "Git uses a simple text format to store customizations that are per repository and are per user.  Such a configuration file may look like this:"
-msgstr ""
-"O Git utiliza um formato de texto simples para armazenar as personalizações "
-"por repositório e por usuário.  Tal arquivo de configuração pode ficar assim:"
+msgstr "O Git utiliza um formato de texto simples para armazenar as personalizações por repositório e por usuário.  Tal arquivo de configuração pode ficar assim:"
 
 #. type: delimited block -
 #: en/git.txt:319
@@ -64111,11 +55471,7 @@ msgstr "Indica um nome de um objeto commit."
 #: en/git.txt:356
 #, priority:100
 msgid "Indicates a tree, commit or tag object name.  A command that takes a <tree-ish> argument ultimately wants to operate on a <tree> object but automatically dereferences <commit> and <tag> objects that point at a <tree>."
-msgstr ""
-"Indica uma árvore, nome de um objeto commit ou tag.  Um comando que aceite "
-"um argumento <commit-ish> e queira operar em um objeto <commit>, porém "
-"remove a referência automaticamente dos objetos <tag> que apontem para um "
-"<commit>."
+msgstr "Indica uma árvore, nome de um objeto commit ou tag.  Um comando que aceite um argumento <commit-ish> e queira operar em um objeto <commit>, porém remove a referência automaticamente dos objetos <tag> que apontem para um <commit>."
 
 #. type: Labeled list
 #: en/git.txt:357
@@ -64127,26 +55483,19 @@ msgstr "<commit-ish>"
 #: en/git.txt:362
 #, priority:100
 msgid "Indicates a commit or tag object name.  A command that takes a <commit-ish> argument ultimately wants to operate on a <commit> object but automatically dereferences <tag> objects that point at a <commit>."
-msgstr ""
-"Indica um nome do objeto commit ou tag.  Um comando que aceita um argumento "
-"<commit-ish> e queira operar em um objeto <commit>, porém remove a "
-"referência automaticamente dos objetos <tag> que apontem para um <commit>."
+msgstr "Indica um nome do objeto commit ou tag.  Um comando que aceita um argumento <commit-ish> e queira operar em um objeto <commit>, porém remove a referência automaticamente dos objetos <tag> que apontem para um <commit>."
 
 #. type: Plain text
 #: en/git.txt:366
 #, priority:100
 msgid "Indicates that an object type is required.  Currently one of: `blob`, `tree`, `commit`, or `tag`."
-msgstr ""
-"Indica que um tipo do objeto seja necessário.  Atualmente um dos: `blob`, "
-"`tree`, `commit`, ou `tag`."
+msgstr "Indica que um tipo do objeto seja necessário.  Atualmente um dos: `blob`, `tree`, `commit`, ou `tag`."
 
 #. type: Plain text
 #: en/git.txt:370
 #, priority:100
 msgid "Indicates a filename - almost always relative to the root of the tree structure `GIT_INDEX_FILE` describes."
-msgstr ""
-"Indica um nome do arquivo - quase sempre em relação à raiz da estrutura da "
-"árvore que o `GIT_INDEX_FILE` descreve."
+msgstr "Indica um nome do arquivo - quase sempre em relação à raiz da estrutura da árvore que o `GIT_INDEX_FILE` descreve."
 
 #. type: Title -
 #: en/git.txt:372
@@ -64158,9 +55507,7 @@ msgstr "Identificadores Simbólicos"
 #: en/git.txt:375
 #, priority:100
 msgid "Any Git command accepting any <object> can also use the following symbolic notation:"
-msgstr ""
-"Qualquer comando Git que aceite qualquer <objeto> também pode utilizar a "
-"seguinte notação simbólica:"
+msgstr "Qualquer comando Git que aceite qualquer <objeto> também pode utilizar a seguinte notação simbólica:"
 
 #. type: Plain text
 #: en/git.txt:378
@@ -64178,16 +55525,13 @@ msgstr "<tag>"
 #: en/git.txt:382
 #, priority:100
 msgid "a valid tag 'name' (i.e. a `refs/tags/<tag>` reference)."
-msgstr ""
-"uma tag válida 'nome' (como, por exemplo, uma referência `refs/tags/<tag>`)."
+msgstr "uma tag válida 'nome' (como, por exemplo, uma referência `refs/tags/<tag>`)."
 
 #. type: Plain text
 #: en/git.txt:386
 #, priority:100
 msgid "a valid head 'name' (i.e. a `refs/heads/<head>` reference)."
-msgstr ""
-"um cabeçalho válido 'nome' (como, por exemplo, uma referência `refs/heads/"
-"<head>`)."
+msgstr "um cabeçalho válido 'nome' (como, por exemplo, uma referência `refs/heads/<head>`)."
 
 #. type: Plain text
 #: en/git.txt:389
@@ -64217,9 +55561,7 @@ msgstr "Para mais detalhes sobre cada gancho, consulte linkgit:githooks[5]."
 #: en/git.txt:400
 #, priority:100
 msgid "Higher level SCMs may provide and manage additional information in the `$GIT_DIR`."
-msgstr ""
-"Os SCMs de alto nível podem fornecer e gerenciar informações adicionais no "
-"`$GIT_DIR`."
+msgstr "Os SCMs de alto nível podem fornecer e gerenciar informações adicionais no `$GIT_DIR`."
 
 #. type: Title -
 #: en/git.txt:403
@@ -64249,11 +55591,7 @@ msgstr "O Repositório Git"
 #: en/git.txt:416
 #, priority:100
 msgid "These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above Git so take care if using a foreign front-end."
-msgstr ""
-"Essas variáveis de ambiente se aplicam a 'todos' os comandos principais do "
-"Git. Nb: é importante notar que eles podem ser usados/substituídos pelo SCMS "
-"acima do Git, portanto, tenha cuidado caso esteja usando um front-end "
-"externo."
+msgstr "Essas variáveis de ambiente se aplicam a 'todos' os comandos principais do Git. Nb: é importante notar que eles podem ser usados/substituídos pelo SCMS acima do Git, portanto, tenha cuidado caso esteja usando um front-end externo."
 
 #. type: Labeled list
 #: en/git.txt:417
@@ -64265,9 +55603,7 @@ msgstr "`GIT_INDEX_FILE`"
 #: en/git.txt:421
 #, priority:100
 msgid "This environment allows the specification of an alternate index file. If not specified, the default of `$GIT_DIR/index` is used."
-msgstr ""
-"Este ambiente permite a definição de um arquivo índice alternativo. Caso não "
-"seja definido, a predefinição do `$GIT_DIR/index` é utilizado."
+msgstr "Este ambiente permite a definição de um arquivo índice alternativo. Caso não seja definido, a predefinição do `$GIT_DIR/index` é utilizado."
 
 #. type: Labeled list
 #: en/git.txt:422
@@ -64291,10 +55627,7 @@ msgstr "`GIT_OBJECT_DIRECTORY`"
 #: en/git.txt:433
 #, priority:100
 msgid "If the object storage directory is specified via this environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
-msgstr ""
-"Caso o diretório de armazenamento dos objetos seja informado através desta "
-"variável de ambiente, os diretórios sha1 serão criados embaixo - caso "
-"contrário, o diretório predefinido `$GIT_DIR/objects` será utilizado."
+msgstr "Caso o diretório de armazenamento dos objetos seja informado através desta variável de ambiente, os diretórios sha1 serão criados embaixo - caso contrário, o diretório predefinido `$GIT_DIR/objects` será utilizado."
 
 #. type: Labeled list
 #: en/git.txt:434
@@ -64306,23 +55639,13 @@ msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
 #: en/git.txt:440
 #, priority:100
 msgid "Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a \":\" separated (on Windows \";\" separated) list of Git object directories which can be used to search for Git objects. New objects will not be written to these directories."
-msgstr ""
-"Devido à natureza imutável dos objetos Git, os objetos antigos podem ser "
-"arquivados em diretórios compartilhados com somente leitura apenas. Esta "
-"variável especifica uma lista \":\" separada (no Windows \";\") dos "
-"diretórios dos objetos Git que podem ser utilizados para localizar objetos "
-"Git. Os novos objetos não serão gravados nestes diretórios."
+msgstr "Devido à natureza imutável dos objetos Git, os objetos antigos podem ser arquivados em diretórios compartilhados com somente leitura apenas. Esta variável especifica uma lista \":\" separada (no Windows \";\") dos diretórios dos objetos Git que podem ser utilizados para localizar objetos Git. Os novos objetos não serão gravados nestes diretórios."
 
 #. type: Plain text
 #: en/git.txt:446
 #, priority:100
 msgid "Entries that begin with `\"` (double-quote) will be interpreted as C-style quoted paths, removing leading and trailing double-quotes and respecting backslash escapes. E.g., the value `\"path-with-\\\"-and-:-in-it\":vanilla-path` has two paths: `path-with-\"-and-:-in-it` and `vanilla-path`."
-msgstr ""
-"As entradas que começam com `\"` (aspas duplas) serão interpretadas como "
-"caminhos entre as aspas no estilo C, removendo as aspas duplas iniciais e "
-"finais, respeitando as escapes da barra invertida. Como por exemplo, o valor "
-"`\"path-with-\\\"-and-:-in-it\":vanilla-path` possuí dois caminhos: `path-"
-"with-\"-and-:-in-it` e `vanilla-path`."
+msgstr "As entradas que começam com `\"` (aspas duplas) serão interpretadas como caminhos entre as aspas no estilo C, removendo as aspas duplas iniciais e finais, respeitando as escapes da barra invertida. Como por exemplo, o valor `\"path-with-\\\"-and-:-in-it\":vanilla-path` possuí dois caminhos: `path-with-\"-and-:-in-it` e `vanilla-path`."
 
 #. type: Labeled list
 #: en/git.txt:447
@@ -64334,11 +55657,7 @@ msgstr "`GIT_DIR`"
 #: en/git.txt:452
 #, priority:100
 msgid "If the `GIT_DIR` environment variable is set then it specifies a path to use instead of the default `.git` for the base of the repository.  The `--git-dir` command-line option also sets this value."
-msgstr ""
-"Caso a variável de ambiente `GIT_DIR` esteja definida, ela definirá um "
-"caminho que será utilizado em vez do `.git` predefinido como sendo a base do "
-"repositório.  A opção da linha de comando `--git-dir` também define este "
-"valor."
+msgstr "Caso a variável de ambiente `GIT_DIR` esteja definida, ela definirá um caminho que será utilizado em vez do `.git` predefinido como sendo a base do repositório.  A opção da linha de comando `--git-dir` também define este valor."
 
 #. type: Labeled list
 #: en/git.txt:453
@@ -64350,10 +55669,7 @@ msgstr "`GIT_WORK_TREE`"
 #: en/git.txt:457
 #, priority:100
 msgid "Set the path to the root of the working tree.  This can also be controlled by the `--work-tree` command-line option and the core.worktree configuration variable."
-msgstr ""
-"Defina o caminho para a raiz da árvore de trabalho.  Isso também pode ser "
-"controlado pela opção da linha de comando `--work-tree` e pela variável de "
-"configuração `core.worktree`."
+msgstr "Defina o caminho para a raiz da árvore de trabalho.  Isso também pode ser controlado pela opção da linha de comando `--work-tree` e pela variável de configuração `core.worktree`."
 
 #. type: Labeled list
 #: en/git.txt:458
@@ -64365,10 +55681,7 @@ msgstr "`GIT_NAMESPACE`"
 #: en/git.txt:461
 #, priority:100
 msgid "Set the Git namespace; see linkgit:gitnamespaces[7] for details.  The `--namespace` command-line option also sets this value."
-msgstr ""
-"Define o espaço de nomes no Git; para mais detalhes consulte "
-"linkgit:gitnamespaces[7].  A opção da linha de comando `--namespace` também "
-"define este valor."
+msgstr "Define o espaço de nomes no Git; para mais detalhes consulte linkgit:gitnamespaces[7].  A opção da linha de comando `--namespace` também define este valor."
 
 #. type: Labeled list
 #: en/git.txt:462
@@ -64380,19 +55693,7 @@ msgstr "`GIT_CEILING_DIRECTORIES`"
 #: en/git.txt:476
 #, priority:100
 msgid "This should be a colon-separated list of absolute paths.  If set, it is a list of directories that Git should not chdir up into while looking for a repository directory (useful for excluding slow-loading network directories).  It will not exclude the current working directory or a GIT_DIR set on the command line or in the environment.  Normally, Git has to read the entries in this list and resolve any symlink that might be present in order to compare them with the current directory.  However, if even this access is slow, you can add an empty entry to the list to tell Git that the subsequent entries are not symlinks and needn't be resolved; e.g., `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
-msgstr ""
-"Essa deve ser uma lista separada por dois pontos com caminhos absolutos.  "
-"Caso seja definido, é uma lista dos diretórios onde o Git não deve mudar de "
-"diretório (chdir) enquanto procura um diretório do repositório (útil para "
-"excluir os diretórios da rede com carregamento lento).  Ele não excluirá o "
-"diretório de trabalho atual, um `GIT_DIR` definido na linha de comandos ou "
-"no ambiente.  Normalmente, o Git precisa ler as entradas nesta lista e "
-"resolver qualquer link simbólico que possa estar presente para compará-las "
-"com o diretório atual.  No entanto, mesmo que esse acesso seja lento, você "
-"pode adicionar uma entrada vazia à lista para informar ao Git que as "
-"entradas subsequentes não são links simbólicos e não precisam ser resolvidos;"
-" como, por exemplo, `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/"
-"symlink`."
+msgstr "Essa deve ser uma lista separada por dois pontos com caminhos absolutos.  Caso seja definido, é uma lista dos diretórios onde o Git não deve mudar de diretório (chdir) enquanto procura um diretório do repositório (útil para excluir os diretórios da rede com carregamento lento).  Ele não excluirá o diretório de trabalho atual, um `GIT_DIR` definido na linha de comandos ou no ambiente.  Normalmente, o Git precisa ler as entradas nesta lista e resolver qualquer link simbólico que possa estar presente para compará-las com o diretório atual.  No entanto, mesmo que esse acesso seja lento, você pode adicionar uma entrada vazia à lista para informar ao Git que as entradas subsequentes não são links simbólicos e não precisam ser resolvidos; como, por exemplo, `GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
 
 #. type: Labeled list
 #: en/git.txt:477
@@ -64404,15 +55705,7 @@ msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
 #: en/git.txt:486
 #, priority:100
 msgid "When run in a directory that does not have \".git\" repository directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries.  This environment variable can be set to true to tell Git not to stop at filesystem boundaries.  Like `GIT_CEILING_DIRECTORIES`, this will not affect an explicit repository directory set via `GIT_DIR` or on the command line."
-msgstr ""
-"Quando executado em um diretório que não possui o diretório do repositório \""
-".git\", o Git tenta encontrar esse diretório nos diretórios pais para "
-"encontrar o cume da árvore de trabalho, porém, é predefinido que, ele não "
-"cruze os limites do sistema de arquivos.  Essa variável de ambiente pode ser "
-"configurada como 'true' para dizer ao Git para não parar nos limites do "
-"sistema de arquivos.  Como o `GIT_CEILING_DIRECTORIES`, isso não afetará "
-"explicitamente um diretório do repositório definido através do `GIT_DIR` ou "
-"na linha de comando."
+msgstr "Quando executado em um diretório que não possui o diretório do repositório \".git\", o Git tenta encontrar esse diretório nos diretórios pais para encontrar o cume da árvore de trabalho, porém, é predefinido que, ele não cruze os limites do sistema de arquivos.  Essa variável de ambiente pode ser configurada como 'true' para dizer ao Git para não parar nos limites do sistema de arquivos.  Como o `GIT_CEILING_DIRECTORIES`, isso não afetará explicitamente um diretório do repositório definido através do `GIT_DIR` ou na linha de comando."
 
 #. type: Labeled list
 #: en/git.txt:487
@@ -64424,14 +55717,7 @@ msgstr "`GIT_COMMON_DIR`"
 #: en/git.txt:495
 #, ignore-ellipsis, priority:100
 msgid "If this variable is set to a path, non-worktree files that are normally in $GIT_DIR will be taken from this path instead. Worktree-specific files such as HEAD or index are taken from $GIT_DIR. See linkgit:gitrepository-layout[5] and linkgit:git-worktree[1] for details. This variable has lower precedence than other path variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY..."
-msgstr ""
-"Se essa variável estiver definida para um caminho, os arquivos que não são "
-"da árvore de trabalho, estão normalmente estão em $GIT_DIR e serão obtidos "
-"desse caminho. Os arquivos específicos da árvore de trabalho, como `HEAD` ou "
-"índice serão obtidos de $GIT_DIR. Para mais detalhes consulte linkgit"
-":gitrepository-layout[5] e linkgit:git-worktree[1]. Essa variável tem "
-"precedência mais baixa do que outras variáveis de caminho como "
-"`GIT_INDEX_FILE`, `GIT_OBJECT_DIRECTORY`..."
+msgstr "Se essa variável estiver definida para um caminho, os arquivos que não são da árvore de trabalho, estão normalmente estão em $GIT_DIR e serão obtidos desse caminho. Os arquivos específicos da árvore de trabalho, como `HEAD` ou índice serão obtidos de $GIT_DIR. Para mais detalhes consulte linkgit:gitrepository-layout[5] e linkgit:git-worktree[1]. Essa variável tem precedência mais baixa do que outras variáveis de caminho como `GIT_INDEX_FILE`, `GIT_OBJECT_DIRECTORY`..."
 
 #. type: Labeled list
 #: en/git.txt:496
@@ -64443,11 +55729,7 @@ msgstr "`GIT_DEFAULT_HASH`"
 #: en/git.txt:501
 #, priority:100
 msgid "If this variable is set, the default hash algorithm for new repositories will be set to this value. This value is currently ignored when cloning; the setting of the remote repository is used instead. The default is \"sha1\"."
-msgstr ""
-"Caso esta variável esteja definida, o algoritmo hash predefinido para os "
-"novos repositórios será definido com este valor. Este valor é atualmente "
-"ignorado durante a clonagem; em vez disso, a configuração do repositório "
-"remoto é utilizada. O valor predefinido é `sha1`."
+msgstr "Caso esta variável esteja definida, o algoritmo hash predefinido para os novos repositórios será definido com este valor. Este valor é atualmente ignorado durante a clonagem; em vez disso, a configuração do repositório remoto é utilizada. O valor predefinido é `sha1`."
 
 #. type: Title ~
 #: en/git.txt:503
@@ -64465,10 +55747,7 @@ msgstr "`GIT_AUTHOR_NAME`"
 #: en/git.txt:508
 #, priority:100
 msgid "The human-readable name used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `author.name` configuration settings."
-msgstr ""
-"O endereço legível do endereço de e-mail utilizado na identidade do autor ao "
-"criar os commits, na tag dos objetos ou ao gravar os reflogs. Substitui as "
-"definições de configuração `user.name` e `author.name`."
+msgstr "O endereço legível do endereço de e-mail utilizado na identidade do autor ao criar os commits, na tag dos objetos ou ao gravar os reflogs. Substitui as definições de configuração `user.name` e `author.name`."
 
 #. type: Labeled list
 #: en/git.txt:509
@@ -64480,10 +55759,7 @@ msgstr "`GIT_AUTHOR_EMAIL`"
 #: en/git.txt:513
 #, priority:100
 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `author.email` configuration settings."
-msgstr ""
-"O endereço de email utilizado na identidade do autor ao criar os commits, na "
-"marcação dos objetos ou ao gravar os reflogs. Substitui as definições da "
-"configuração `user.email` e `author.email`."
+msgstr "O endereço de email utilizado na identidade do autor ao criar os commits, na marcação dos objetos ou ao gravar os reflogs. Substitui as definições da configuração `user.email` e `author.email`."
 
 #. type: Labeled list
 #: en/git.txt:514
@@ -64507,10 +55783,7 @@ msgstr "`GIT_COMMITTER_NAME`"
 #: en/git.txt:522
 #, priority:100
 msgid "The human-readable name used in the committer identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.name` and `committer.name` configuration settings."
-msgstr ""
-"O endereço legível do nome utilizado na identidade do autor do commit ao "
-"criar os commits, na tag dos objetos ou ao gravar os reflogs. Substitui as "
-"definições de configuração `user.name` e `committer.name`."
+msgstr "O endereço legível do nome utilizado na identidade do autor do commit ao criar os commits, na tag dos objetos ou ao gravar os reflogs. Substitui as definições de configuração `user.name` e `committer.name`."
 
 #. type: Labeled list
 #: en/git.txt:523
@@ -64522,10 +55795,7 @@ msgstr "`GIT_COMMITTER_EMAIL`"
 #: en/git.txt:527
 #, priority:100
 msgid "The email address used in the author identity when creating commit or tag objects, or when writing reflogs. Overrides the `user.email` and `committer.email` configuration settings."
-msgstr ""
-"O endereço de email utilizado na identidade do autor ao criar os commits, na "
-"marcação dos objetos ou ao gravar os reflogs. Overrides the `user.email` and "
-"`committer.email` configuration settings."
+msgstr "O endereço de email utilizado na identidade do autor ao criar os commits, na marcação dos objetos ou ao gravar os reflogs. Overrides the `user.email` and `committer.email` configuration settings."
 
 #. type: Labeled list
 #: en/git.txt:528
@@ -64537,10 +55807,7 @@ msgstr "`GIT_COMMITTER_DATE`"
 #: en/git.txt:531
 #, priority:100
 msgid "The date used for the committer identity when creating commit or tag objects, or when writing reflogs. See linkgit:git-commit[1] for valid formats."
-msgstr ""
-"A data utilizada para a identidade de quem fez o commit durante a criação "
-"dos objetos as tags do commit ou ao gravar os reflogs. Para mais formatos "
-"válidos, consulte linkgit:git-commit[1]."
+msgstr "A data utilizada para a identidade de quem fez o commit durante a criação dos objetos as tags do commit ou ao gravar os reflogs. Para mais formatos válidos, consulte linkgit:git-commit[1]."
 
 #. type: Labeled list
 #: en/git.txt:532
@@ -64552,10 +55819,7 @@ msgstr "`EMAIL`"
 #: en/git.txt:535
 #, priority:100
 msgid "The email address used in the author and committer identities if no other relevant environment variable or configuration setting has been set."
-msgstr ""
-"O endereço de e-mail usado nas identidades do autor e do commit, caso "
-"nenhuma outra variável de ambiente ou da configuração relevante tiver sido "
-"definida."
+msgstr "O endereço de e-mail usado nas identidades do autor e do commit, caso nenhuma outra variável de ambiente ou da configuração relevante tiver sido definida."
 
 #. type: Title ~
 #: en/git.txt:537
@@ -64573,11 +55837,7 @@ msgstr "`GIT_DIFF_OPTS`"
 #: en/git.txt:543
 #, priority:100
 msgid "Only valid setting is \"--unified=??\" or \"-u??\" to set the number of context lines shown when a unified diff is created.  This takes precedence over any \"-U\" or \"--unified\" option value passed on the Git diff command line."
-msgstr ""
-"A única opção válida é \"--unified=??\" ou \"-u??\" para definir o número de "
-"linhas de contexto mostradas quando um diff unificado for criado.  Isso tem "
-"precedência sobre qualquer valor da opção \"-U\" ou \"--unified\" passado na "
-"linha de comando diff do Git."
+msgstr "A única opção válida é \"--unified=??\" ou \"-u??\" para definir o número de linhas de contexto mostradas quando um diff unificado for criado.  Isso tem precedência sobre qualquer valor da opção \"-U\" ou \"--unified\" passado na linha de comando diff do Git."
 
 #. type: Labeled list
 #: en/git.txt:544
@@ -64589,11 +55849,7 @@ msgstr "`GIT_EXTERNAL_DIFF`"
 #: en/git.txt:549
 #, priority:100
 msgid "When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named by it is called, instead of the diff invocation described above.  For a path that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 parameters:"
-msgstr ""
-"Quando a variável de ambiente `GIT_EXTERNAL_DIFF` é configurada, o programa "
-"informado nele é chamado, em vez do \"diff\" descrito acima.  Para um "
-"caminho que é adicionado, removido ou modificado, a variável "
-"`GIT_EXTERNAL_DIFF` é chamado com 7 parâmetros:"
+msgstr "Quando a variável de ambiente `GIT_EXTERNAL_DIFF` é configurada, o programa informado nele é chamado, em vez do \"diff\" descrito acima.  Para um caminho que é adicionado, removido ou modificado, a variável `GIT_EXTERNAL_DIFF` é chamado com 7 parâmetros:"
 
 #. type: Plain text
 #: en/git.txt:551
@@ -64653,29 +55909,19 @@ msgstr "são a representação octais dos modos dos arquivos."
 #: en/git.txt:564
 #, priority:100
 msgid "The file parameters can point at the user's working file (e.g. `new-file` in \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), or a temporary file (e.g. `old-file` in the index).  `GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits."
-msgstr ""
-"Os parâmetros do arquivo podem apontar para o arquivo de trabalho do usuário "
-"(`new-file` em \"git-diff-files\" por exemplo), `/dev/null` (`old-file` "
-"quando um novo arquivo for adicionado por exemplo) ou um arquivo temporário ("
-"um `arquivo antigo` no índice por exemplo).  A variável `GIT_EXTERNAL_DIFF` "
-"não deve se preocupar com o desvinculamento do arquivo temporário --- ele é "
-"removido quando a variável `GIT_EXTERNAL_DIFF` termina."
+msgstr "Os parâmetros do arquivo podem apontar para o arquivo de trabalho do usuário (`new-file` em \"git-diff-files\" por exemplo), `/dev/null` (`old-file` quando um novo arquivo for adicionado por exemplo) ou um arquivo temporário (um `arquivo antigo` no índice por exemplo).  A variável `GIT_EXTERNAL_DIFF` não deve se preocupar com o desvinculamento do arquivo temporário --- ele é removido quando a variável `GIT_EXTERNAL_DIFF` termina."
 
 #. type: Plain text
 #: en/git.txt:567
 #, priority:100
 msgid "For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, <path>."
-msgstr ""
-"Para um caminho que não foi mesclado, `GIT_EXTERNAL_DIFF` é chamado com 1 "
-"parâmetro, <caminho>."
+msgstr "Para um caminho que não foi mesclado, `GIT_EXTERNAL_DIFF` é chamado com 1 parâmetro, <caminho>."
 
 #. type: Plain text
 #: en/git.txt:570
 #, priority:100
 msgid "For each path `GIT_EXTERNAL_DIFF` is called, two environment variables, `GIT_DIFF_PATH_COUNTER` and `GIT_DIFF_PATH_TOTAL` are set."
-msgstr ""
-"Para cada caminho `GIT_EXTERNAL_DIFF` que é chamado, duas variáveis de "
-"ambiente,`GIT_DIFF_PATH_COUNTER` e `GIT_DIFF_PATH_TOTAL` são definidas."
+msgstr "Para cada caminho `GIT_EXTERNAL_DIFF` que é chamado, duas variáveis de ambiente,`GIT_DIFF_PATH_COUNTER` e `GIT_DIFF_PATH_TOTAL` são definidas."
 
 #. type: Labeled list
 #: en/git.txt:571
@@ -64723,10 +55969,7 @@ msgstr "`GIT_PAGER`"
 #: en/git.txt:589
 #, priority:100
 msgid "This environment variable overrides `$PAGER`. If it is set to an empty string or to the value \"cat\", Git will not launch a pager.  See also the `core.pager` option in linkgit:git-config[1]."
-msgstr ""
-"Essa variável de ambiente substitui o `$PAGER`. Caso esteja definido como "
-"uma string vazia ou com o valor \"cat\", o Git não iniciará um pager.  "
-"Consulte também a opção `core.askPass` no linkgit:git-config[1]."
+msgstr "Essa variável de ambiente substitui o `$PAGER`. Caso esteja definido como uma string vazia ou com o valor \"cat\", o Git não iniciará um pager.  Consulte também a opção `core.askPass` no linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git.txt:590
@@ -64738,9 +55981,7 @@ msgstr "`GIT_PROGRESS_DELAY`"
 #: en/git.txt:593
 #, priority:100
 msgid "A number controlling how many seconds to delay before showing optional progress indicators. Defaults to 2."
-msgstr ""
-"Um número que controla quantos segundos atrasar antes de mostrar os "
-"indicadores opcionais do progresso. A predefinição retorna para `2`."
+msgstr "Um número que controla quantos segundos atrasar antes de mostrar os indicadores opcionais do progresso. A predefinição retorna para `2`."
 
 #. type: Labeled list
 #: en/git.txt:594
@@ -64752,11 +55993,7 @@ msgstr "`GIT_EDITOR`"
 #: en/git.txt:599
 #, priority:100
 msgid "This environment variable overrides `$EDITOR` and `$VISUAL`.  It is used by several Git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]."
-msgstr ""
-"Essa variável de ambiente substitui o `$EDITOR` e o `$VISUAL`.  É usado por "
-"vários comandos Git quando, no modo interativo, um editor deve ser iniciado. "
-"Consulte também linkgit:git-var[1] e a opção `core.editor` no linkgit:git-"
-"config[1]."
+msgstr "Essa variável de ambiente substitui o `$EDITOR` e o `$VISUAL`.  É usado por vários comandos Git quando, no modo interativo, um editor deve ser iniciado. Consulte também linkgit:git-var[1] e a opção `core.editor` no linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git.txt:600
@@ -64774,33 +56011,19 @@ msgstr "`GIT_SSH_COMMAND`"
 #: en/git.txt:608
 #, priority:100
 msgid "If either of these environment variables is set then 'git fetch' and 'git push' will use the specified command instead of 'ssh' when they need to connect to a remote system.  The command-line parameters passed to the configured command are determined by the ssh variant.  See `ssh.variant` option in linkgit:git-config[1] for details."
-msgstr ""
-"Caso alguma destas variáveis de ambiente esteja definida, o comando 'git "
-"fetch' e o 'git push' utilizarão o comando informado em vez do 'ssh' quando "
-"precisarem se conectar com um sistema remoto.  Os parâmetros da linha de "
-"comando passados para o comando configurado, são determinados pela variante "
-"'ssh'.  Para mais detalhesm consulte a opção de configuração `ssh.variant` "
-"no linkgit:git-config[1]."
+msgstr "Caso alguma destas variáveis de ambiente esteja definida, o comando 'git fetch' e o 'git push' utilizarão o comando informado em vez do 'ssh' quando precisarem se conectar com um sistema remoto.  Os parâmetros da linha de comando passados para o comando configurado, são determinados pela variante 'ssh'.  Para mais detalhesm consulte a opção de configuração `ssh.variant` no linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/git.txt:614
 #, priority:100
 msgid "`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted by the shell, which allows additional arguments to be included.  `$GIT_SSH` on the other hand must be just the path to a program (which can be a wrapper shell script, if additional arguments are needed)."
-msgstr ""
-"A variável `$GIT_SSH_COMMAND` tem precedência sobre a variável `$GIT_SSH` "
-"que é interpretado pelo shell, permite que argumentos adicionais sejam "
-"incluídos.  A variável `$GIT_SSH`, por outro lado, deve ser apenas o caminho "
-"para um programa (que pode ser um script shell do wrapper, caso as opções "
-"adicionais sejam necessárias)."
+msgstr "A variável `$GIT_SSH_COMMAND` tem precedência sobre a variável `$GIT_SSH` que é interpretado pelo shell, permite que argumentos adicionais sejam incluídos.  A variável `$GIT_SSH`, por outro lado, deve ser apenas o caminho para um programa (que pode ser um script shell do wrapper, caso as opções adicionais sejam necessárias)."
 
 #. type: Plain text
 #: en/git.txt:618
 #, priority:100
 msgid "Usually it is easier to configure any desired options through your personal `.ssh/config` file.  Please consult your ssh documentation for further details."
-msgstr ""
-"Geralmente é mais fácil configurar as opções desejadas através do seu "
-"arquivo pessoal `.ssh/config`.  Consulte a documentação do ssh para obter "
-"mais detalhes."
+msgstr "Geralmente é mais fácil configurar as opções desejadas através do seu arquivo pessoal `.ssh/config`.  Consulte a documentação do ssh para obter mais detalhes."
 
 #. type: Labeled list
 #: en/git.txt:619
@@ -64812,11 +56035,7 @@ msgstr "`GIT_SSH_VARIANT`"
 #: en/git.txt:624
 #, priority:100
 msgid "If this environment variable is set, it overrides Git's autodetection whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, plink or tortoiseplink. This variable overrides the config setting `ssh.variant` that serves the same purpose."
-msgstr ""
-"Se esta variável de ambiente estiver configurada, ela substitui a detecção "
-"automática do Git, caso `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` se "
-"refere ao OpenSSH, plink ou tortoiseplink. Esta variável substitui a "
-"configuração `ssh.variant` que serve ao mesmo propósito."
+msgstr "Se esta variável de ambiente estiver configurada, ela substitui a detecção automática do Git, caso `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` se refere ao OpenSSH, plink ou tortoiseplink. Esta variável substitui a configuração `ssh.variant` que serve ao mesmo propósito."
 
 #. type: Labeled list
 #: en/git.txt:625
@@ -64828,12 +56047,7 @@ msgstr "`GIT_ASKPASS`"
 #: en/git.txt:631
 #, priority:100
 msgid "If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)  will call this program with a suitable prompt as command-line argument and read the password from its STDOUT. See also the `core.askPass` option in linkgit:git-config[1]."
-msgstr ""
-"Caso esta variável do ambiente esteja definida, os comandos Git que precisam "
-"obter as senhas ou as frases secretas (para a autenticação HTTP ou IMAP por "
-"exemplo) chamarão esse programa com um prompt adequado como argumento da "
-"linha de comando e irão ler a senha em seu STDOUT. Consulte também a opção "
-"`core.askPass` no linkgit:git-config[1]."
+msgstr "Caso esta variável do ambiente esteja definida, os comandos Git que precisam obter as senhas ou as frases secretas (para a autenticação HTTP ou IMAP por exemplo) chamarão esse programa com um prompt adequado como argumento da linha de comando e irão ler a senha em seu STDOUT. Consulte também a opção `core.askPass` no linkgit:git-config[1]."
 
 #. type: Labeled list
 #: en/git.txt:632
@@ -64845,9 +56059,7 @@ msgstr "`GIT_TERMINAL_PROMPT`"
 #: en/git.txt:635
 #, priority:100
 msgid "If this environment variable is set to `0`, git will not prompt on the terminal (e.g., when asking for HTTP authentication)."
-msgstr ""
-"Caso esta variável de ambiente esteja definida como `0`, o git não será "
-"solicitado no terminal (ao solicitar uma autenticação HTTP por exemplo)."
+msgstr "Caso esta variável de ambiente esteja definida como `0`, o git não será solicitado no terminal (ao solicitar uma autenticação HTTP por exemplo)."
 
 #. type: Labeled list
 #: en/git.txt:636
@@ -64859,14 +56071,7 @@ msgstr "`GIT_CONFIG_NOSYSTEM`"
 #: en/git.txt:643
 #, priority:100
 msgid "Whether to skip reading settings from the system-wide `$(prefix)/etc/gitconfig` file.  This environment variable can be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for a picky script, or you can set it temporarily to avoid using a buggy `/etc/gitconfig` file while waiting for someone with sufficient permissions to fix it."
-msgstr ""
-"Independente se você ignore as configurações de leitura do arquivo "
-"`$(prefix)/etc/gitconfig` do sistema.  Essa variável de ambiente pode ser "
-"usada junto com `$HOME` e o `$XDG_CONFIG_HOME` para criar um ambiente "
-"previsível para um script exigente, ou você pode configurá-la "
-"temporariamente para evitar o uso de um arquivo `/etc/gitconfig` com "
-"problemas, enquanto aguarda alguém com permissões suficientes para corrigi-"
-"lo."
+msgstr "Independente se você ignore as configurações de leitura do arquivo `$(prefix)/etc/gitconfig` do sistema.  Essa variável de ambiente pode ser usada junto com `$HOME` e o `$XDG_CONFIG_HOME` para criar um ambiente previsível para um script exigente, ou você pode configurá-la temporariamente para evitar o uso de um arquivo `/etc/gitconfig` com problemas, enquanto aguarda alguém com permissões suficientes para corrigi-lo."
 
 #. type: Labeled list
 #: en/git.txt:644
@@ -64888,19 +56093,15 @@ msgid ""
 "not set, Git will choose buffered or record-oriented flushing\n"
 "based on whether stdout appears to be redirected to a file or not.\n"
 msgstr ""
-"Caso esta variável de ambiente estiver definida como \"1\", então os "
-"comandos\n"
+"Caso esta variável de ambiente estiver definida como \"1\", então os comandos\n"
 "como 'git blame' (no modo incremental), 'git rev-list', 'git log',\n"
 "'git check-attr' e 'git check-ignore' serão\n"
 "impor uma descarga do fluxo gerado depois que cada registro tenham sido\n"
 "esvaziado. Se essa\n"
 "variável for definida como '0', a saída destes comandos será feita\n"
-"utilizando toda a E/S na memória intermédia (buffer).   Se essa variável de "
-"ambiente não\n"
-"seja definida, o Git escolherá a descarga em uma memória intermédia ou "
-"orientada no\n"
-"esvaziamento dos registros, para ver se o stdout parece ter sido "
-"redirecionado para um arquivo ou não.\n"
+"utilizando toda a E/S na memória intermédia (buffer).   Se essa variável de ambiente não\n"
+"seja definida, o Git escolherá a descarga em uma memória intermédia ou orientada no\n"
+"esvaziamento dos registros, para ver se o stdout parece ter sido redirecionado para um arquivo ou não.\n"
 
 #. type: Labeled list
 #: en/git.txt:655
@@ -64912,46 +56113,31 @@ msgstr "`GIT_TRACE`"
 #: en/git.txt:658
 #, priority:100
 msgid "Enables general trace messages, e.g. alias expansion, built-in command execution and external command execution."
-msgstr ""
-"Ativa o rastreio geral das mensagens, como por exemplo expansão do "
-"pseudônimo, execução interna dos comandos e a execução externa dos comandos."
+msgstr "Ativa o rastreio geral das mensagens, como por exemplo expansão do pseudônimo, execução interna dos comandos e a execução externa dos comandos."
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
-msgstr ""
-"Caso esta variável esteja definida como `1`, `2` ou `true` (a comparação não "
-"diferencia as maiúsculas das minúsculas), as mensagens de rastreio serão "
-"impressas no stderr."
+msgstr "Caso esta variável esteja definida como `1`, `2` ou `true` (a comparação não diferencia as maiúsculas das minúsculas), as mensagens de rastreio serão impressas no stderr."
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
-msgstr ""
-"Caso a variável seja configurada com um valor inteiro maior que 2 e menor "
-"que 10 (estritamente), o Git interpretará este valor como um descritor de "
-"arquivo aberto e tentará gravar as mensagens de monitoramento neste "
-"descritor do arquivo."
+msgstr "Caso a variável seja configurada com um valor inteiro maior que 2 e menor que 10 (estritamente), o Git interpretará este valor como um descritor de arquivo aberto e tentará gravar as mensagens de monitoramento neste descritor do arquivo."
 
 #. type: Plain text
 #: en/git.txt:672
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it."
-msgstr ""
-"Como alternativa, caso a variável estiver definida como um caminho absoluto ("
-"começando com um caractere '/'), o Git interpretará isso como um caminho do "
-"arquivo e tentará anexar as mensagens de rastreio nelas."
+msgstr "Como alternativa, caso a variável estiver definida como um caminho absoluto (começando com um caractere '/'), o Git interpretará isso como um caminho do arquivo e tentará anexar as mensagens de rastreio nelas."
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
-msgstr ""
-"Desativar a variável ou defini-la como vazia '0' ou 'false' (não faz "
-"distinção entre maiúsculas e minúsculas) desativa as mensagens de "
-"monitoramento."
+msgstr "Desativar a variável ou defini-la como vazia '0' ou 'false' (não faz distinção entre maiúsculas e minúsculas) desativa as mensagens de monitoramento."
 
 #. type: Labeled list
 #: en/git.txt:676
@@ -64963,10 +56149,7 @@ msgstr "`GIT_TRACE_FSMONITOR`"
 #: en/git.txt:679
 #, priority:100
 msgid "Enables trace messages for the filesystem monitor extension.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Ativa as mensagens de rastreamento para a extensão do monitor do sistema de "
-"arquivos.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio "
-"disponíveis."
+msgstr "Ativa as mensagens de rastreamento para a extensão do monitor do sistema de arquivos.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:680
@@ -64978,12 +56161,7 @@ msgstr "`GIT_TRACE_PACK_ACCESS`"
 #: en/git.txt:686
 #, priority:100
 msgid "Enables trace messages for all accesses to any packs. For each access, the pack file name and an offset in the pack is recorded. This may be helpful for troubleshooting some pack-related performance problems.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Permite rastrear as mensagens para todos os acessos para qualquer pacote. "
-"Para cada acesso, é registrado o nome do arquivo do pacote e um 'offset'. "
-"Pode ser útil para solucionar alguns problemas de desempenho relacionados ao "
-"pacote.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio "
-"disponíveis."
+msgstr "Permite rastrear as mensagens para todos os acessos para qualquer pacote. Para cada acesso, é registrado o nome do arquivo do pacote e um 'offset'. Pode ser útil para solucionar alguns problemas de desempenho relacionados ao pacote.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:687
@@ -64995,13 +56173,7 @@ msgstr "`GIT_TRACE_PACKET`"
 #: en/git.txt:693
 #, priority:100
 msgid "Enables trace messages for all packets coming in or out of a given program. This can help with debugging object negotiation or other protocol issues. Tracing is turned off at a packet starting with \"PACK\" (but see `GIT_TRACE_PACKFILE` below).  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Ativa o rastreio das mensagens para todos os pacotes que entram ou saem de "
-"um determinado programa. Isso pode ajudar na depuração da negociação dos "
-"objetos ou de outros problemas de protocolo. O rastreamento é desativado em "
-"um pacote que comece com \"PACK\" (porém consulte `GIT_TRACE_PACKFILE` "
-"abaixo).  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio "
-"disponíveis."
+msgstr "Ativa o rastreio das mensagens para todos os pacotes que entram ou saem de um determinado programa. Isso pode ajudar na depuração da negociação dos objetos ou de outros problemas de protocolo. O rastreamento é desativado em um pacote que comece com \"PACK\" (porém consulte `GIT_TRACE_PACKFILE` abaixo).  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:694
@@ -65013,21 +56185,13 @@ msgstr "`GIT_TRACE_PACKFILE`"
 #: en/git.txt:701
 #, priority:100
 msgid "Enables tracing of packfiles sent or received by a given program. Unlike other trace output, this trace is verbatim: no headers, and no quoting of binary data. You almost certainly want to direct into a file (e.g., `GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal or mixing it with other trace output."
-msgstr ""
-"Permite o monitoramento dos arquivos dos pacotes enviados ou recebidos "
-"através de um determinado programa. Diferente de outras saídas monitoradas, "
-"esse monitoramento é literalmente: sem cabeçalhos e sem a citação dos dados "
-"binários. Você quase que certamente vai querer direcionar para um arquivo "
-"(`GIT_TRACE_PACKFILE=/tmp/my.pack` por exemplo) em vez de exibi-lo no "
-"terminal ou misturá-lo com uma outra saída monitorada."
+msgstr "Permite o monitoramento dos arquivos dos pacotes enviados ou recebidos através de um determinado programa. Diferente de outras saídas monitoradas, esse monitoramento é literalmente: sem cabeçalhos e sem a citação dos dados binários. Você quase que certamente vai querer direcionar para um arquivo (`GIT_TRACE_PACKFILE=/tmp/my.pack` por exemplo) em vez de exibi-lo no terminal ou misturá-lo com uma outra saída monitorada."
 
 #. type: Plain text
 #: en/git.txt:704
 #, priority:100
 msgid "Note that this is currently only implemented for the client side of clones and fetches."
-msgstr ""
-"Observe que atualmente isso é implementado apenas para o lado do cliente dos "
-"clones e das buscas."
+msgstr "Observe que atualmente isso é implementado apenas para o lado do cliente dos clones e das buscas."
 
 #. type: Labeled list
 #: en/git.txt:705
@@ -65039,10 +56203,7 @@ msgstr "`GIT_TRACE_PERFORMANCE`"
 #: en/git.txt:709
 #, priority:100
 msgid "Enables performance related trace messages, e.g. total execution time of each Git command.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Ativa as mensagens de rastreamento relacionadas ao desempenho, como por "
-"exemplo, o tempo total da execução de cada comando Git.  Consulte `GIT_TRACE`"
-" para conhecer opções de saída de rastreio disponíveis."
+msgstr "Ativa as mensagens de rastreamento relacionadas ao desempenho, como por exemplo, o tempo total da execução de cada comando Git.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:710
@@ -65054,11 +56215,7 @@ msgstr "`GIT_TRACE_SETUP`"
 #: en/git.txt:714
 #, priority:100
 msgid "Enables trace messages printing the .git, working tree and current working directory after Git has completed its setup phase.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Permite que as mensagens de rastreamento imprimam o .git, a árvore de "
-"trabalho e o diretório de trabalho atual após o Git concluir a sua fase de "
-"configuração.  Consulte `GIT_TRACE` para conhecer opções de saída de "
-"rastreio disponíveis."
+msgstr "Permite que as mensagens de rastreamento imprimam o .git, a árvore de trabalho e o diretório de trabalho atual após o Git concluir a sua fase de configuração.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:715
@@ -65070,10 +56227,7 @@ msgstr "`GIT_TRACE_SHALLOW`"
 #: en/git.txt:719
 #, priority:100
 msgid "Enables trace messages that can help debugging fetching / cloning of shallow repositories.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Ativa o rastreio das mensagens que podem ajudar na depuração da busca/"
-"clonagem dos repositórios rasos.  Consulte `GIT_TRACE` para conhecer opções "
-"de saída de rastreio disponíveis."
+msgstr "Ativa o rastreio das mensagens que podem ajudar na depuração da busca/clonagem dos repositórios rasos.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
 #: en/git.txt:720
@@ -65082,563 +56236,395 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
-#, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
-msgstr ""
-"Permite um rastreamento curl completo de todos os dados que foram recebidos "
-"e enviados, incluindo as informações descritivas, do protocolo de transporte "
-"git.  É semelhante a fazer curl `--trace-ascii` na linha de comando.  Esta "
-"opção substitui a configuração da variável de ambiente `GIT_CURL_VERBOSE`.  "
-"Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
+#: en/git.txt:725
+#, fuzzy, priority:100
+#| msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
+msgstr "Permite um rastreamento curl completo de todos os dados que foram recebidos e enviados, incluindo as informações descritivas, do protocolo de transporte git.  É semelhante a fazer curl `--trace-ascii` na linha de comando.  Esta opção substitui a configuração da variável de ambiente `GIT_CURL_VERBOSE`.  Consulte `GIT_TRACE` para conhecer opções de saída de rastreio disponíveis."
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
-msgstr ""
-"Quando um rastreamento curl está ativado (consulte `GIT_TRACE_CURL` acima), "
-"não despeje os dados (ou seja, apenas despeje as linhas de informações e os "
-"cabeçalhos)."
+msgstr "Quando um rastreamento curl está ativado (consulte `GIT_TRACE_CURL` acima), não despeje os dados (ou seja, apenas despeje as linhas de informações e os cabeçalhos)."
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
-msgstr ""
-"Permite mensagens de rastreamento com mais detalhes través da biblioteca "
-"\"trace2\".  A saída do `GIT_TRACE2` é um formato simples de texto para "
-"facilitar a leitura das pessoas."
+msgstr "Permite mensagens de rastreamento com mais detalhes través da biblioteca \"trace2\".  A saída do `GIT_TRACE2` é um formato simples de texto para facilitar a leitura das pessoas."
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr "Alternativamente, caso a variável esteja definida como um caminho absoluto (começando com um caractere '/'), Git interpretará isso como um caminho de arquivo e tentará anexar as mensagens de rastreamento a ela.  Caso o caminho já exista e for um diretório, as mensagens de rastreamento serão gravadas em arquivos (uma por processo) nesse diretório, nomeada de acordo com o último componente do SID e um contador opcional (para evitar colisões de nome de arquivo)."
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
-msgstr ""
-"Além disso, caso a variável esteja definida como `af_unix:[<socket_type"
-">:]<caminho-absoluto>`, o Git tentará abrir o caminho como um soquete de "
-"domínio Unix.  O tipo de soquete pode ser `stream` ou `dgram`."
+msgstr "Além disso, caso a variável esteja definida como `af_unix:[<socket_type>:]<caminho-absoluto>`, o Git tentará abrir o caminho como um soquete de domínio Unix.  O tipo de soquete pode ser `stream` ou `dgram`."
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
-msgstr ""
-"Para mais detalhes, consulte link:technical/api-trace2.html[Trace2 "
-"documentation]."
+msgstr "Para mais detalhes, consulte link:technical/api-trace2.html[Trace2 documentation]."
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
-msgstr ""
-"Esta configuração registra um formato com base no JSON que é adequado para a "
-"interpretação da máquina.  Consulte `GIT_TRACE2` para conhecer as opções "
-"disponíveis para o monitoramento e o link:technical/api-trace2.html ["
-"documentação do Trace2] para obter todos os detalhes."
+msgstr "Esta configuração registra um formato com base no JSON que é adequado para a interpretação da máquina.  Consulte `GIT_TRACE2` para conhecer as opções disponíveis para o monitoramento e o link:technical/api-trace2.html [documentação do Trace2] para obter todos os detalhes."
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
-msgstr ""
-"Além das mensagens texto disponíveis em `GIT_TRACE2`, esta configuração "
-"escreve o formato da base da coluna para compreender as regiões aninhadas.  "
-"Consulte `GIT_TRACE2` para conhecer as opções disponíveis para o "
-"monitoramento e o link:technical/api-trace2.html [documentação do Trace2] "
-"para obter todos os detalhes."
+msgstr "Além das mensagens texto disponíveis em `GIT_TRACE2`, esta configuração escreve o formato da base da coluna para compreender as regiões aninhadas.  Consulte `GIT_TRACE2` para conhecer as opções disponíveis para o monitoramento e o link:technical/api-trace2.html [documentação do Trace2] para obter todos os detalhes."
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
-"Isso pode ser definido como uma lista de sequências de texto separadas por "
-"vírgula. Quando um rastreamento curl é ativado (consulte `GIT_TRACE_CURL` "
-"acima), sempre que um cabeçalho \"Cookies:\" enviado pelo cliente é "
-"despejado, os valores dos cookies cuja chave está nesta lista (diferencia as "
-"maiúsculas das minúsculas) são redigidos."
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
-msgstr ""
-"Definir essa variável como `1` fará com que o Git trate todos os pathspecs "
-"de forma literal, e não como padrões glob. Como, por exemplo, a execução do `"
-"GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` procurará pelos commits que tocam "
-"no caminho `*.c` e não nos caminhos que coincidem com o agrupamento `*.c`. "
-"Você pode querer isso caso esteja alimentando caminhos literais para o Git ("
-"como, por exemplo, os caminhos informados anteriormente a você pelo `git ls-"
-"tree`, `--raw`, saída do diff, etc)."
+msgstr "Definir essa variável como `1` fará com que o Git trate todos os pathspecs de forma literal, e não como padrões glob. Como, por exemplo, a execução do `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` procurará pelos commits que tocam no caminho `*.c` e não nos caminhos que coincidem com o agrupamento `*.c`. Você pode querer isso caso esteja alimentando caminhos literais para o Git (como, por exemplo, os caminhos informados anteriormente a você pelo `git ls-tree`, `--raw`, saída do diff, etc)."
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
-msgstr ""
-"Definir essa variável como `1` fará com que o Git trate todos os pathspecs "
-"como padrões \"glob\" (também informados como \"glob\" mágico)."
+msgstr "Definir essa variável como `1` fará com que o Git trate todos os pathspecs como padrões \"glob\" (também informados como \"glob\" mágico)."
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
-msgstr ""
-"Definir essa variável como `1` fará com que o Git trate todos os pathspecs "
-"como literal (também informados como mágica \"literal\")."
+msgstr "Definir essa variável como `1` fará com que o Git trate todos os pathspecs como literal (também informados como mágica \"literal\")."
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
-msgstr ""
-"Definir essa variável como `1` fará com que o Git trate todos os pathspecs "
-"como indiferente para maiúsculas e minúsculas."
+msgstr "Definir essa variável como `1` fará com que o Git trate todos os pathspecs como indiferente para maiúsculas e minúsculas."
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
-msgstr ""
-"Quando uma \"ref\" é atualizada, são criadas as entradas do reflog para "
-"acompanhar a razão da \"ref\" ter sido atualizada (que geralmente é o nome "
-"do comando de alto nível que atualizou a \"ref\"), além dos valores antigos "
-"e novos da \"ref\".  Um comando Porcelana com script pode usar a função "
-"auxiliar 'set_reflog_action' no comando `git sh setup` para definir o seu "
-"nome para essa variável quando é invocado como o comando de alto nível pelo "
-"usuário final, que será registrado no corpo do reflog."
+msgstr "Quando uma \"ref\" é atualizada, são criadas as entradas do reflog para acompanhar a razão da \"ref\" ter sido atualizada (que geralmente é o nome do comando de alto nível que atualizou a \"ref\"), além dos valores antigos e novos da \"ref\".  Um comando Porcelana com script pode usar a função auxiliar 'set_reflog_action' no comando `git sh setup` para definir o seu nome para essa variável quando é invocado como o comando de alto nível pelo usuário final, que será registrado no corpo do reflog."
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
-msgstr ""
-"Caso seja definido como `1`, inclua as referências quebradas ou com nomes "
-"incorretos ao se iterar sobre as listas das referências. Em um repositório "
-"normal, não corrompido, isso não faz nada. No entanto, habilitá-lo pode "
-"ajudar o git a detectar e abortar algumas operações na presença de "
-"referências quebradas. O Git define essa variável de forma automática "
-"durante a execução das operações destrutivas como linkgit:git-prune[1]. Você "
-"não precisa configurá-lo sozinho, a menos que queira ser paranóico para "
-"garantir que uma operação toque em cada \"ref\" (caso esteja clonando um "
-"repositório para fazer uma cópia de segurança por exemplo)."
+msgstr "Caso seja definido como `1`, inclua as referências quebradas ou com nomes incorretos ao se iterar sobre as listas das referências. Em um repositório normal, não corrompido, isso não faz nada. No entanto, habilitá-lo pode ajudar o git a detectar e abortar algumas operações na presença de referências quebradas. O Git define essa variável de forma automática durante a execução das operações destrutivas como linkgit:git-prune[1]. Você não precisa configurá-lo sozinho, a menos que queira ser paranóico para garantir que uma operação toque em cada \"ref\" (caso esteja clonando um repositório para fazer uma cópia de segurança por exemplo)."
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
-msgstr ""
-"Caso seja definido como uma lista de protocolos separados por dois pontos, "
-"comporte-se como se a opção de configuração `protocol.allow` esteja definida "
-"como `never`, e cada um dos protocolos listados possua `protocol.<nome>."
-"allow` definido como `always` (substituindo qualquer configuração já "
-"existente). Em outras palavras, qualquer protocolo não mencionado será "
-"proibido (ou seja, esta é uma lista de permissões e não uma lista negra). "
-"Consulte a descrição do `protocol.allow` no linkgit:git-config[1] para mais "
-"detalhes."
+msgstr "Caso seja definido como uma lista de protocolos separados por dois pontos, comporte-se como se a opção de configuração `protocol.allow` esteja definida como `never`, e cada um dos protocolos listados possua `protocol.<nome>.allow` definido como `always` (substituindo qualquer configuração já existente). Em outras palavras, qualquer protocolo não mencionado será proibido (ou seja, esta é uma lista de permissões e não uma lista negra). Consulte a descrição do `protocol.allow` no linkgit:git-config[1] para mais detalhes."
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr "Defina como `0` para evitar que os protocolos utilizados por `fetch/push/clone` sejam configurados por `user`.  É útil para restringir a inicialização recursiva do submódulo de um repositório não confiável ou para programas que alimentam as URLS potencialmente não confiáveis aos comandos git.  Para mais detalhes consulte linkgit:git-config[1]."
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
-msgstr ""
-"Apenas para utilização interna.  Used in handshaking the wire protocol.  "
-"Contains a colon ':' separated list of keys with optional values 'key[=value]"
-"'.  Presence of unknown keys and values must be ignored."
+msgstr "Apenas para utilização interna.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
-msgstr ""
-"Caso seja definido como 0, o Git concluirá qualquer operação solicitada sem "
-"executar outra operação opcional onde se exija um bloqueio.  Como um efeito "
-"colateral isso impedirá que o comando `git status` atualize o índice por "
-"exemplo. É útil para os processos que estão em execução no segundo plano que "
-"não queiram causar contenção do bloqueio com as outras operações no "
-"repositório.  A predefinição retorna para `1`."
+msgstr "Caso seja definido como 0, o Git concluirá qualquer operação solicitada sem executar outra operação opcional onde se exija um bloqueio.  Como um efeito colateral isso impedirá que o comando `git status` atualize o índice por exemplo. É útil para os processos que estão em execução no segundo plano que não queiram causar contenção do bloqueio com as outras operações no repositório.  A predefinição retorna para `1`."
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
-msgstr ""
-"Apenas no Windows: permite redirecionar os identificadores predefinidos de '"
-"input/output/error' para os caminhos definidos através das variáveis do "
-"ambiente. Em particular isso é útil nos aplicativos \"multi-threaded\" onde "
-"a maneira canônica de encaminhar os identificadores predefinidos através do "
-"`CreateProcess()` não seja uma opção pois exigiria que os identificadores "
-"fossem marcados como herdáveis (e consequentemente *todo* processo gerado os "
-"herdaria, possivelmente fazendo o bloqueio das operações do Git). A intenção "
-"primária de utilização é utilizar os pipes informados para comunicação (`\\\\"
-".\\pipe\\my-git-stdin-123` por exemplo)."
+msgstr "Apenas no Windows: permite redirecionar os identificadores predefinidos de 'input/output/error' para os caminhos definidos através das variáveis do ambiente. Em particular isso é útil nos aplicativos \"multi-threaded\" onde a maneira canônica de encaminhar os identificadores predefinidos através do `CreateProcess()` não seja uma opção pois exigiria que os identificadores fossem marcados como herdáveis (e consequentemente *todo* processo gerado os herdaria, possivelmente fazendo o bloqueio das operações do Git). A intenção primária de utilização é utilizar os pipes informados para comunicação (`\\\\.\\pipe\\my-git-stdin-123` por exemplo)."
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
-msgstr ""
-"Dois valores especiais são compatíveis: `off` simplesmente fechará o "
-"identificador predefinido correspondente e caso `GIT_REDIRECT_STDERR` seja `"
-"2> & 1`, a predefinição do erro será redirecionado para o mesmo "
-"identificador na saída padrão."
+msgstr "Dois valores especiais são compatíveis: `off` simplesmente fechará o identificador predefinido correspondente e caso `GIT_REDIRECT_STDERR` seja `2> & 1`, a predefinição do erro será redirecionado para o mesmo identificador na saída padrão."
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr "`GIT_PRINT_SHA1_ELLIPSIS` (descontinuado)"
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
-msgstr ""
-"Caso seja definido como `yes`, imprima uma elipse seguido de um valor "
-"(abreviado) SHA-1.  Isso afeta as indicações dos HEADs desanexados (linkgit"
-":git-checkout[1]) e a saída diff bruta (linkgit:git-diff[1]).  A impressão "
-"de uma elipse nos casos mencionados não é mais considerada adequada e é "
-"provável que a compatibilidade seja removida em um futuro próximo (junto com "
-"a variável)."
+msgstr "Caso seja definido como `yes`, imprima uma elipse seguido de um valor (abreviado) SHA-1.  Isso afeta as indicações dos HEADs desanexados (linkgit:git-checkout[1]) e a saída diff bruta (linkgit:git-diff[1]).  A impressão de uma elipse nos casos mencionados não é mais considerada adequada e é provável que a compatibilidade seja removida em um futuro próximo (junto com a variável)."
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr "Discussão[[Discussão]]"
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
-msgstr ""
-"Mais detalhes estão disponíveis no link:user-manual.html#git-concepts["
-"capítulo dos conceitos do Git no manual do usuário] e linkgit:gitcore-"
-"tutorial[7]."
+msgstr "Mais detalhes estão disponíveis no link:user-manual.html#git-concepts[capítulo dos conceitos do Git no manual do usuário] e linkgit:gitcore-tutorial[7]."
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
-msgstr ""
-"Um projeto Git normalmente consiste em um diretório de trabalho com um "
-"subdiretório \".git\" no ponto mais alto.  O diretório .git contém, entre "
-"outras coisas, um banco de dados dos objetos compactados representando o "
-"histórico completo do projeto, um arquivo para o \"índice\" que vincula este "
-"histórico ao conteúdo atual da árvore de trabalho e informa os ponteiros "
-"para este histórico, como as tags e os cabeçalhos do ramo."
+msgstr "Um projeto Git normalmente consiste em um diretório de trabalho com um subdiretório \".git\" no ponto mais alto.  O diretório .git contém, entre outras coisas, um banco de dados dos objetos compactados representando o histórico completo do projeto, um arquivo para o \"índice\" que vincula este histórico ao conteúdo atual da árvore de trabalho e informa os ponteiros para este histórico, como as tags e os cabeçalhos do ramo."
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
-msgstr ""
-"O banco de dados do objeto contém os objetos dos tipos da árvore principal: "
-"bolhas, que contêm os dados do arquivo; árvores, que apontam para as bolhas "
-"e as outras árvores para criar as hierarquias do diretório; e os commits, "
-"cada qual faz referência a uma única árvore e algum número do commit do pai."
+msgstr "O banco de dados do objeto contém os objetos dos tipos da árvore principal: bolhas, que contêm os dados do arquivo; árvores, que apontam para as bolhas e as outras árvores para criar as hierarquias do diretório; e os commits, cada qual faz referência a uma única árvore e algum número do commit do pai."
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
-msgstr ""
-"O commit, equivalente ao que os outros sistemas chamam do \"conjunto de "
-"alterações\" ou \"versão\", representa uma etapa no histórico do projeto e "
-"cada pai representa uma etapa anterior.  Os commits com mais de um pai "
-"representam as mesclagens das linhas independentes do desenvolvimento."
+msgstr "O commit, equivalente ao que os outros sistemas chamam do \"conjunto de alterações\" ou \"versão\", representa uma etapa no histórico do projeto e cada pai representa uma etapa anterior.  Os commits com mais de um pai representam as mesclagens das linhas independentes do desenvolvimento."
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
-msgstr ""
-"Todos os objetos são nomeados pelo hash SHA-1 do seu conteúdo, normalmente "
-"gravados como uma sequência com 40 dígitos hexadecimais.  Tais nomes são "
-"globalmente únicos.  Todo o histórico que antecede a um commit pode ser "
-"comprovado assinando apenas este commit.  Um quarto tipo de objeto, a tag, é "
-"fornecida para esta finalidade."
+msgstr "Todos os objetos são nomeados pelo hash SHA-1 do seu conteúdo, normalmente gravados como uma sequência com 40 dígitos hexadecimais.  Tais nomes são globalmente únicos.  Todo o histórico que antecede a um commit pode ser comprovado assinando apenas este commit.  Um quarto tipo de objeto, a tag, é fornecida para esta finalidade."
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
-msgstr ""
-"Quando criados pela primeira vez, os objetos são armazenados em arquivos "
-"individuais, porém, visando uma maior eficiência, podem ser compactados "
-"posteriormente em \"pacotes de arquivos\"."
+msgstr "Quando criados pela primeira vez, os objetos são armazenados em arquivos individuais, porém, visando uma maior eficiência, podem ser compactados posteriormente em \"pacotes de arquivos\"."
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
-msgstr ""
-"Os Ponteiros informados chamados refs marcam os pontos interessantes na "
-"história.  Uma \"ref\" pode conter o nome SHA-1 de um objeto ou o nome de "
-"outra referência.  As referências com nomes que comecem com `ref/head/` "
-"contêm o nome SHA-1 do commit (ou \"head\") mais recente de um ramo em "
-"desenvolvimento.  Os nomes SHA-1 das tags de interesse são armazenados em `"
-"ref/tags/`.  Uma referência especial chamada `HEAD` contém o nome da "
-"ramificação com a averiguação do momento."
+msgstr "Os Ponteiros informados chamados refs marcam os pontos interessantes na história.  Uma \"ref\" pode conter o nome SHA-1 de um objeto ou o nome de outra referência.  As referências com nomes que comecem com `ref/head/` contêm o nome SHA-1 do commit (ou \"head\") mais recente de um ramo em desenvolvimento.  Os nomes SHA-1 das tags de interesse são armazenados em `ref/tags/`.  Uma referência especial chamada `HEAD` contém o nome da ramificação com a averiguação do momento."
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
-msgstr ""
-"O arquivo do índice é inicializado com uma lista de todos os caminhos e para "
-"cada caminho, um objeto bolha e um conjunto de atributos.  O objeto bolha "
-"representa o conteúdo do arquivo no cabeçalho do ramo atual.  Os atributos ("
-"hora da última alteração, tamanho, etc.) são obtidos do arquivo "
-"correspondente na árvore de trabalho.  As alterações subsequentes na árvore "
-"de trabalho podem ser encontradas comparando estes atributos.  O índice pode "
-"ser atualizado com um novo conteúdo e os novos commits podem ser criadas a "
-"partir do conteúdo armazenado no índice."
+msgstr "O arquivo do índice é inicializado com uma lista de todos os caminhos e para cada caminho, um objeto bolha e um conjunto de atributos.  O objeto bolha representa o conteúdo do arquivo no cabeçalho do ramo atual.  Os atributos (hora da última alteração, tamanho, etc.) são obtidos do arquivo correspondente na árvore de trabalho.  As alterações subsequentes na árvore de trabalho podem ser encontradas comparando estes atributos.  O índice pode ser atualizado com um novo conteúdo e os novos commits podem ser criadas a partir do conteúdo armazenado no índice."
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
-msgstr ""
-"O índice também é capaz de armazenar as várias entradas (chamadas de "
-"\"estágios\") para um determinado nome do caminho.  Esses estágios são "
-"utilizados para manter as várias versões não mescladas de um arquivo quando "
-"uma mesclagem está em andamento."
+msgstr "O índice também é capaz de armazenar as várias entradas (chamadas de \"estágios\") para um determinado nome do caminho.  Esses estágios são utilizados para manter as várias versões não mescladas de um arquivo quando uma mesclagem está em andamento."
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr "DOCUMENTAÇÃO ADICIONAL"
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
-msgstr ""
-"Consulte as referências na seção \"descrição\" para começar a utilizar o "
-"Git.  O seguinte tem provavelmente bem mais detalhes do que o necessário "
-"para um usuário iniciante."
+msgstr "Consulte as referências na seção \"descrição\" para começar a utilizar o Git.  O seguinte tem provavelmente bem mais detalhes do que o necessário para um usuário iniciante."
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
-msgstr ""
-"O link:user-manual.html#git-concepts[capítulo de conceitos do Git do manual "
-"do usuário] e o linkgit:gitcore-tutorial[7] fornecem introduções à "
-"arquitetura subjacente do Git."
+msgstr "O link:user-manual.html#git-concepts[capítulo de conceitos do Git do manual do usuário] e o linkgit:gitcore-tutorial[7] fornecem introduções à arquitetura subjacente do Git."
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr "Para obter uma visão geral das recomendações do fluxo de trabalho, consulte linkgit:gitworkflows[7]."
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
-msgstr ""
-"Para mais alguns exemplos úteis, consulte também o documento link:howto-index"
-".html[howto]."
+msgstr "Para mais alguns exemplos úteis, consulte também o documento link:howto-index.html[howto]."
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
-msgstr ""
-"As entranhas estão documentadas no link:technical/api-index.html["
-"Documentação da API do Git]."
+msgstr "As entranhas estão documentadas no link:technical/api-index.html[Documentação da API do Git]."
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
-msgstr ""
-"Os usuários que estiverem migrando do CVS também podem querer ler linkgit"
-":gitcvs-migration[7]."
+msgstr "Os usuários que estiverem migrando do CVS também podem querer ler linkgit:gitcvs-migration[7]."
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr "Autores"
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
-msgstr ""
-"O Git foi iniciado por Linus Torvalds e atualmente é mantido por Junio C "
-"Hamano. Várias contribuições vieram da lista de discussão do Git <git@"
-"vger.kernel.org>.  O http://www.openhub.net/p/git/contributors/summary "
-"fornece uma lista mais completa de todos os colaboradores."
+msgstr "O Git foi iniciado por Linus Torvalds e atualmente é mantido por Junio C Hamano. Várias contribuições vieram da lista de discussão do Git <git@vger.kernel.org>.  O http://www.openhub.net/p/git/contributors/summary fornece uma lista mais completa de todos os colaboradores."
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
-msgstr ""
-"Caso tenha um clone do 'git.git', a saída do linkgit:git-shortlog[1] e do "
-"linkgit:git-blame[1] pode exibir os autores para as partes específicas do "
-"projeto."
+msgstr "Caso tenha um clone do 'git.git', a saída do linkgit:git-shortlog[1] e do linkgit:git-blame[1] pode exibir os autores para as partes específicas do projeto."
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr "Reportando um Erro"
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
-msgstr ""
-"Relate os erros na lista de discussão do Git <git@vger.kernel.org> onde o "
-"desenvolvimento e as principais manutenções são realizadas.  Você não "
-"precisa se inscrever na lista para enviar uma mensagem para lá.  Para os "
-"relatórios dos erros anteriores e outras discussões, consulte o arquivo da "
-"lista de discussão em https://lore.kernel.org/git."
+msgstr "Relate os erros na lista de discussão do Git <git@vger.kernel.org> onde o desenvolvimento e as principais manutenções são realizadas.  Você não precisa se inscrever na lista para enviar uma mensagem para lá.  Para os relatórios dos erros anteriores e outras discussões, consulte o arquivo da lista de discussão em https://lore.kernel.org/git."
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
-msgstr ""
-"Os problemas relevantes para a segurança devem ser divulgadas em particular "
-"na mailing list do Git Security <git-security@googlegroups.com>."
+msgstr "Os problemas relevantes para a segurança devem ser divulgadas em particular na mailing list do Git Security <git-security@googlegroups.com>."
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
-msgstr ""
-"linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], "
-"linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-"
-"tutorial[7], linkgit:gitcli[7], link:user-manual.html[O Manual do Usuário do "
-"Git], linkgit:gitworkflows[7]"
+msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[O Manual do Usuário do Git], linkgit:gitworkflows[7]"
 
 #. type: Title =
 #: en/git-unpack-file.txt:2
@@ -65650,8 +56636,7 @@ msgstr "git-unpack-file(1)"
 #: en/git-unpack-file.txt:7
 #, priority:100
 msgid "git-unpack-file - Creates a temporary file with a blob's contents"
-msgstr ""
-"git-unpack-file - Cria um arquivo temporário com o conteúdo de uma bolha"
+msgstr "git-unpack-file - Cria um arquivo temporário com o conteúdo de uma bolha"
 
 #. type: Plain text
 #: en/git-unpack-file.txt:14
@@ -65667,8 +56652,7 @@ msgid ""
 "returns the name of the temporary file in the following format:\n"
 "\t.merge_file_XXXXX\n"
 msgstr ""
-"Cria um arquivo que contenha o conteúdo da bolha definida através do sha1. "
-"isto\n"
+"Cria um arquivo que contenha o conteúdo da bolha definida através do sha1. isto\n"
 "retorna o nome do arquivo temporário com o seguinte formato:\n"
 "\t.merge_file_XXXXX\n"
 
@@ -65700,27 +56684,19 @@ msgstr "'git unpack-objects' [-n] [-q] [-r] [--strict]\n"
 #: en/git-unpack-objects.txt:20
 #, priority:100
 msgid "Read a packed archive (.pack) from the standard input, expanding the objects contained within and writing them into the repository in \"loose\" (one object per file) format."
-msgstr ""
-"Leia um arquivo compactado (.pack) na entrada predefinido, expandindo os "
-"objetos armazenados e gravando-os no repositório no formato \"loose\" (um "
-"objeto por arquivo)."
+msgstr "Leia um arquivo compactado (.pack) na entrada predefinido, expandindo os objetos armazenados e gravando-os no repositório no formato \"loose\" (um objeto por arquivo)."
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:24
 #, priority:100
 msgid "Objects that already exist in the repository will *not* be unpacked from the packfile.  Therefore, nothing will be unpacked if you use this command on a packfile that exists within the target repository."
-msgstr ""
-"Os objetos que já existam no repositório *não* serão descompactados do "
-"pacote de arquivos.  Portanto, nada será descompactado caso use este comando "
-"em um pacote de arquivo existente no repositório do destino."
+msgstr "Os objetos que já existam no repositório *não* serão descompactados do pacote de arquivos.  Portanto, nada será descompactado caso use este comando em um pacote de arquivo existente no repositório do destino."
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:27
 #, priority:100
 msgid "See linkgit:git-repack[1] for options to generate new packs and replace existing ones."
-msgstr ""
-"Para as opções de geração de novos pacotes e reposição dos existentes, "
-"consulte linkgit:git-repack[1]."
+msgstr "Para as opções de geração de novos pacotes e reposição dos existentes, consulte linkgit:git-repack[1]."
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:32
@@ -65738,17 +56714,13 @@ msgstr "os objetos."
 #: en/git-unpack-objects.txt:37
 #, priority:100
 msgid "The command usually shows percentage progress.  This flag suppresses it."
-msgstr ""
-"O comando geralmente exibe o progresso percentual.  Esta opção a suprime."
+msgstr "O comando geralmente exibe o progresso percentual.  Esta opção a suprime."
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:43
 #, priority:100
 msgid "When unpacking a corrupt packfile, the command dies at the first corruption.  This flag tells it to keep going and make the best effort to recover as many objects as possible."
-msgstr ""
-"Ao descompactar um pacote corrompido, o comando termina na primeira "
-"corrupção.  Esta opção indica para continuar e fazer o melhor esforço para "
-"recuperar a maior quantidade possível de objetos."
+msgstr "Ao descompactar um pacote corrompido, o comando termina na primeira corrupção.  Esta opção indica para continuar e fazer o melhor esforço para recuperar a maior quantidade possível de objetos."
 
 #. type: Plain text
 #: en/git-unpack-objects.txt:46
@@ -65766,9 +56738,7 @@ msgstr "git-update-index(1)"
 #: en/git-update-index.txt:7
 #, priority:100
 msgid "git-update-index - Register file contents in the working tree to the index"
-msgstr ""
-"git-update-index - Registra o conteúdo do arquivo no índice da árvore de "
-"trabalho"
+msgstr "git-update-index - Registra o conteúdo do arquivo no índice da árvore de trabalho"
 
 #. type: Plain text
 #: en/git-update-index.txt:30
@@ -65816,34 +56786,25 @@ msgstr ""
 #: en/git-update-index.txt:36
 #, priority:100
 msgid "Modifies the index or directory cache. Each file mentioned is updated into the index and any 'unmerged' or 'needs updating' state is cleared."
-msgstr ""
-"Modifica o cache do índice ou do diretório. Cada arquivo mencionado é "
-"atualizado no índice e qualquer condição 'unmerged' (não mesclado) ou que "
-"'precise ser atualizado' será limpo."
+msgstr "Modifica o cache do índice ou do diretório. Cada arquivo mencionado é atualizado no índice e qualquer condição 'unmerged' (não mesclado) ou que 'precise ser atualizado' será limpo."
 
 #. type: Plain text
 #: en/git-update-index.txt:39
 #, priority:100
 msgid "See also linkgit:git-add[1] for a more user-friendly way to do some of the most common operations on the index."
-msgstr ""
-"Consulte também linkgit:git-add[1] para conhecer uma maneira mais amigável "
-"ao usuário de executar algumas das operações mais comuns no índice."
+msgstr "Consulte também linkgit:git-add[1] para conhecer uma maneira mais amigável ao usuário de executar algumas das operações mais comuns no índice."
 
 #. type: Plain text
 #: en/git-update-index.txt:42
 #, priority:100
 msgid "The way 'git update-index' handles files it is told about can be modified using the various options:"
-msgstr ""
-"A maneira como o 'git update index' trata os arquivos mencionados pode ser "
-"alterada utilizando as várias opções:"
+msgstr "A maneira como o 'git update index' trata os arquivos mencionados pode ser alterada utilizando as várias opções:"
 
 #. type: Plain text
 #: en/git-update-index.txt:49
 #, priority:100
 msgid "If a specified file isn't in the index already then it's added.  Default behaviour is to ignore new files."
-msgstr ""
-"Caso um arquivo que foi especificado ainda não esteja no índice, este será "
-"adicionado.  O comportamento predefinido é ignorar os novos arquivos."
+msgstr "Caso um arquivo que foi especificado ainda não esteja no índice, este será adicionado.  O comportamento predefinido é ignorar os novos arquivos."
 
 #. type: Labeled list
 #: en/git-update-index.txt:50
@@ -65855,26 +56816,19 @@ msgstr "--remove"
 #: en/git-update-index.txt:54
 #, priority:100
 msgid "If a specified file is in the index but is missing then it's removed.  Default behavior is to ignore removed file."
-msgstr ""
-"Caso um arquivo especificado estiver no índice, porém esteja ausente, este "
-"será removido.  O comportamento predefinido é ignorar o arquivo que foi "
-"removido."
+msgstr "Caso um arquivo especificado estiver no índice, porém esteja ausente, este será removido.  O comportamento predefinido é ignorar o arquivo que foi removido."
 
 #. type: Plain text
 #: en/git-update-index.txt:58
 #, priority:100
 msgid "Looks at the current index and checks to see if merges or updates are needed by checking stat() information."
-msgstr ""
-"Examina o índice atual e verifica se as mesclagens são necessárias ou "
-"atualizações, verificando as informações do stat()."
+msgstr "Examina o índice atual e verifica se as mesclagens são necessárias ou atualizações, verificando as informações do stat()."
 
 #. type: Plain text
 #: en/git-update-index.txt:62
 #, priority:100
 msgid "Quiet.  If --refresh finds that the index needs an update, the default behavior is to error out.  This option makes"
-msgstr ""
-"Silêncio.  Caso a opção `--refresh` descobra que o índice precisa de uma "
-"atualização, o comportamento padrão é gerar um erro.  Esta opção faz"
+msgstr "Silêncio.  Caso a opção `--refresh` descobra que o índice precisa de uma atualização, o comportamento padrão é gerar um erro.  Esta opção faz"
 
 #. type: Plain text
 #: en/git-update-index.txt:63
@@ -65892,17 +56846,13 @@ msgstr "--ignore-submodules"
 #: en/git-update-index.txt:67
 #, priority:100
 msgid "Do not try to update submodules.  This option is only respected when passed before --refresh."
-msgstr ""
-"Não tente atualizar os submódulos.  Esta opção é respeitada apenas quando "
-"encaminhada antes da opção `--refresh`."
+msgstr "Não tente atualizar os submódulos.  Esta opção é respeitada apenas quando encaminhada antes da opção `--refresh`."
 
 #. type: Plain text
 #: en/git-update-index.txt:70
 #, priority:100
 msgid "If --refresh finds unmerged changes in the index, the default"
-msgstr ""
-"Caso a opção `--refresh` encontre alterações não mescladas no índice, é a "
-"predefinição"
+msgstr "Caso a opção `--refresh` encontre alterações não mescladas no índice, é a predefinição"
 
 #. type: Plain text
 #: en/git-update-index.txt:71
@@ -65938,11 +56888,7 @@ msgstr "--cacheinfo <modo> <objeto> <caminho>"
 #: en/git-update-index.txt:82
 #, priority:100
 msgid "Directly insert the specified info into the index.  For backward compatibility, you can also give these three arguments as three separate parameters, but new users are encouraged to use a single-parameter form."
-msgstr ""
-"Insira diretamente as informações definidas no índice.  Por questões de "
-"compatibilidade com as versões anteriores, também é possível utilizar estes "
-"três argumentos como três parâmetros separados, porém os novos usuários são "
-"incentivados a utilizar um formulário com um único parâmetro."
+msgstr "Insira diretamente as informações definidas no índice.  Por questões de compatibilidade com as versões anteriores, também é possível utilizar estes três argumentos como três parâmetros separados, porém os novos usuários são incentivados a utilizar um formulário com um único parâmetro."
 
 #. type: Labeled list
 #: en/git-update-index.txt:83
@@ -65972,26 +56918,13 @@ msgstr "--[no-]assume-unchanged"
 #: en/git-update-index.txt:101
 #, priority:100
 msgid "When this flag is specified, the object names recorded for the paths are not updated.  Instead, this option sets/unsets the \"assume unchanged\" bit for the paths.  When the \"assume unchanged\" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index.  If you want to change the working tree file, you need to unset the bit to tell Git.  This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e.g. cifs)."
-msgstr ""
-"Quando está opção é definida, os nomes dos objetos registrados para os "
-"caminhos não são atualizados.  Em vez disso, esta opção define/desativa o "
-"bit \"assuma como inalterado\" nos caminhos.  Quando o bit \"assuma como "
-"inalterado\" está ativado, o usuário promete não alterar o arquivo e permite "
-"que o Git assuma que o arquivo da árvore de trabalho coincida ao que está "
-"registrado no índice.  Caso queira alterar o arquivo da árvore de trabalho, "
-"informe ao Git desativando o bit.  Às vezes, isso é útil quando trabalhar "
-"com um grande projeto em um sistema de arquivos que possua uma chamada do "
-"sistema lstat(2) muito lenta (como, por exemplo, cifs)."
+msgstr "Quando está opção é definida, os nomes dos objetos registrados para os caminhos não são atualizados.  Em vez disso, esta opção define/desativa o bit \"assuma como inalterado\" nos caminhos.  Quando o bit \"assuma como inalterado\" está ativado, o usuário promete não alterar o arquivo e permite que o Git assuma que o arquivo da árvore de trabalho coincida ao que está registrado no índice.  Caso queira alterar o arquivo da árvore de trabalho, informe ao Git desativando o bit.  Às vezes, isso é útil quando trabalhar com um grande projeto em um sistema de arquivos que possua uma chamada do sistema lstat(2) muito lenta (como, por exemplo, cifs)."
 
 #. type: Plain text
 #: en/git-update-index.txt:106
 #, priority:100
 msgid "Git will fail (gracefully) in case it needs to modify this file in the index e.g. when merging in a commit; thus, in case the assumed-untracked file is changed upstream, you will need to handle the situation manually."
-msgstr ""
-"O Git falhará (de forma elegante) caso precise modificar este arquivo no "
-"índice, quando for mesclar em um commit por exemplo; portanto, caso o "
-"arquivo assumido não monitorado seja alterado na upstream, você precisará "
-"lidar com a situação de forma manual."
+msgstr "O Git falhará (de forma elegante) caso precise modificar este arquivo no índice, quando for mesclar em um commit por exemplo; portanto, caso o arquivo assumido não monitorado seja alterado na upstream, você precisará lidar com a situação de forma manual."
 
 #. type: Labeled list
 #: en/git-update-index.txt:107
@@ -66003,9 +56936,7 @@ msgstr "--really-refresh"
 #: en/git-update-index.txt:110
 #, priority:100
 msgid "Like `--refresh`, but checks stat information unconditionally, without regard to the \"assume unchanged\" setting."
-msgstr ""
-"Como a opção `--refresh`, porém verifica as informações das estatísticas "
-"incondicionalmente, sem considerar a configuração \"assuma como inalterado\"."
+msgstr "Como a opção `--refresh`, porém verifica as informações das estatísticas incondicionalmente, sem considerar a configuração \"assuma como inalterado\"."
 
 #. type: Labeled list
 #: en/git-update-index.txt:111
@@ -66017,11 +56948,7 @@ msgstr "--[no-]skip-worktree"
 #: en/git-update-index.txt:116
 #, priority:100
 msgid "When one of these flags is specified, the object name recorded for the paths are not updated. Instead, these options set and unset the \"skip-worktree\" bit for the paths. See section \"Skip-worktree bit\" below for more information."
-msgstr ""
-"Quando uma destas opções é utilizada, o nome do objeto registrado para os "
-"caminhos não é atualizado. Em vez disso, estas opções definem e desabilitam "
-"o bit \"skip-worktree\" (ignore a árvore de trabalho) dos caminhos. Para "
-"mais informações, consulte a seção \"Skip-worktree bit\" abaixo."
+msgstr "Quando uma destas opções é utilizada, o nome do objeto registrado para os caminhos não é atualizado. Em vez disso, estas opções definem e desabilitam o bit \"skip-worktree\" (ignore a árvore de trabalho) dos caminhos. Para mais informações, consulte a seção \"Skip-worktree bit\" abaixo."
 
 #. type: Labeled list
 #: en/git-update-index.txt:118
@@ -66033,9 +56960,7 @@ msgstr "--[no-]ignore-skip-worktree-entries"
 #: en/git-update-index.txt:121
 #, priority:100
 msgid "Do not remove skip-worktree (AKA \"index-only\") entries even when the `--remove` option was specified."
-msgstr ""
-"Não remova o 'skip-worktree' (também informado como \"index-only\"), mesmo "
-"quando a opção `--remove` for utilizada."
+msgstr "Não remova o 'skip-worktree' (também informado como \"index-only\"), mesmo quando a opção `--remove` for utilizada."
 
 #. type: Labeled list
 #: en/git-update-index.txt:122
@@ -66047,11 +56972,7 @@ msgstr "--[no-]fsmonitor-valid"
 #: en/git-update-index.txt:127
 #, priority:100
 msgid "When one of these flags is specified, the object name recorded for the paths are not updated. Instead, these options set and unset the \"fsmonitor valid\" bit for the paths. See section \"File System Monitor\" below for more information."
-msgstr ""
-"Quando uma destas opções é utilizada, o nome do objeto registrado para os "
-"caminhos não é atualizado. Em vez disso, essas opções definem e desabilitam "
-"o bit \"fsmonitor valid\" (fsmonitor válido) para os caminhos. Para mais "
-"informações, consulte a seção \"Monitor do Sistema de Arquivos\" abaixo."
+msgstr "Quando uma destas opções é utilizada, o nome do objeto registrado para os caminhos não é atualizado. Em vez disso, essas opções definem e desabilitam o bit \"fsmonitor valid\" (fsmonitor válido) para os caminhos. Para mais informações, consulte a seção \"Monitor do Sistema de Arquivos\" abaixo."
 
 #. type: Labeled list
 #: en/git-update-index.txt:129
@@ -66063,9 +56984,7 @@ msgstr "--again"
 #: en/git-update-index.txt:132
 #, priority:100
 msgid "Runs 'git update-index' itself on the paths whose index entries are different from those from the `HEAD` commit."
-msgstr ""
-"Executa o próprio comando 'git update index' nos caminhos cujas entradas do "
-"índice sejam diferentes daquelas do commit `HEAD`."
+msgstr "Executa o próprio comando 'git update index' nos caminhos cujas entradas do índice sejam diferentes daquelas do commit `HEAD`."
 
 #. type: Labeled list
 #: en/git-update-index.txt:133
@@ -66077,10 +56996,7 @@ msgstr "--unresolve"
 #: en/git-update-index.txt:136
 #, priority:100
 msgid "Restores the 'unmerged' or 'needs updating' state of a file during a merge if it was cleared by accident."
-msgstr ""
-"Restaura a condição 'unmerged' (não mesclado) ou 'needs updating' (precisa "
-"ser atualizado) de um arquivo, durante uma mesclagem caso ele tenha sudo "
-"eliminado por engano."
+msgstr "Restaura a condição 'unmerged' (não mesclado) ou 'needs updating' (precisa ser atualizado) de um arquivo, durante uma mesclagem caso ele tenha sudo eliminado por engano."
 
 #. type: Labeled list
 #: en/git-update-index.txt:137
@@ -66092,10 +57008,7 @@ msgstr "--info-only"
 #: en/git-update-index.txt:141
 #, priority:100
 msgid "Do not create objects in the object database for all <file> arguments that follow this flag; just insert their object IDs into the index."
-msgstr ""
-"Não crie os objetos no banco de dados dos objetos para todos os argumentos "
-"<arquivo> que seguem esta opção; basta inserir os seus IDs do objeto no "
-"índice."
+msgstr "Não crie os objetos no banco de dados dos objetos para todos os argumentos <arquivo> que seguem esta opção; basta inserir os seus IDs do objeto no índice."
 
 #. type: Labeled list
 #: en/git-update-index.txt:142
@@ -66107,9 +57020,7 @@ msgstr "--force-remove"
 #: en/git-update-index.txt:145
 #, priority:100
 msgid "Remove the file from the index even when the working directory still has such a file. (Implies --remove.)"
-msgstr ""
-"Remova o arquivo do índice, mesmo quando o diretório ativo ainda tenha tal "
-"arquivo. (Implica no uso da opção `--remove`.)"
+msgstr "Remova o arquivo do índice, mesmo quando o diretório ativo ainda tenha tal arquivo. (Implica no uso da opção `--remove`.)"
 
 #. type: Labeled list
 #: en/git-update-index.txt:146
@@ -66121,13 +57032,7 @@ msgstr "--replace"
 #: en/git-update-index.txt:153
 #, priority:100
 msgid "By default, when a file `path` exists in the index, 'git update-index' refuses an attempt to add `path/file`.  Similarly if a file `path/file` exists, a file `path` cannot be added.  With --replace flag, existing entries that conflict with the entry being added are automatically removed with warning messages."
-msgstr ""
-"É predefinido que quando um arquivo `path` exista no índice, o comando 'git "
-"update-index' recusa uma tentativa de adicionar ao `path/file`.  Da mesma "
-"forma, caso exista um arquivo `path/file`, um arquivo `path` não poderá ser "
-"adicionado.  Com a opção `--replace`, serão removidas automaticamente e com "
-"mensagens de aviso todos os lançamentos já existentes que entrem em conflito "
-"com o lançamento que está sendo adicionado."
+msgstr "É predefinido que quando um arquivo `path` exista no índice, o comando 'git update-index' recusa uma tentativa de adicionar ao `path/file`.  Da mesma forma, caso exista um arquivo `path/file`, um arquivo `path` não poderá ser adicionado.  Com a opção `--replace`, serão removidas automaticamente e com mensagens de aviso todos os lançamentos já existentes que entrem em conflito com o lançamento que está sendo adicionado."
 
 #. type: Plain text
 #: en/git-update-index.txt:161
@@ -66145,21 +57050,13 @@ msgstr "--index-version <n>"
 #: en/git-update-index.txt:167
 #, priority:100
 msgid "Write the resulting index out in the named on-disk format version.  Supported versions are 2, 3 and 4. The current default version is 2 or 3, depending on whether extra features are used, such as `git add -N`."
-msgstr ""
-"Escreva o índice resultante na versão informada no formato do disco.  As "
-"versões compatíveis são 2, 3 e 4. A versão predefinida atualmente é 2 ou 3, "
-"dependendo dos recursos extras que serão utilizados, como `git add -N`."
+msgstr "Escreva o índice resultante na versão informada no formato do disco.  As versões compatíveis são 2, 3 e 4. A versão predefinida atualmente é 2 ou 3, dependendo dos recursos extras que serão utilizados, como `git add -N`."
 
 #. type: Plain text
 #: en/git-update-index.txt:173
 #, priority:100
 msgid "Version 4 performs a simple pathname compression that reduces index size by 30%-50% on large repositories, which results in faster load time. Version 4 is relatively young (first released in 1.8.0 in October 2012). Other Git implementations such as JGit and libgit2 may not support it yet."
-msgstr ""
-"A versão 4 executa uma compactação do nome do caminho simples que reduz o "
-"tamanho do índice em 30%-50% nos repositórios grandes, o que resulta em um "
-"tempo de carregamento mais rápido. A versão 4 é relativamente mais nova ("
-"lançada pela primeira vez na versão 1.8.0 em outubro de 2012). As outras "
-"implementações do Git, como 'JGit' e 'libgit2', ainda não são compatíveis."
+msgstr "A versão 4 executa uma compactação do nome do caminho simples que reduz o tamanho do índice em 30%-50% nos repositórios grandes, o que resulta em um tempo de carregamento mais rápido. A versão 4 é relativamente mais nova (lançada pela primeira vez na versão 1.8.0 em outubro de 2012). As outras implementações do Git, como 'JGit' e 'libgit2', ainda não são compatíveis."
 
 #. type: Plain text
 #: en/git-update-index.txt:177
@@ -66183,11 +57080,7 @@ msgstr "--no-split-index"
 #: en/git-update-index.txt:184
 #, priority:100
 msgid "Enable or disable split index mode. If split-index mode is already enabled and `--split-index` is given again, all changes in $GIT_DIR/index are pushed back to the shared index file."
-msgstr ""
-"Ativar ou desativar o modo com o índice dividido. Se o modo com índice "
-"dividido já estiver ativado e a opção `--split-index` for utilizada "
-"novamente, todas as alterações no `$GIT_DIR/index` serão retornadas ao "
-"arquivo do índice compartilhado."
+msgstr "Ativar ou desativar o modo com o índice dividido. Se o modo com índice dividido já estiver ativado e a opção `--split-index` for utilizada novamente, todas as alterações no `$GIT_DIR/index` serão retornadas ao arquivo do índice compartilhado."
 
 #. type: Plain text
 #: en/git-update-index.txt:190
@@ -66229,15 +57122,7 @@ msgstr "--test-untracked-cache"
 #: en/git-update-index.txt:211
 #, priority:100
 msgid "Only perform tests on the working directory to make sure untracked cache can be used. You have to manually enable untracked cache using `--untracked-cache` or `--force-untracked-cache` or the `core.untrackedCache` configuration variable afterwards if you really want to use it. If a test fails the exit code is 1 and a message explains what is not working as needed, otherwise the exit code is 0 and OK is printed."
-msgstr ""
-"Execute apenas os testes no diretório ativo para garantir que o cache não "
-"monitorado possa ser utilizado. Você deve habilitar manualmente o cache não "
-"monitorado utilizando a opção `--untracked-cache` ou `--force-untracked-"
-"cache` ou a variável de configuração `core.untrackedCache` posteriormente, "
-"caso realmente queira utilizá-lo. Caso um teste falhe, o código de "
-"encerramento gerado é '1' e uma mensagem explica o que não está funcionando, "
-"conforme necessário, caso contrário, o código de encerramento é '0' e um "
-"'OK' é impresso."
+msgstr "Execute apenas os testes no diretório ativo para garantir que o cache não monitorado possa ser utilizado. Você deve habilitar manualmente o cache não monitorado utilizando a opção `--untracked-cache` ou `--force-untracked-cache` ou a variável de configuração `core.untrackedCache` posteriormente, caso realmente queira utilizá-lo. Caso um teste falhe, o código de encerramento gerado é '1' e uma mensagem explica o que não está funcionando, conforme necessário, caso contrário, o código de encerramento é '0' e um 'OK' é impresso."
 
 #. type: Labeled list
 #: en/git-update-index.txt:212
@@ -66249,11 +57134,7 @@ msgstr "--force-untracked-cache"
 #: en/git-update-index.txt:217
 #, priority:100
 msgid "Same as `--untracked-cache`. Provided for backwards compatibility with older versions of Git where `--untracked-cache` used to imply `--test-untracked-cache` but this option would enable the extension unconditionally."
-msgstr ""
-"O mesmo que `--untracked-cache`. Fornece compatibilidade retroativa com as "
-"versões mais antigas do Git, onde `--untracked-cache` costumava implicar com "
-"a opção `--test-untracked-cache`, porém esta opção ativaria a extensão "
-"incondicionalmente."
+msgstr "O mesmo que `--untracked-cache`. Fornece compatibilidade retroativa com as versões mais antigas do Git, onde `--untracked-cache` costumava implicar com a opção `--test-untracked-cache`, porém esta opção ativaria a extensão incondicionalmente."
 
 #. type: Labeled list
 #: en/git-update-index.txt:218
@@ -66277,11 +57158,7 @@ msgstr "Ativar ou desativar o recurso de monitoramento do sistema de arquivos. E
 #: en/git-update-index.txt:236
 #, priority:100
 msgid "Files to act on.  Note that files beginning with '.' are discarded. This includes `./file` and `dir/./file`. If you don't want this, then use cleaner names.  The same applies to directories ending '/' and paths with '//'"
-msgstr ""
-"Arquivos para agir.  Observe que os arquivos que começam com '.' são "
-"descartados. Isso inclui `./arquivo` e `dir/./arquivo`. Caso não queira "
-"isso, utilize nomes mais limpos.  O mesmo se aplica aos diretórios que "
-"terminam com '/' e aos caminhos com '//'"
+msgstr "Arquivos para agir.  Observe que os arquivos que começam com '.' são descartados. Isso inclui `./arquivo` e `dir/./arquivo`. Caso não queira isso, utilize nomes mais limpos.  O mesmo se aplica aos diretórios que terminam com '/' e aos caminhos com '//'"
 
 #. type: Title -
 #: en/git-update-index.txt:238
@@ -66293,21 +57170,13 @@ msgstr "USANDO A OPÇÃO --REFRESH"
 #: en/git-update-index.txt:244
 #, priority:100
 msgid "`--refresh` does not calculate a new sha1 file or bring the index up to date for mode/content changes. But what it *does* do is to \"re-match\" the stat information of a file with the index, so that you can refresh the index for a file that hasn't been changed but where the stat entry is out of date."
-msgstr ""
-"A opção `--refresh` não calcula um novo arquivo sha1 ou atualiza o índice "
-"para as alterações do modo/conteúdo. Porém o que é *feito* é \"repetir a "
-"coincidência\" das informações estatísticas de um arquivo ao índice, para "
-"que você possa atualizar o índice de um arquivo que não foi alterado, porém "
-"onde a entrada da estatísticas esteja desatualizada."
+msgstr "A opção `--refresh` não calcula um novo arquivo sha1 ou atualiza o índice para as alterações do modo/conteúdo. Porém o que é *feito* é \"repetir a coincidência\" das informações estatísticas de um arquivo ao índice, para que você possa atualizar o índice de um arquivo que não foi alterado, porém onde a entrada da estatísticas esteja desatualizada."
 
 #. type: Plain text
 #: en/git-update-index.txt:247
 #, priority:100
 msgid "For example, you'd want to do this after doing a 'git read-tree', to link up the stat index details with the proper files."
-msgstr ""
-"Como por exemplo, você gostaria de fazer isso depois de fazer um comando `"
-"git read-tree`, para vincular os detalhes do índice estatístico aos arquivos "
-"adequados."
+msgstr "Como por exemplo, você gostaria de fazer isso depois de fazer um comando `git read-tree`, para vincular os detalhes do índice estatístico aos arquivos adequados."
 
 #. type: Title -
 #: en/git-update-index.txt:249
@@ -66319,9 +57188,7 @@ msgstr "USANDO AS OPÇÕES --CACHEINFO OU --INFO-ONLY"
 #: en/git-update-index.txt:253
 #, priority:100
 msgid "`--cacheinfo` is used to register a file that is not in the current working directory.  This is useful for minimum-checkout merging."
-msgstr ""
-"A opção `--cacheinfo` é usada para registrar um arquivo que não está no "
-"diretório de trabalho atual.  É útil para mesclar a averiguação mínima."
+msgstr "A opção `--cacheinfo` é usada para registrar um arquivo que não está no diretório de trabalho atual.  É útil para mesclar a averiguação mínima."
 
 #. type: Plain text
 #: en/git-update-index.txt:255
@@ -66339,22 +57206,13 @@ msgstr "$ git update-index --add --cacheinfo <modo>,<sha1>,<caminho>\n"
 #: en/git-update-index.txt:262
 #, priority:100
 msgid "`--info-only` is used to register files without placing them in the object database.  This is useful for status-only repositories."
-msgstr ""
-"A opção `--info-only` é usado para registrar os arquivos sem colocá-los no "
-"banco de dados do objeto.  É útil apenas para os repositórios \"condição-"
-"apenas\"."
+msgstr "A opção `--info-only` é usado para registrar os arquivos sem colocá-los no banco de dados do objeto.  É útil apenas para os repositórios \"condição-apenas\"."
 
 #. type: Plain text
 #: en/git-update-index.txt:268
 #, priority:100
 msgid "Both `--cacheinfo` and `--info-only` behave similarly: the index is updated but the object database isn't.  `--cacheinfo` is useful when the object is in the database but the file isn't available locally.  `--info-only` is useful when the file is available, but you do not wish to update the object database."
-msgstr ""
-"Ambos os `--cacheinfo` e o `--info-only` se comportam da mesma maneira: o "
-"índice é atualizado, porém o banco de dados dos objetos não.  A opção "
-"`--cacheinfo` é útil quando o objeto está no banco de dados, porém o arquivo "
-"não está disponível localmente.  A opção `--info-only` é útil quando o "
-"arquivo está disponível, porém você não queira atualizar o banco de dados do "
-"objeto."
+msgstr "Ambos os `--cacheinfo` e o `--info-only` se comportam da mesma maneira: o índice é atualizado, porém o banco de dados dos objetos não.  A opção `--cacheinfo` é útil quando o objeto está no banco de dados, porém o arquivo não está disponível localmente.  A opção `--info-only` é útil quando o arquivo está disponível, porém você não queira atualizar o banco de dados do objeto."
 
 #. type: Title -
 #: en/git-update-index.txt:271
@@ -66366,11 +57224,7 @@ msgstr "USANDO A OPÇÃO --INDEX-INFO"
 #: en/git-update-index.txt:276
 #, priority:100
 msgid "`--index-info` is a more powerful mechanism that lets you feed multiple entry definitions from the standard input, and designed specifically for scripts.  It can take inputs of three formats:"
-msgstr ""
-"A opção `--index-info` é um mecanismo mais poderoso que permite alimentar as "
-"várias definições da entrada a partir da entrada padrão e projetada "
-"especificamente para o uso com scripts.  Pode receber as entradas de três "
-"formatos:"
+msgstr "A opção `--index-info` é um mecanismo mais poderoso que permite alimentar as várias definições da entrada a partir da entrada padrão e projetada especificamente para o uso com scripts.  Pode receber as entradas de três formatos:"
 
 #. type: Plain text
 #: en/git-update-index.txt:278
@@ -66394,9 +57248,7 @@ msgstr "mode         SP sha1 SP stage TAB path\n"
 #: en/git-update-index.txt:285
 #, priority:100
 msgid "This format is to put higher order stages into the index file and matches 'git ls-files --stage' output."
-msgstr ""
-"Este formato serve para colocar os estágios na ordem superior do arquivo no "
-"índice e coincide à saída do `git ls-files --stage`."
+msgstr "Este formato serve para colocar os estágios na ordem superior do arquivo no índice e coincide à saída do `git ls-files --stage`."
 
 #. type: Plain text
 #: en/git-update-index.txt:287
@@ -66408,18 +57260,13 @@ msgstr "mode         SP sha1          TAB path\n"
 #: en/git-update-index.txt:290
 #, priority:100
 msgid "This format is no longer produced by any Git command, but is and will continue to be supported by `update-index --index-info`."
-msgstr ""
-"Este formato não é mais gerado por nenhum comando Git, mas é e continuará "
-"sendo compatível através do comando `update-index --index-info`."
+msgstr "Este formato não é mais gerado por nenhum comando Git, mas é e continuará sendo compatível através do comando `update-index --index-info`."
 
 #. type: Plain text
 #: en/git-update-index.txt:294
 #, priority:100
 msgid "To place a higher stage entry to the index, the path should first be removed by feeding a mode=0 entry for the path, and then feeding necessary input lines in the third format."
-msgstr ""
-"Para colocar um estágio de lançamento com prioridade mais alta ao índice, o "
-"caminho primeiro deve ser removido ao utilizar `mode=0` para o caminho e em "
-"seguida alimentando as linhas necessárias da entrada ao terceiro formato."
+msgstr "Para colocar um estágio de lançamento com prioridade mais alta ao índice, o caminho primeiro deve ser removido ao utilizar `mode=0` para o caminho e em seguida alimentando as linhas necessárias da entrada ao terceiro formato."
 
 #. type: Plain text
 #: en/git-update-index.txt:296
@@ -66461,11 +57308,7 @@ msgstr ""
 #: en/git-update-index.txt:315
 #, priority:100
 msgid "The first line of the input feeds 0 as the mode to remove the path; the SHA-1 does not matter as long as it is well formatted.  Then the second and third line feeds stage 1 and stage 2 entries for that path.  After the above, we would end up with this:"
-msgstr ""
-"A primeira linha da entrada alimenta 0 como sendo o modo para remover o "
-"caminho; o SHA-1 não é importante, desde que esteja bem formatado.  Em "
-"seguida, a segunda e a terceira linha alimentam as entradas 'stage 1' e o "
-"'stage 2' para este caminho.  Após o exposto, acabaríamos assim:"
+msgstr "A primeira linha da entrada alimenta 0 como sendo o modo para remover o caminho; o SHA-1 não é importante, desde que esteja bem formatado.  Em seguida, a segunda e a terceira linha alimentam as entradas 'stage 1' e o 'stage 2' para este caminho.  Após o exposto, acabaríamos assim:"
 
 #. type: delimited block -
 #: en/git-update-index.txt:320
@@ -66489,21 +57332,7 @@ msgstr "UTILIZANDO O BIT ``ASSUME UNCHANGED''"
 #: en/git-update-index.txt:339
 #, priority:100
 msgid "Many operations in Git depend on your filesystem to have an efficient `lstat(2)` implementation, so that `st_mtime` information for working tree files can be cheaply checked to see if the file contents have changed from the version recorded in the index file.  Unfortunately, some filesystems have inefficient `lstat(2)`.  If your filesystem is one of them, you can set \"assume unchanged\" bit to paths you have not changed to cause Git not to do this check.  Note that setting this bit on a path does not mean Git will check the contents of the file to see if it has changed -- it makes Git to omit any checking and assume it has *not* changed.  When you make changes to working tree files, you have to explicitly tell Git about it by dropping \"assume unchanged\" bit, either before or after you modify them."
-msgstr ""
-"Muitas operações no Git dependem do seu sistema de arquivos para ter uma "
-"implementação eficiente `lstat(2)`, de modo que as informações `st_mtime` "
-"para os arquivos da árvore de trabalho possam ser averiguadas com menos "
-"custo para ver se o conteúdo do arquivo foi alterado em relação à versão "
-"registrada no arquivo do índice.  Infelizmente, alguns sistemas de arquivos "
-"têm um `lstat(2)` ineficiente.  Caso o seu sistema de arquivos seja um "
-"deles, é possível definir o bit \"assuma como inalterado\" para os caminhos "
-"que não foram alterados, fazendo com que o Git não faça essa verificação.  "
-"Observe que definir este bit em um caminho não significa que o Git "
-"verificará o conteúdo do arquivo para ver se ele foi alterado -- le faz com "
-"que o Git omita qualquer verificação e presuma que ele não foi alterado.  "
-"Quando você faz alterações nos arquivos da árvore de trabalho, é preciso "
-"informar ao Git de forma explicita, removendo o bit \"assuma como "
-"inalterado\", antes ou depois de modificá-los."
+msgstr "Muitas operações no Git dependem do seu sistema de arquivos para ter uma implementação eficiente `lstat(2)`, de modo que as informações `st_mtime` para os arquivos da árvore de trabalho possam ser averiguadas com menos custo para ver se o conteúdo do arquivo foi alterado em relação à versão registrada no arquivo do índice.  Infelizmente, alguns sistemas de arquivos têm um `lstat(2)` ineficiente.  Caso o seu sistema de arquivos seja um deles, é possível definir o bit \"assuma como inalterado\" para os caminhos que não foram alterados, fazendo com que o Git não faça essa verificação.  Observe que definir este bit em um caminho não significa que o Git verificará o conteúdo do arquivo para ver se ele foi alterado -- le faz com que o Git omita qualquer verificação e presuma que ele não foi alterado.  Quando você faz alterações nos arquivos da árvore de trabalho, é preciso informar ao Git de forma explicita, removendo o bit \"assuma como inalterado\", antes ou depois de modificá-los."
 
 #. type: Plain text
 #: en/git-update-index.txt:344
@@ -66515,17 +57344,7 @@ msgstr "Para definir o bit \"assume unchanged\" (assuma como inalterado), utiliz
 #: en/git-update-index.txt:354
 #, ignore-ellipsis, priority:100
 msgid "The command looks at `core.ignorestat` configuration variable.  When this is true, paths updated with `git update-index paths...` and paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as \"assume unchanged\".  Note that \"assume unchanged\" bit is *not* set if `git update-index --refresh` finds the working tree file matches the index (use `git update-index --really-refresh` if you want to mark them as \"assume unchanged\")."
-msgstr ""
-"O comando analisa a variável de configuração `core.ignorestat`.  Quando for "
-"'true', os caminhos são atualizados com o comando `git update-index paths...`"
-" e os caminhos são atualizados com outros comandos Git que atualizam o "
-"índice e a árvore de trabalho (como, por exemplo, o 'git apply --index', "
-"'git checkout-index -u' e o 'git read-tree -u') são marcados automaticamente "
-"com o bit \"assuma como inalterado\".  Observe que o bit \"assuma como "
-"inalterado\" *não* está definido caso o comando `git update-index --refresh` "
-"encontre o arquivo da árvore de trabalho que coincida com o índice (utilize "
-"o `git update-index --really-refresh` caso queira marcá-los com o bit "
-"\"assuma como inalterado\")."
+msgstr "O comando analisa a variável de configuração `core.ignorestat`.  Quando for 'true', os caminhos são atualizados com o comando `git update-index paths...` e os caminhos são atualizados com outros comandos Git que atualizam o índice e a árvore de trabalho (como, por exemplo, o 'git apply --index', 'git checkout-index -u' e o 'git read-tree -u') são marcados automaticamente com o bit \"assuma como inalterado\".  Observe que o bit \"assuma como inalterado\" *não* está definido caso o comando `git update-index --refresh` encontre o arquivo da árvore de trabalho que coincida com o índice (utilize o `git update-index --really-refresh` caso queira marcá-los com o bit \"assuma como inalterado\")."
 
 #. type: Plain text
 #: en/git-update-index.txt:359
@@ -66537,9 +57356,7 @@ msgstr "Para atualizar e renovar apenas os arquivos já averiguados:"
 #: en/git-update-index.txt:364
 #, no-wrap, priority:100
 msgid "On an inefficient filesystem with `core.ignorestat` set"
-msgstr ""
-"Em um sistema de arquivos ineficiente com o a opção da configuração `core."
-"ignorestat` definida"
+msgstr "Em um sistema de arquivos ineficiente com o a opção da configuração `core.ignorestat` definida"
 
 #. type: delimited block -
 #: en/git-update-index.txt:380
@@ -66577,9 +57394,7 @@ msgstr ""
 #: en/git-update-index.txt:383
 #, priority:100
 msgid "forces lstat(2) to set \"assume unchanged\" bits for paths that match index."
-msgstr ""
-"impõem ao lstat(2) que defina os bits \"assuma como inalterado\" para os "
-"caminhos que coincidam com o índice."
+msgstr "impõem ao lstat(2) que defina os bits \"assuma como inalterado\" para os caminhos que coincidam com o índice."
 
 #. type: Plain text
 #: en/git-update-index.txt:384
@@ -66597,16 +57412,13 @@ msgstr "assim faz o lstat(1) e encontra o índice que coincida com o caminho."
 #: en/git-update-index.txt:386
 #, priority:100
 msgid "this does lstat(2) and finds index does *not* match the path."
-msgstr ""
-"assim faz o lstat(2) e encontra o índice que *não* coincida com o caminho."
+msgstr "assim faz o lstat(2) e encontra o índice que *não* coincida com o caminho."
 
 #. type: Plain text
 #: en/git-update-index.txt:387
 #, priority:100
 msgid "registering the new version to index sets \"assume unchanged\" bit."
-msgstr ""
-"registrando uma nova versão nos conjuntos dos índices do bit \"assuma como "
-"inalterado\"."
+msgstr "registrando uma nova versão nos conjuntos dos índices do bit \"assuma como inalterado\"."
 
 #. type: Plain text
 #: en/git-update-index.txt:388
@@ -66642,35 +57454,19 @@ msgstr "SKIP-WORKTREE BIT"
 #: en/git-update-index.txt:400
 #, priority:100
 msgid "Skip-worktree bit can be defined in one (long) sentence: When reading an entry, if it is marked as skip-worktree, then Git pretends its working directory version is up to date and read the index version instead."
-msgstr ""
-"Skip-worktree bit (o bit que ignora a árvore de trabalho) pode ser definido "
-"com uma sentença (longa): Ao ler uma entrada, caso esteja marcado com 'skip-"
-"work-tree', então o Git finge que a versão do diretório de trabalho está "
-"atualizada e em vez disso, lê a versão do índice."
+msgstr "Skip-worktree bit (o bit que ignora a árvore de trabalho) pode ser definido com uma sentença (longa): Ao ler uma entrada, caso esteja marcado com 'skip-work-tree', então o Git finge que a versão do diretório de trabalho está atualizada e em vez disso, lê a versão do índice."
 
 #. type: Plain text
 #: en/git-update-index.txt:408
 #, priority:100
 msgid "To elaborate, \"reading\" means checking for file existence, reading file attributes or file content. The working directory version may be present or absent. If present, its content may match against the index version or not. Writing is not affected by this bit, content safety is still first priority. Note that Git _can_ update working directory file, that is marked skip-worktree, if it is safe to do so (i.e.  working directory version matches index version)"
-msgstr ""
-"Para elaborar, \"ler\" significa verificar a existência do arquivo, ler os "
-"atributos ou o conteúdo do mesmo. A versão do diretório de trabalho pode "
-"estar presente ou não. Caso esteja, o seu conteúdo pode coincidir à versão "
-"do índice ou não. A escrita não é afetada por este bit, a segurança do "
-"conteúdo ainda é a primeira prioridade. Observe que o Git _pode_ atualizar o "
-"arquivo do diretório de trabalho, marcado como 'skip-worktree' (ignore a "
-"árvore de trabalho), caso seja seguro fazê-lo (como, por exemplo, se a "
-"versão do diretório de trabalho coincide com à versão do índice)"
+msgstr "Para elaborar, \"ler\" significa verificar a existência do arquivo, ler os atributos ou o conteúdo do mesmo. A versão do diretório de trabalho pode estar presente ou não. Caso esteja, o seu conteúdo pode coincidir à versão do índice ou não. A escrita não é afetada por este bit, a segurança do conteúdo ainda é a primeira prioridade. Observe que o Git _pode_ atualizar o arquivo do diretório de trabalho, marcado como 'skip-worktree' (ignore a árvore de trabalho), caso seja seguro fazê-lo (como, por exemplo, se a versão do diretório de trabalho coincide com à versão do índice)"
 
 #. type: Plain text
 #: en/git-update-index.txt:412
 #, priority:100
 msgid "Although this bit looks similar to assume-unchanged bit, its goal is different from assume-unchanged bit's. Skip-worktree also takes precedence over assume-unchanged bit when both are set."
-msgstr ""
-"Embora esse bit pareça com o bit assumido como inalterado, o seu objetivo é "
-"diferente dos bits que são assumidos como inalterados. Skip-worktree também "
-"tem precedência sobre o bit assumido como inalterado quando ambos estão "
-"definidos."
+msgstr "Embora esse bit pareça com o bit assumido como inalterado, o seu objetivo é diferente dos bits que são assumidos como inalterados. Skip-worktree também tem precedência sobre o bit assumido como inalterado quando ambos estão definidos."
 
 #. type: Title -
 #: en/git-update-index.txt:414
@@ -66682,49 +57478,31 @@ msgstr "ÍNDICE DIVIDIDO"
 #: en/git-update-index.txt:418
 #, priority:100
 msgid "This mode is designed for repositories with very large indexes, and aims at reducing the time it takes to repeatedly write these indexes."
-msgstr ""
-"Este modo é projetado para repositórios com índices muito grandes e visa "
-"reduzir o tempo necessário para gravar repetidamente tais índices."
+msgstr "Este modo é projetado para repositórios com índices muito grandes e visa reduzir o tempo necessário para gravar repetidamente tais índices."
 
 #. type: Plain text
 #: en/git-update-index.txt:423
 #, priority:100
 msgid "In this mode, the index is split into two files, $GIT_DIR/index and $GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the split index, while the shared index file contains all index entries and stays unchanged."
-msgstr ""
-"Nesse modo, o índice é dividido em dois arquivos, `$GIT_DIR/index` e `$"
-"GIT_DIR/sharedindex.<SHA-1>`. As alterações são acumuladas no `$GIT_DIR/"
-"index`, o índice dividido, enquanto o arquivo do índice compartilhado contém "
-"todas os lançamentos no índice e permanece inalterado."
+msgstr "Nesse modo, o índice é dividido em dois arquivos, `$GIT_DIR/index` e `$GIT_DIR/sharedindex.<SHA-1>`. As alterações são acumuladas no `$GIT_DIR/index`, o índice dividido, enquanto o arquivo do índice compartilhado contém todas os lançamentos no índice e permanece inalterado."
 
 #. type: Plain text
 #: en/git-update-index.txt:428
 #, priority:100
 msgid "All changes in the split index are pushed back to the shared index file when the number of entries in the split index reaches a level specified by the splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
-msgstr ""
-"Todas as alterações feitas índice que foi dividido são retornadas ao arquivo "
-"do índice compartilhado quando a quantidade de entradas no índice atinge um "
-"nível especificado através da variável de configuração `splitIndex."
-"maxPercentChange` (consulte linkgit:git-config[1])."
+msgstr "Todas as alterações feitas índice que foi dividido são retornadas ao arquivo do índice compartilhado quando a quantidade de entradas no índice atinge um nível especificado através da variável de configuração `splitIndex.maxPercentChange` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-update-index.txt:433
 #, priority:100
 msgid "Each time a new shared index file is created, the old shared index files are deleted if their modification time is older than what is specified by the splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
-msgstr ""
-"Sempre que um novo arquivo do índice compartilhado for criado, os arquivos "
-"do índice antigos que foram compartilhados são excluídos caso o tempo de "
-"alteração seja mais antigo do que o definido pela variável de configuração "
-"`splitIndex.sharedIndexExpire` (consulte linkgit:git-config[1])."
+msgstr "Sempre que um novo arquivo do índice compartilhado for criado, os arquivos do índice antigos que foram compartilhados são excluídos caso o tempo de alteração seja mais antigo do que o definido pela variável de configuração `splitIndex.sharedIndexExpire` (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-update-index.txt:437
 #, priority:100
 msgid "To avoid deleting a shared index file that is still used, its modification time is updated to the current time every time a new split index based on the shared index file is either created or read from."
-msgstr ""
-"Para evitar a exclusão de um arquivo do índice compartilhado que ainda "
-"esteja em uso, o seu horário de modificação é atualizado para o horário "
-"atual sempre que um novo índice dividido tiver como base o arquivo do índice "
-"compartilhado seja criado ou lido."
+msgstr "Para evitar a exclusão de um arquivo do índice compartilhado que ainda esteja em uso, o seu horário de modificação é atualizado para o horário atual sempre que um novo índice dividido tiver como base o arquivo do índice compartilhado seja criado ou lido."
 
 #. type: Title -
 #: en/git-update-index.txt:439
@@ -66736,68 +57514,37 @@ msgstr "CACHE NÃO MONITORADO"
 #: en/git-update-index.txt:443
 #, priority:100
 msgid "This cache is meant to speed up commands that involve determining untracked files such as `git status`."
-msgstr ""
-"Esse cache destina-se a acelerar os comandos que envolvem a determinação dos "
-"arquivos não monitorados, como o `git status`."
+msgstr "Esse cache destina-se a acelerar os comandos que envolvem a determinação dos arquivos não monitorados, como o `git status`."
 
 #. type: Plain text
 #: en/git-update-index.txt:450
 #, priority:100
 msgid "This feature works by recording the mtime of the working tree directories and then omitting reading directories and stat calls against files in those directories whose mtime hasn't changed. For this to work the underlying operating system and file system must change the `st_mtime` field of directories if files in the directory are added, modified or deleted."
-msgstr ""
-"Esse recurso funciona gravando o 'mtime' dos diretórios da árvore de "
-"trabalho e em seguida, omitindo a leitura dos diretórios e as chamadas da "
-"condição nos arquivos dos diretórios cujo 'mtime' não tenha sido alterado. "
-"Para que isso funcione, o sistema operacional e o sistema de arquivos "
-"subjacentes devem alterar o campo do diretório `st_mtime` caso os arquivos "
-"no diretório forem adicionados, modificados ou excluídos."
+msgstr "Esse recurso funciona gravando o 'mtime' dos diretórios da árvore de trabalho e em seguida, omitindo a leitura dos diretórios e as chamadas da condição nos arquivos dos diretórios cujo 'mtime' não tenha sido alterado. Para que isso funcione, o sistema operacional e o sistema de arquivos subjacentes devem alterar o campo do diretório `st_mtime` caso os arquivos no diretório forem adicionados, modificados ou excluídos."
 
 #. type: Plain text
 #: en/git-update-index.txt:455
 #, priority:100
 msgid "You can test whether the filesystem supports that with the `--test-untracked-cache` option. The `--untracked-cache` option used to implicitly perform that test in older versions of Git, but that's no longer the case."
-msgstr ""
-"Você pode testar se o sistema de arquivos é compatível com a opção `--test-"
-"untracked-cache`. A opção `--untracked-cache` usada para executar este teste "
-"de forma implícita nas versões mais antigas do Git, porém este não é mais o "
-"caso."
+msgstr "Você pode testar se o sistema de arquivos é compatível com a opção `--test-untracked-cache`. A opção `--untracked-cache` usada para executar este teste de forma implícita nas versões mais antigas do Git, porém este não é mais o caso."
 
 #. type: Plain text
 #: en/git-update-index.txt:463
 #, priority:100
 msgid "If you want to enable (or disable) this feature, it is easier to use the `core.untrackedCache` configuration variable (see linkgit:git-config[1]) than using the `--untracked-cache` option to `git update-index` in each repository, especially if you want to do so across all repositories you use, because you can set the configuration variable to `true` (or `false`) in your `$HOME/.gitconfig` just once and have it affect all repositories you touch."
-msgstr ""
-"Caso queira ativar (ou desativar) este recurso, é mais fácil utilizar a "
-"variável de configuração `core.untrackedCache` (consulte linkgit:git-"
-"config[1]) do que utilizar a opção `--untracked-cache` para o comando `git "
-"update-index` em cada repositório, especialmente se você quiser fazê-lo em "
-"todos os repositórios que você utiliza, pois é possível definir a variável "
-"de configuração como `true` (ou `false`) no seu `$HOME/.gitconfig` apenas "
-"uma vez e afetar todos os repositórios que você toque."
+msgstr "Caso queira ativar (ou desativar) este recurso, é mais fácil utilizar a variável de configuração `core.untrackedCache` (consulte linkgit:git-config[1]) do que utilizar a opção `--untracked-cache` para o comando `git update-index` em cada repositório, especialmente se você quiser fazê-lo em todos os repositórios que você utiliza, pois é possível definir a variável de configuração como `true` (ou `false`) no seu `$HOME/.gitconfig` apenas uma vez e afetar todos os repositórios que você toque."
 
 #. type: Plain text
 #: en/git-update-index.txt:469
 #, priority:100
 msgid "When the `core.untrackedCache` configuration variable is changed, the untracked cache is added to or removed from the index the next time a command reads the index; while when `--[no-|force-]untracked-cache` are used, the untracked cache is immediately added to or removed from the index."
-msgstr ""
-"Quando a variável de configuração `core.untrackedCache` é alterada, o cache "
-"não monitorado é adicionado ou removido do índice da próxima vez que um "
-"comando lê o índice; enquanto quando `--[no-|force-]untracked-cache` são "
-"utilizados, o cache não monitorado é imediatamente adicionado ou removido do "
-"índice."
+msgstr "Quando a variável de configuração `core.untrackedCache` é alterada, o cache não monitorado é adicionado ou removido do índice da próxima vez que um comando lê o índice; enquanto quando `--[no-|force-]untracked-cache` são utilizados, o cache não monitorado é imediatamente adicionado ou removido do índice."
 
 #. type: Plain text
 #: en/git-update-index.txt:476
 #, priority:100
 msgid "Before 2.17, the untracked cache had a bug where replacing a directory with a symlink to another directory could cause it to incorrectly show files tracked by git as untracked. See the \"status: add a failing test showing a core.untrackedCache bug\" commit to git.git. A workaround for that is (and this might work for other undiscovered bugs in the future):"
-msgstr ""
-"Antes da versão 2.17, o cache não monitorado apresentava um erro, ao "
-"substituir um diretório por um link simbólico para outro diretório, fazendo "
-"com que ele mostrasse de forma incorreta os arquivos monitorados pelo git "
-"como não monitorados. Consulte o \"status: adicione um teste com falha "
-"mostrando um bug core.untrackedCache\" commit com git.git. Uma solução "
-"alternativa para isso é (e isso pode funcionar para os outros erros que "
-"ainda não foram descobertos no futuro):"
+msgstr "Antes da versão 2.17, o cache não monitorado apresentava um erro, ao substituir um diretório por um link simbólico para outro diretório, fazendo com que ele mostrasse de forma incorreta os arquivos monitorados pelo git como não monitorados. Consulte o \"status: adicione um teste com falha mostrando um bug core.untrackedCache\" commit com git.git. Uma solução alternativa para isso é (e isso pode funcionar para os outros erros que ainda não foram descobertos no futuro):"
 
 #. type: delimited block -
 #: en/git-update-index.txt:479
@@ -66809,31 +57556,19 @@ msgstr "$ git -c core.untrackedCache=false status\n"
 #: en/git-update-index.txt:485
 #, priority:100
 msgid "This bug has also been shown to affect non-symlink cases of replacing a directory with a file when it comes to the internal structures of the untracked cache, but no case has been reported where this resulted in wrong \"git status\" output."
-msgstr ""
-"Também foi demonstrado que este 'bug' afeta os casos sem um link simbólico "
-"na reposição de um diretório por um arquivo quando se trata das estruturas "
-"internas do cache não monitorado, porém nenhum caso foi relatado onde isso "
-"tenha resultado na saída incorreta do comando \"git status\"."
+msgstr "Também foi demonstrado que este 'bug' afeta os casos sem um link simbólico na reposição de um diretório por um arquivo quando se trata das estruturas internas do cache não monitorado, porém nenhum caso foi relatado onde isso tenha resultado na saída incorreta do comando \"git status\"."
 
 #. type: Plain text
 #: en/git-update-index.txt:491
 #, priority:100
 msgid "There are also cases where existing indexes written by git versions before 2.17 will reference directories that don't exist anymore, potentially causing many \"could not open directory\" warnings to be printed on \"git status\". These are new warnings for existing issues that were previously silently discarded."
-msgstr ""
-"Também existem os casos onde os índices existentes escritos pelas versões do "
-"git anteriores a versão 2.17 referenciarem os diretórios que não existem "
-"mais, potencialmente fazendo com que muitos avisos de \"não foi possível "
-"abrir o diretório\" sejam impressos durante a execução do comando \"git "
-"status\". Estes são os novos avisos para problemas existentes que foram "
-"descartados anteriormente sem qualquer aviso prévio."
+msgstr "Também existem os casos onde os índices existentes escritos pelas versões do git anteriores a versão 2.17 referenciarem os diretórios que não existem mais, potencialmente fazendo com que muitos avisos de \"não foi possível abrir o diretório\" sejam impressos durante a execução do comando \"git status\". Estes são os novos avisos para problemas existentes que foram descartados anteriormente sem qualquer aviso prévio."
 
 #. type: Plain text
 #: en/git-update-index.txt:495
 #, priority:100
 msgid "As with the bug described above the solution is to one-off do a \"git status\" run with `core.untrackedCache=false` to flush out the leftover bad data."
-msgstr ""
-"Assim como no bug descrito acima, a solução é executar um \"status git\" "
-"único com `core.untrackedCache=false` para liberar os dados ruins restantes."
+msgstr "Assim como no bug descrito acima, a solução é executar um \"status git\" único com `core.untrackedCache=false` para liberar os dados ruins restantes."
 
 #. type: Title -
 #: en/git-update-index.txt:497
@@ -66845,52 +57580,31 @@ msgstr "MONITOR DO SISTEMA DE ARQUIVOS"
 #: en/git-update-index.txt:501
 #, priority:100
 msgid "This feature is intended to speed up git operations for repos that have large working directories."
-msgstr ""
-"Este recurso visa acelerar as operações do git para os repositórios que "
-"possuem grandes diretórios de trabalho."
+msgstr "Este recurso visa acelerar as operações do git para os repositórios que possuem grandes diretórios de trabalho."
 
 #. type: Plain text
 #: en/git-update-index.txt:506
 #, priority:100
 msgid "It enables git to work together with a file system monitor (see the \"fsmonitor-watchman\" section of linkgit:githooks[5]) that can inform it as to what files have been modified. This enables git to avoid having to lstat() every file to find modified files."
-msgstr ""
-"Ele permite que o git trabalhe em conjunto com um monitor do sistema de "
-"arquivos (consulte a seção \"fsmonitor-watchman\" do linkgit:githooks[5]) "
-"que pode informá-lo sobre quais os arquivos foram alterados. Isso permite "
-"que o git evite ter que fazer um 'lstat()' em todo arquivo para localizar "
-"quais arquivos foram modificados."
+msgstr "Ele permite que o git trabalhe em conjunto com um monitor do sistema de arquivos (consulte a seção \"fsmonitor-watchman\" do linkgit:githooks[5]) que pode informá-lo sobre quais os arquivos foram alterados. Isso permite que o git evite ter que fazer um 'lstat()' em todo arquivo para localizar quais arquivos foram modificados."
 
 #. type: Plain text
 #: en/git-update-index.txt:510
 #, priority:100
 msgid "When used in conjunction with the untracked cache, it can further improve performance by avoiding the cost of scanning the entire working directory looking for new files."
-msgstr ""
-"Quando usado em conjunto com o cache não monitorado, pode melhorar ainda "
-"mais o desempenho, evitando o custo de varrer todo o diretório ativo à "
-"procura de novos arquivos."
+msgstr "Quando usado em conjunto com o cache não monitorado, pode melhorar ainda mais o desempenho, evitando o custo de varrer todo o diretório ativo à procura de novos arquivos."
 
 #. type: Plain text
 #: en/git-update-index.txt:518
 #, priority:100
 msgid "If you want to enable (or disable) this feature, it is easier to use the `core.fsmonitor` configuration variable (see linkgit:git-config[1]) than using the `--fsmonitor` option to `git update-index` in each repository, especially if you want to do so across all repositories you use, because you can set the configuration variable in your `$HOME/.gitconfig` just once and have it affect all repositories you touch."
-msgstr ""
-"Caso queira ativar (ou desativar) este recurso, é mais fácil utilizar a "
-"variável de configuração `core.fsmonitor` (consulte linkgit:git-config[1]) "
-"do que utilizar a opção `--fsmonitor` para o comando `git update-index` em "
-"cada repositório, especialmente se você quiser fazê-lo em todos os "
-"repositórios que você utiliza, pois é possível definir a variável de "
-"configuração no seu `$HOME/.gitconfig` apenas uma vez e afetar todos os "
-"repositórios que você toque."
+msgstr "Caso queira ativar (ou desativar) este recurso, é mais fácil utilizar a variável de configuração `core.fsmonitor` (consulte linkgit:git-config[1]) do que utilizar a opção `--fsmonitor` para o comando `git update-index` em cada repositório, especialmente se você quiser fazê-lo em todos os repositórios que você utiliza, pois é possível definir a variável de configuração no seu `$HOME/.gitconfig` apenas uma vez e afetar todos os repositórios que você toque."
 
 #. type: Plain text
 #: en/git-update-index.txt:523
 #, priority:100
 msgid "When the `core.fsmonitor` configuration variable is changed, the file system monitor is added to or removed from the index the next time a command reads the index. When `--[no-]fsmonitor` are used, the file system monitor is immediately added to or removed from the index."
-msgstr ""
-"Quando a variável de configuração `core.fsmonitor` é alterada, o monitor do "
-"sistema de arquivos é adicionado ou removido do índice na próxima vez que um "
-"comando leia o índice. Quando `--[no-]fsmonitor` é usado, o monitor do "
-"sistema de arquivos é imediatamente adicionado ou removido do índice."
+msgstr "Quando a variável de configuração `core.fsmonitor` é alterada, o monitor do sistema de arquivos é adicionado ou removido do índice na próxima vez que um comando leia o índice. Quando `--[no-]fsmonitor` é usado, o monitor do sistema de arquivos é imediatamente adicionado ou removido do índice."
 
 #. type: Plain text
 #: en/git-update-index.txt:534
@@ -66904,14 +57618,11 @@ msgid ""
 "executable bit.   On such an unfortunate filesystem, you may\n"
 "need to use 'git update-index --chmod='.\n"
 msgstr ""
-"O comando honra a variável de configuração `core.filemode`.  Defina como "
-"'false'\n"
+"O comando honra a variável de configuração `core.filemode`.  Defina como 'false'\n"
 "caso o seu repositório esteja em um sistema de arquivos cujos bits\n"
 "dos executáveis não sejam confiáveis (consulte linkgit:git-config[1]).\n"
-"Isso faz com que o comando ignore as diferenças nos modos do arquivo "
-"registrados\n"
-"no índice e no modo do arquivo do sistema de arquivos caso eles divirjam "
-"apenas\n"
+"Isso faz com que o comando ignore as diferenças nos modos do arquivo registrados\n"
+"no índice e no modo do arquivo do sistema de arquivos caso eles divirjam apenas\n"
 "no bit executável.   Em um sistema de arquivos tão infeliz, talvez seja\n"
 "necessário usar o comando 'git update-index --chmod ='.\n"
 
@@ -66919,31 +57630,19 @@ msgstr ""
 #: en/git-update-index.txt:539
 #, priority:100
 msgid "Quite similarly, if `core.symlinks` configuration variable is set to 'false' (see linkgit:git-config[1]), symbolic links are checked out as plain files, and this command does not modify a recorded file mode from symbolic link to regular file."
-msgstr ""
-"De maneira semelhante, caso a variável de configuração `core.symlinks` "
-"esteja definida como 'false' (consulte linkgit:git-config[1]) os links "
-"simbólicos serão verificados como arquivos simples e esse comando não "
-"modificará o modo de gravação do arquivo vindo de link simbólico para um "
-"arquivo regular."
+msgstr "De maneira semelhante, caso a variável de configuração `core.symlinks` esteja definida como 'false' (consulte linkgit:git-config[1]) os links simbólicos serão verificados como arquivos simples e esse comando não modificará o modo de gravação do arquivo vindo de link simbólico para um arquivo regular."
 
 #. type: Plain text
 #: en/git-update-index.txt:542
 #, priority:100
 msgid "The command looks at `core.ignorestat` configuration variable.  See 'Using \"assume unchanged\" bit' section above."
-msgstr ""
-"O comando analisa a variável de configuração `core.ignorestat`.  Consulte a "
-"seção 'Usando o bit \"assuma como inalterado\"' acima."
+msgstr "O comando analisa a variável de configuração `core.ignorestat`.  Consulte a seção 'Usando o bit \"assuma como inalterado\"' acima."
 
 #. type: Plain text
 #: en/git-update-index.txt:547
 #, priority:100
 msgid "The command also looks at `core.trustctime` configuration variable.  It can be useful when the inode change time is regularly modified by something outside Git (file system crawlers and backup systems use ctime for marking files processed) (see linkgit:git-config[1])."
-msgstr ""
-"O comando também analisa a variável de configuração `core.trustctime`.  Pode "
-"ser útil quando o tempo da alteração do \"inode\" for alterado regularmente "
-"por algo fora do Git (os rastreadores do sistema dos arquivos e os sistemas "
-"de backup utilizam o \"ctime\" para marcar os arquivos que forem processados)"
-" (consulte linkgit:git-config[1])."
+msgstr "O comando também analisa a variável de configuração `core.trustctime`.  Pode ser útil quando o tempo da alteração do \"inode\" for alterado regularmente por algo fora do Git (os rastreadores do sistema dos arquivos e os sistemas de backup utilizam o \"ctime\" para marcar os arquivos que forem processados) (consulte linkgit:git-config[1])."
 
 #. type: Plain text
 #: en/git-update-index.txt:551
@@ -66955,25 +57654,13 @@ msgstr "A extensão do cache não rastreado pode ser ativado através da configu
 #: en/git-update-index.txt:561
 #, priority:100
 msgid "Users often try to use the assume-unchanged and skip-worktree bits to tell Git to ignore changes to files that are tracked.  This does not work as expected, since Git may still check working tree files against the index when performing certain operations.  In general, Git does not provide a way to ignore changes to tracked files, so alternate solutions are recommended."
-msgstr ""
-"Os usuários geralmente tentam usar os bits \"assuma como inalterado\" e "
-"ignoram a árvore de trabalho para dizer ao Git para ignorar as alterações "
-"nos arquivos monitorados.  Isso não funciona conforme o esperado, pois o Git "
-"ainda pode verificar os arquivos da árvore de trabalho em relação ao índice "
-"durante a execução de determinadas operações.  Em geral, o Git não fornece "
-"uma maneira de ignorar as alterações nos arquivos monitorados, portanto, as "
-"soluções alternativas são recomendadas."
+msgstr "Os usuários geralmente tentam usar os bits \"assuma como inalterado\" e ignoram a árvore de trabalho para dizer ao Git para ignorar as alterações nos arquivos monitorados.  Isso não funciona conforme o esperado, pois o Git ainda pode verificar os arquivos da árvore de trabalho em relação ao índice durante a execução de determinadas operações.  Em geral, o Git não fornece uma maneira de ignorar as alterações nos arquivos monitorados, portanto, as soluções alternativas são recomendadas."
 
 #. type: Plain text
 #: en/git-update-index.txt:567
 #, priority:100
 msgid "For example, if the file you want to change is some sort of config file, the repository can include a sample config file that can then be copied into the ignored name and modified.  The repository can even include a script to treat the sample file as a template, modifying and copying it automatically."
-msgstr ""
-"Como por exemplo, caso o arquivo que você deseja alterar seja algum tipo de "
-"arquivo de configuração, o repositório poderá incluir um arquivo de "
-"configuração de amostra que poderá ser copiado no nome que foi ignorado e "
-"modificado.  O repositório pode até incluir um script para tratar o arquivo "
-"de amostra como um modelo, modificando e copiando-o automaticamente."
+msgstr "Como por exemplo, caso o arquivo que você deseja alterar seja algum tipo de arquivo de configuração, o repositório poderá incluir um arquivo de configuração de amostra que poderá ser copiado no nome que foi ignorado e modificado.  O repositório pode até incluir um script para tratar o arquivo de amostra como um modelo, modificando e copiando-o automaticamente."
 
 #. type: Plain text
 #: en/git-update-index.txt:573
@@ -66991,71 +57678,43 @@ msgstr "git-update-ref(1)"
 #: en/git-update-ref.txt:7
 #, priority:100
 msgid "git-update-ref - Update the object name stored in a ref safely"
-msgstr ""
-"git-update-ref - Atualize o nome do objeto armazenado em uma \"ref\" com "
-"segurança"
+msgstr "git-update-ref - Atualize o nome do objeto armazenado em uma \"ref\" com segurança"
 
 #. type: Plain text
 #: en/git-update-ref.txt:12
 #, no-wrap, priority:100
 msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
-msgstr ""
-"'git update-ref' [-m <motivo>] [--no-deref] (-d <ref> [<valorantigo>] | "
-"[--create-reflog] <ref> <novovalor> [<valorantigo>] | --stdin [-z])\n"
+msgstr "'git update-ref' [-m <motivo>] [--no-deref] (-d <ref> [<valorantigo>] | [--create-reflog] <ref> <novovalor> [<valorantigo>] | --stdin [-z])\n"
 
 #. type: Plain text
 #: en/git-update-ref.txt:18
 #, priority:100
 msgid "Given two arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs.  E.g. `git update-ref HEAD <newvalue>` updates the current branch head to the new object."
-msgstr ""
-"Quando dois argumentos forem utilizados, armazena o <novovalor> na <ref>, "
-"possivelmente removendo as referências das refs simbólicas.  O `git update-"
-"ref HEAD <novovalor>` atualiza o cabeçalho do ramo atual para o novo objeto "
-"por exemplo."
+msgstr "Quando dois argumentos forem utilizados, armazena o <novovalor> na <ref>, possivelmente removendo as referências das refs simbólicas.  O `git update-ref HEAD <novovalor>` atualiza o cabeçalho do ramo atual para o novo objeto por exemplo."
 
 #. type: Plain text
 #: en/git-update-ref.txt:27
 #, priority:100
 msgid "Given three arguments, stores the <newvalue> in the <ref>, possibly dereferencing the symbolic refs, after verifying that the current value of the <ref> matches <oldvalue>.  E.g. `git update-ref refs/heads/master <newvalue> <oldvalue>` updates the master branch head to <newvalue> only if its current value is <oldvalue>.  You can specify 40 \"0\" or an empty string as <oldvalue> to make sure that the ref you are creating does not exist."
-msgstr ""
-"Quando três argumentos forem utilizados, armazena o <novovalor> na <ref>, "
-"possivelmente tirando as referências das refs simbólicas, depois de "
-"verificar se o valor atual da <ref> coincide com o <valorantigo>.  O  `git "
-"update-ref refs/heads/master<novovalor> <valorantigo>` atualiza o cabeçalho "
-"do ramo principal para o <novovalor> somente se o seu valor atual for um "
-"<valorantigo> por exemplo.  Você pode definir 40 '0' ou uma sequência vazia "
-"como o <valorantigo> para garantir que a referência que você está criando "
-"não exista."
+msgstr "Quando três argumentos forem utilizados, armazena o <novovalor> na <ref>, possivelmente tirando as referências das refs simbólicas, depois de verificar se o valor atual da <ref> coincide com o <valorantigo>.  O  `git update-ref refs/heads/master<novovalor> <valorantigo>` atualiza o cabeçalho do ramo principal para o <novovalor> somente se o seu valor atual for um <valorantigo> por exemplo.  Você pode definir 40 '0' ou uma sequência vazia como o <valorantigo> para garantir que a referência que você está criando não exista."
 
 #. type: Plain text
 #: en/git-update-ref.txt:31
 #, priority:100
 msgid "It also allows a \"ref\" file to be a symbolic pointer to another ref file by starting with the four-byte header sequence of \"ref:\"."
-msgstr ""
-"Ele também permite que um arquivo \"ref\" seja um ponteiro simbólico para um "
-"outro arquivo \"ref\", iniciando com a sequência de quatro bytes do "
-"cabeçalho \"ref:\"."
+msgstr "Ele também permite que um arquivo \"ref\" seja um ponteiro simbólico para um outro arquivo \"ref\", iniciando com a sequência de quatro bytes do cabeçalho \"ref:\"."
 
 #. type: Plain text
 #: en/git-update-ref.txt:39
 #, priority:100
 msgid "More importantly, it allows the update of a ref file to follow these symbolic pointers, whether they are symlinks or these \"regular file symbolic refs\".  It follows *real* symlinks only if they start with \"refs/\": otherwise it will just try to read them and update them as a regular file (i.e. it will allow the filesystem to follow them, but will overwrite such a symlink to somewhere else with a regular filename)."
-msgstr ""
-"O mais importante, permite que a atualização de um arquivo \"ref\" siga "
-"estes ponteiros simbólicos, sejam links simbólicos ou estas \"refs "
-"simbólicas do arquivo regular\".  Segue os links simbólicos *reais* caso "
-"apenas eles começarem com \"refs/\": caso contrário, ele apenas tentará lê-"
-"los e atualizá-los como um arquivo regular (ou seja, permitirá que o sistema "
-"de arquivos os siga, mas substituirá este link simbólico para algum outro "
-"lugar e com um nome comum do arquivo)."
+msgstr "O mais importante, permite que a atualização de um arquivo \"ref\" siga estes ponteiros simbólicos, sejam links simbólicos ou estas \"refs simbólicas do arquivo regular\".  Segue os links simbólicos *reais* caso apenas eles começarem com \"refs/\": caso contrário, ele apenas tentará lê-los e atualizá-los como um arquivo regular (ou seja, permitirá que o sistema de arquivos os siga, mas substituirá este link simbólico para algum outro lugar e com um nome comum do arquivo)."
 
 #. type: Plain text
 #: en/git-update-ref.txt:42
 #, priority:100
 msgid "If --no-deref is given, <ref> itself is overwritten, rather than the result of following the symbolic pointers."
-msgstr ""
-"Caso a opção `--no-deref` seja utilizado, a própria <ref> será substituída, "
-"em vez do resultado de seguir os ponteiros simbólicos."
+msgstr "Caso a opção `--no-deref` seja utilizado, a própria <ref> será substituída, em vez do resultado de seguir os ponteiros simbólicos."
 
 #. type: Plain text
 #: en/git-update-ref.txt:44
@@ -67085,30 +57744,19 @@ msgstr "\techo \"$head\" > \"$GIT_DIR/HEAD\"\n"
 #: en/git-update-ref.txt:57
 #, priority:100
 msgid "both from a symlink following standpoint *and* an error checking standpoint.  The \"refs/\" rule for symlinks means that symlinks that point to \"outside\" the tree are safe: they'll be followed for reading but not for writing (so we'll never write through a ref symlink to some other tree, if you have copied a whole archive by creating a symlink tree)."
-msgstr ""
-"ambos de um link simbólico seguindo o ponto de vista *e* um ponto da "
-"averiguação do erro.  A regra \"refs/\" para os links simbólicos significa "
-"que os links simbólicos que apontem para \"fora\" da árvore são seguros: "
-"eles serão seguidos para leitura, mas não para gravação (portanto, nunca "
-"escreveremos através de um link simbólico \"ref\" para uma outra árvore, "
-"caso tenha copiado um arquivo inteiro ao criar um link simbólico de uma "
-"árvore)."
+msgstr "ambos de um link simbólico seguindo o ponto de vista *e* um ponto da averiguação do erro.  A regra \"refs/\" para os links simbólicos significa que os links simbólicos que apontem para \"fora\" da árvore são seguros: eles serão seguidos para leitura, mas não para gravação (portanto, nunca escreveremos através de um link simbólico \"ref\" para uma outra árvore, caso tenha copiado um arquivo inteiro ao criar um link simbólico de uma árvore)."
 
 #. type: Plain text
 #: en/git-update-ref.txt:60
 #, priority:100
 msgid "With `-d` flag, it deletes the named <ref> after verifying it still contains <oldvalue>."
-msgstr ""
-"Com a opção `-d`, exclui o nome <ref> após a verificação que ainda contenha "
-"o <valorantigo>."
+msgstr "Com a opção `-d`, exclui o nome <ref> após a verificação que ainda contenha o <valorantigo>."
 
 #. type: Plain text
 #: en/git-update-ref.txt:63
 #, priority:100
 msgid "With `--stdin`, update-ref reads instructions from standard input and performs all modifications together.  Specify commands of the form:"
-msgstr ""
-"Com a opção `--stdin`, o 'update-ref' lê as instruções da entrada padrão e "
-"executa todas as alterações juntas.  Defina os comandos do formulário:"
+msgstr "Com a opção `--stdin`, o 'update-ref' lê as instruções da entrada padrão e executa todas as alterações juntas.  Defina os comandos do formulário:"
 
 #. type: Plain text
 #: en/git-update-ref.txt:73
@@ -67138,28 +57786,19 @@ msgstr ""
 #: en/git-update-ref.txt:76
 #, priority:100
 msgid "With `--create-reflog`, update-ref will create a reflog for each ref even if one would not ordinarily be created."
-msgstr ""
-"Com a opção `--create-reflog`, o 'update-ref' criará um reflog para cada "
-"\"ref\", mesmo que um não seja criado normalmente."
+msgstr "Com a opção `--create-reflog`, o 'update-ref' criará um reflog para cada \"ref\", mesmo que um não seja criado normalmente."
 
 #. type: Plain text
 #: en/git-update-ref.txt:81
 #, priority:100
 msgid "Quote fields containing whitespace as if they were strings in C source code; i.e., surrounded by double-quotes and with backslash escapes.  Use 40 \"0\" characters or the empty string to specify a zero value.  To specify a missing value, omit the value and its preceding SP entirely."
-msgstr ""
-"Cite os campos que contenham espaços como se fossem textos em um código-"
-"fonte C; ou seja, cercado por aspas duplas e com escapes com barra "
-"invertida.  Use 40 caracteres '0' ou a sequência vazia para definir um valor "
-"zero.  Para definir um valor ausente, omita completamente o valor do seu SP "
-"anterior."
+msgstr "Cite os campos que contenham espaços como se fossem textos em um código-fonte C; ou seja, cercado por aspas duplas e com escapes com barra invertida.  Use 40 caracteres '0' ou a sequência vazia para definir um valor zero.  Para definir um valor ausente, omita completamente o valor do seu SP anterior."
 
 #. type: Plain text
 #: en/git-update-ref.txt:84
 #, priority:100
 msgid "Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
-msgstr ""
-"Como alternativa, utilize a opção `-z` para definir no formato terminado por "
-"`NUL`, sem citar:"
+msgstr "Como alternativa, utilize a opção `-z` para definir no formato terminado por `NUL`, sem citar:"
 
 #. type: Plain text
 #: en/git-update-ref.txt:94
@@ -67189,36 +57828,25 @@ msgstr ""
 #: en/git-update-ref.txt:97
 #, priority:100
 msgid "In this format, use 40 \"0\" to specify a zero value, and use the empty string to specify a missing value."
-msgstr ""
-"Neste formato, utilize 40 '0' para definir um valor zero e utilize texto "
-"cazio para definir um valor ausente."
+msgstr "Neste formato, utilize 40 '0' para definir um valor zero e utilize texto cazio para definir um valor ausente."
 
 #. type: Plain text
 #: en/git-update-ref.txt:101
 #, priority:100
 msgid "In either format, values can be specified in any form that Git recognizes as an object name.  Commands in any other format or a repeated <ref> produce an error.  Command meanings are:"
-msgstr ""
-"Em qualquer formato, os valores podem ser definidos de qualquer forma que o "
-"Git reconheça como um nome de objeto.  Os comandos em qualquer outro formato "
-"ou em uma <ref> repetida geram um erro.  Os significados dos comandos são:"
+msgstr "Em qualquer formato, os valores podem ser definidos de qualquer forma que o Git reconheça como um nome de objeto.  Os comandos em qualquer outro formato ou em uma <ref> repetida geram um erro.  Os significados dos comandos são:"
 
 #. type: Plain text
 #: en/git-update-ref.txt:107
 #, priority:100
 msgid "Set <ref> to <newvalue> after verifying <oldvalue>, if given.  Specify a zero <newvalue> to ensure the ref does not exist after the update and/or a zero <oldvalue> to make sure the ref does not exist before the update."
-msgstr ""
-"Defina uma <ref> para um <novovalor> após a verificação do <valorantigo>, "
-"caso seja informado.  Defina um <novovalor> como zero para garantir que a "
-"\"ref\" não exista após a atualização e/ou um <valorantigo> como zero para "
-"garantir que a \"ref\" não exista antes da atualização."
+msgstr "Defina uma <ref> para um <novovalor> após a verificação do <valorantigo>, caso seja informado.  Defina um <novovalor> como zero para garantir que a \"ref\" não exista após a atualização e/ou um <valorantigo> como zero para garantir que a \"ref\" não exista antes da atualização."
 
 #. type: Plain text
 #: en/git-update-ref.txt:111
 #, priority:100
 msgid "Create <ref> with <newvalue> after verifying it does not exist.  The given <newvalue> may not be zero."
-msgstr ""
-"Crie uma `<ref>` com `<newvalue>` depois de verificar se ele já não existe.  "
-"O `<newvalue>` informado, não pode ser zero."
+msgstr "Crie uma `<ref>` com `<newvalue>` depois de verificar se ele já não existe.  O `<newvalue>` informado, não pode ser zero."
 
 #. type: Labeled list
 #: en/git-update-ref.txt:112
@@ -67230,9 +57858,7 @@ msgstr "delete"
 #: en/git-update-ref.txt:115
 #, priority:100
 msgid "Delete <ref> after verifying it exists with <oldvalue>, if given.  If given, <oldvalue> may not be zero."
-msgstr ""
-"Caso seja informado, exclua a <ref> depois de verificar se ele existe com "
-"<oldvalue>.  Caso seja, o <oldvalue> não pode ser zero."
+msgstr "Caso seja informado, exclua a <ref> depois de verificar se ele existe com <oldvalue>.  Caso seja, o <oldvalue> não pode ser zero."
 
 #. type: Labeled list
 #: en/git-update-ref.txt:116
@@ -67244,9 +57870,7 @@ msgstr "verify"
 #: en/git-update-ref.txt:119
 #, priority:100
 msgid "Verify <ref> against <oldvalue> but do not change it.  If <oldvalue> is zero or missing, the ref must not exist."
-msgstr ""
-"Verifique a `<ref>` em relação ao `<valorantigo>`, mas não o altere.  Caso o "
-"`<valorantigo>` seja zero ou ausente, a \"ref\" não deve existir."
+msgstr "Verifique a `<ref>` em relação ao `<valorantigo>`, mas não o altere.  Caso o `<valorantigo>` seja zero ou ausente, a \"ref\" não deve existir."
 
 #. type: Labeled list
 #: en/git-update-ref.txt:120
@@ -67258,19 +57882,13 @@ msgstr "option"
 #: en/git-update-ref.txt:124
 #, priority:100
 msgid "Modify behavior of the next command naming a <ref>.  The only valid option is `no-deref` to avoid dereferencing a symbolic ref."
-msgstr ""
-"Modifique o comportamento do próximo comando nomeando uma <ref>.  A única "
-"opção válida é `no-deref` para evitar a perda da referência de uma \"ref\" "
-"simbólica."
+msgstr "Modifique o comportamento do próximo comando nomeando uma <ref>.  A única opção válida é `no-deref` para evitar a perda da referência de uma \"ref\" simbólica."
 
 #. type: Plain text
 #: en/git-update-ref.txt:129
 #, priority:100
 msgid "Start a transaction. In contrast to a non-transactional session, a transaction will automatically abort if the session ends without an explicit commit."
-msgstr ""
-"Inicie uma transação. Em contraste com uma sessão não transacionada, uma "
-"transação irá interromper automaticamente caso a cessão se encerre sem um "
-"commit explícito."
+msgstr "Inicie uma transação. Em contraste com uma sessão não transacionada, uma transação irá interromper automaticamente caso a cessão se encerre sem um commit explícito."
 
 #. type: Labeled list
 #: en/git-update-ref.txt:130
@@ -67282,18 +57900,13 @@ msgstr "prepare"
 #: en/git-update-ref.txt:134
 #, priority:100
 msgid "Prepare to commit the transaction. This will create lock files for all queued reference updates. If one reference could not be locked, the transaction will be aborted."
-msgstr ""
-"Prepare para transacionar o commit. Isto criará uma trava nos arquivos em "
-"todas as atualizações das referências que estiverem na fila. No caso de uma "
-"referência não puder ser travada, a transação irá ser encerrada."
+msgstr "Prepare para transacionar o commit. Isto criará uma trava nos arquivos em todas as atualizações das referências que estiverem na fila. No caso de uma referência não puder ser travada, a transação irá ser encerrada."
 
 #. type: Plain text
 #: en/git-update-ref.txt:138
 #, priority:100
 msgid "Commit all reference updates queued for the transaction, ending the transaction."
-msgstr ""
-"Faça o commit de todas as atualizações da referência na fila para a "
-"transação, finalizando a mesma."
+msgstr "Faça o commit de todas as atualizações da referência na fila para a transação, finalizando a mesma."
 
 #. type: Labeled list
 #: en/git-update-ref.txt:139
@@ -67305,20 +57918,13 @@ msgstr "abort"
 #: en/git-update-ref.txt:142
 #, priority:100
 msgid "Abort the transaction, releasing all locks if the transaction is in prepared state."
-msgstr ""
-"Interrompa a transação, liberando todos os bloqueios caso a transação esteja "
-"na condição de preparado."
+msgstr "Interrompa a transação, liberando todos os bloqueios caso a transação esteja na condição de preparado."
 
 #. type: Plain text
 #: en/git-update-ref.txt:148
 #, priority:100
 msgid "If all <ref>s can be locked with matching <oldvalue>s simultaneously, all modifications are performed.  Otherwise, no modifications are performed.  Note that while each individual <ref> is updated or deleted atomically, a concurrent reader may still see a subset of the modifications."
-msgstr ""
-"Caso todos as <ref>s puderem ser bloqueadas com <valorantigo> de forma "
-"simultânea, todas as alterações serão aplicadas.  Caso contrário, nada será "
-"feito.  Observe que, enquanto cada <ref> individual é atualizada ou excluída "
-"atomicamente, um leitor simultâneo ainda pode ver um subconjunto das "
-"alterações."
+msgstr "Caso todos as <ref>s puderem ser bloqueadas com <valorantigo> de forma simultânea, todas as alterações serão aplicadas.  Caso contrário, nada será feito.  Observe que, enquanto cada <ref> individual é atualizada ou excluída atomicamente, um leitor simultâneo ainda pode ver um subconjunto das alterações."
 
 #. type: Title -
 #: en/git-update-ref.txt:150
@@ -67330,14 +57936,7 @@ msgstr "ATUALIZAÇÕES DOS REGISTROS DOS EVENTOS"
 #: en/git-update-ref.txt:157
 #, priority:100
 msgid "If config parameter \"core.logAllRefUpdates\" is true and the ref is one under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing all symbolic refs before creating the log name) describing the change in ref value.  Log lines are formatted as:"
-msgstr ""
-"Caso o parâmetro de configuração \"core.logAllRefUpdates\" seja verdadeiro e "
-"a \"ref\" for uma no \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\" ou "
-"o simbólico \"ref\" `HEAD`; ou caso o arquivo `$GIT_DIR/logs/<ref>` existir, "
-"o comando `git update-ref` anexará uma linha ao arquivo do registor log `$"
-"GIT_DIR/logs/<ref>` (removendo a referência de todas as referências "
-"simbólicas antes de criar o nome do registro log) descrevendo a alteração no "
-"valor da ref.  As linhas do registro log são formatadas como:"
+msgstr "Caso o parâmetro de configuração \"core.logAllRefUpdates\" seja verdadeiro e a \"ref\" for uma no \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\" ou o simbólico \"ref\" `HEAD`; ou caso o arquivo `$GIT_DIR/logs/<ref>` existir, o comando `git update-ref` anexará uma linha ao arquivo do registor log `$GIT_DIR/logs/<ref>` (removendo a referência de todas as referências simbólicas antes de criar o nome do registro log) descrevendo a alteração no valor da ref.  As linhas do registro log são formatadas como:"
 
 #. type: Plain text
 #: en/git-update-ref.txt:159
@@ -67349,12 +57948,7 @@ msgstr "    oldsha1 SP newsha1 SP committer LF\n"
 #: en/git-update-ref.txt:164
 #, priority:100
 msgid "Where \"oldsha1\" is the 40 character hexadecimal value previously stored in <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and \"committer\" is the committer's name, email address and date in the standard Git committer ident format."
-msgstr ""
-"Onde \"sha1antigo\" é o valor hexadecimal com 40 caracteres armazenado "
-"anteriormente na <ref>, o \"novosha1\" é o valor hexadecimal com 40 "
-"caracteres do <novovalor> e \"committer\" é o nome de quem fez o commit, o "
-"endereço de e-mail e a data no formato Git predefinido da identificação de "
-"quem faz o commit."
+msgstr "Onde \"sha1antigo\" é o valor hexadecimal com 40 caracteres armazenado anteriormente na <ref>, o \"novosha1\" é o valor hexadecimal com 40 caracteres do <novovalor> e \"committer\" é o nome de quem fez o commit, o endereço de e-mail e a data no formato Git predefinido da identificação de quem faz o commit."
 
 #. type: Plain text
 #: en/git-update-ref.txt:166
@@ -67372,18 +57966,13 @@ msgstr "    oldsha1 SP newsha1 SP committer TAB message LF\n"
 #: en/git-update-ref.txt:171
 #, priority:100
 msgid "Where all fields are as described above and \"message\" is the value supplied to the -m option."
-msgstr ""
-"Onde todos os campos são como descritos acima e a \"mensagem\" é o valor "
-"informado para a opção '-m'."
+msgstr "Onde todos os campos são como descritos acima e a \"mensagem\" é o valor informado para a opção '-m'."
 
 #. type: Plain text
 #: en/git-update-ref.txt:175
 #, priority:100
 msgid "An update will fail (without changing <ref>) if the current user is unable to create a new log file, append to the existing log file or does not have committer information available."
-msgstr ""
-"Uma atualização irá falhar (sem alterar a <ref>) caso o usuário atual não "
-"consiga criar um novo arquivo de registro log, anexá-lo ao arquivo log já "
-"existente ou caso não haja informações disponíveis."
+msgstr "Uma atualização irá falhar (sem alterar a <ref>) caso o usuário atual não consiga criar um novo arquivo de registro log, anexá-lo ao arquivo log já existente ou caso não haja informações disponíveis."
 
 #. type: Title =
 #: en/git-update-server-info.txt:2
@@ -67395,9 +57984,7 @@ msgstr "git-update-server-info(1)"
 #: en/git-update-server-info.txt:7
 #, priority:100
 msgid "git-update-server-info - Update auxiliary info file to help dumb servers"
-msgstr ""
-"git-update-server-info - Atualize o arquivo de informações auxiliares para "
-"ajudar os servidores burros"
+msgstr "git-update-server-info - Atualize o arquivo de informações auxiliares para ajudar os servidores burros"
 
 #. type: Plain text
 #: en/git-update-server-info.txt:13
@@ -67409,20 +57996,13 @@ msgstr "'git update-server-info'\n"
 #: en/git-update-server-info.txt:21
 #, priority:100
 msgid "A dumb server that does not do on-the-fly pack generations must have some auxiliary information files in $GIT_DIR/info and $GIT_OBJECT_DIRECTORY/info directories to help clients discover what references and packs the server has.  This command generates such auxiliary files."
-msgstr ""
-"Um servidor burro que não gera pacotes em tempo real deve ter alguns "
-"arquivos das informações auxiliares nos diretórios `$GIT_DIR/info` e `$"
-"GIT_OBJECT_DIRECTORY/info` para ajudar os clientes a descobrir quais as "
-"referências e os pacotes o servidor possui.  Este comando gera estes "
-"arquivos auxiliares."
+msgstr "Um servidor burro que não gera pacotes em tempo real deve ter alguns arquivos das informações auxiliares nos diretórios `$GIT_DIR/info` e `$GIT_OBJECT_DIRECTORY/info` para ajudar os clientes a descobrir quais as referências e os pacotes o servidor possui.  Este comando gera estes arquivos auxiliares."
 
 #. type: Plain text
 #: en/git-update-server-info.txt:28
 #, priority:100
 msgid "Currently the command updates the following files.  Please see linkgit:gitrepository-layout[5] for description of what they are for:"
-msgstr ""
-"Atualmente, o comando atualiza os seguintes arquivos.  Para obter uma "
-"descrição da sua utilidade, consulte linkgit:gitrepository-layout[5]:"
+msgstr "Atualmente, o comando atualiza os seguintes arquivos.  Para obter uma descrição da sua utilidade, consulte linkgit:gitrepository-layout[5]:"
 
 #. type: Plain text
 #: en/git-update-server-info.txt:30
@@ -67458,9 +58038,7 @@ msgstr "'git upload-archive' <diretório>\n"
 #: en/git-upload-archive.txt:18
 #, priority:100
 msgid "Invoked by 'git archive --remote' and sends a generated archive to the other end over the Git protocol."
-msgstr ""
-"Chamado através do comando `git archive --remote` e envia um arquivo gerado "
-"para a outra extremidade através do protocolo Git."
+msgstr "Chamado através do comando `git archive --remote` e envia um arquivo gerado para a outra extremidade através do protocolo Git."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:22
@@ -67478,61 +58056,37 @@ msgstr "SEGURANÇA"
 #: en/git-upload-archive.txt:32
 #, priority:100
 msgid "In order to protect the privacy of objects that have been removed from history but may not yet have been pruned, `git-upload-archive` avoids serving archives for commits and trees that are not reachable from the repository's refs.  However, because calculating object reachability is computationally expensive, `git-upload-archive` implements a stricter but easier-to-check set of rules:"
-msgstr ""
-"Para proteger a privacidade dos objetos que foram removidos da história, mas "
-"que ainda não foram removidos, o comando `git-upload-archive` evita servir "
-"os arquivos para os commits e as árvores que não são acessíveis a partir das "
-"referências do repositório.  No entanto, como calcular a acessibilidade de "
-"objetos é computacionalmente dispendioso, o comando `git-upload-archive` "
-"implementa um conjunto de regras mais rígidas, porém mais fácil de verificar:"
+msgstr "Para proteger a privacidade dos objetos que foram removidos da história, mas que ainda não foram removidos, o comando `git-upload-archive` evita servir os arquivos para os commits e as árvores que não são acessíveis a partir das referências do repositório.  No entanto, como calcular a acessibilidade de objetos é computacionalmente dispendioso, o comando `git-upload-archive` implementa um conjunto de regras mais rígidas, porém mais fácil de verificar:"
 
 #. type: Plain text
 #: en/git-upload-archive.txt:35
 #, priority:100
 msgid "Clients may request a commit or tree that is pointed to directly by a ref. E.g., `git archive --remote=origin v1.0`."
-msgstr ""
-"Os clientes podem solicitar um commit ou uma árvore que aponte diretamente "
-"por uma referência. `git archive --remote=origin v1.0` por exemplo."
+msgstr "Os clientes podem solicitar um commit ou uma árvore que aponte diretamente por uma referência. `git archive --remote=origin v1.0` por exemplo."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:38
 #, priority:100
 msgid "Clients may request a sub-tree within a commit or tree using the `ref:path` syntax. E.g., `git archive --remote=origin v1.0:Documentation`."
-msgstr ""
-"Os clientes podem solicitar uma subárvore dentro de um commit ou uma árvore "
-"utilizando a sintaxe `ref:path`. Como por exemplo, `git archive --"
-"remote=origin v1.0:Documentation`."
+msgstr "Os clientes podem solicitar uma subárvore dentro de um commit ou uma árvore utilizando a sintaxe `ref:path`. Como por exemplo, `git archive --remote=origin v1.0:Documentation`."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:43
 #, priority:100
 msgid "Clients may _not_ use other sha1 expressions, even if the end result is reachable. E.g., neither a relative commit like `master^` nor a literal sha1 like `abcd1234` is allowed, even if the result is reachable from the refs."
-msgstr ""
-"Os clientes não podem utilizar outras expressões SHA-1, mesmo que o "
-"resultado final seja acessível. Por exemplo, nem um commit que tenha relação "
-"com `master^` nem um sha1 literal como `abcd1234` são permitidos, mesmo que "
-"o resultado seja acessível através das referências."
+msgstr "Os clientes não podem utilizar outras expressões SHA-1, mesmo que o resultado final seja acessível. Por exemplo, nem um commit que tenha relação com `master^` nem um sha1 literal como `abcd1234` são permitidos, mesmo que o resultado seja acessível através das referências."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:48
 #, priority:100
 msgid "Note that rule 3 disallows many cases that do not have any privacy implications. These rules are subject to change in future versions of git, and the server accessed by `git archive --remote` may or may not follow these exact rules."
-msgstr ""
-"Observe que a regra 3 não permitem muitos casos onde não tenham implicações "
-"de privacidade. Essas regras estão sujeitas a alterações nas versões futuras "
-"do git, e o servidor acessado pelo `git archive --remote` pode ou não seguir "
-"exatamente estas regras."
+msgstr "Observe que a regra 3 não permitem muitos casos onde não tenham implicações de privacidade. Essas regras estão sujeitas a alterações nas versões futuras do git, e o servidor acessado pelo `git archive --remote` pode ou não seguir exatamente estas regras."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:54
 #, priority:100
 msgid "If the config option `uploadArchive.allowUnreachable` is true, these rules are ignored, and clients may use arbitrary sha1 expressions.  This is useful if you do not care about the privacy of unreachable objects, or if your object database is already publicly available for access via non-smart-http."
-msgstr ""
-"Caso a opção de configuração `uploadArchive.allowUnreachable` seja "
-"verdadeira, estas regras serão ignoradas e os clientes poderão utilizar "
-"expressões SHA-1 de forma arbitrária.  É útil caso você não se importe com a "
-"privacidade dos objetos inacessíveis ou se o banco de dados dos objetos já "
-"esteja disponível publicamente para acesso através do http não inteligente."
+msgstr "Caso a opção de configuração `uploadArchive.allowUnreachable` seja verdadeira, estas regras serão ignoradas e os clientes poderão utilizar expressões SHA-1 de forma arbitrária.  É útil caso você não se importe com a privacidade dos objetos inacessíveis ou se o banco de dados dos objetos já esteja disponível publicamente para acesso através do http não inteligente."
 
 #. type: Plain text
 #: en/git-upload-archive.txt:59
@@ -67550,8 +58104,7 @@ msgstr "git-upload-pack(1)"
 #: en/git-upload-pack.txt:7
 #, priority:100
 msgid "git-upload-pack - Send objects packed back to git-fetch-pack"
-msgstr ""
-"git-upload-pack - Envia os objetos compactados de volta para o git-fetch-pack"
+msgstr "git-upload-pack - Envia os objetos compactados de volta para o git-fetch-pack"
 
 #. type: Plain text
 #: en/git-upload-pack.txt:14
@@ -67567,9 +58120,7 @@ msgstr ""
 #: en/git-upload-pack.txt:19
 #, priority:100
 msgid "Invoked by 'git fetch-pack', learns what objects the other side is missing, and sends them after packing."
-msgstr ""
-"Chamado através do comando 'git fetch-pack', aprende quais os objetos faltam "
-"no outro lado e os envia após empacotá-los."
+msgstr "Chamado através do comando 'git fetch-pack', aprende quais os objetos faltam no outro lado e os envia após empacotá-los."
 
 #. type: Plain text
 #: en/git-upload-pack.txt:24
@@ -67587,8 +58138,7 @@ msgstr "--[no-]strict"
 #: en/git-upload-pack.txt:30
 #, priority:100
 msgid "Do not try <directory>/.git/ if <directory> is no Git directory."
-msgstr ""
-"Não tente <diretório>/.git/ caso o <diretório> não seja um diretório Git."
+msgstr "Não tente <diretório>/.git/ caso o <diretório> não seja um diretório Git."
 
 #. type: Plain text
 #: en/git-upload-pack.txt:33
@@ -67606,10 +58156,7 @@ msgstr "--stateless-rpc"
 #: en/git-upload-pack.txt:38
 #, priority:100
 msgid "Perform only a single read-write cycle with stdin and stdout.  This fits with the HTTP POST request processing model where a program may read the request, write a response, and must exit."
-msgstr ""
-"Execute apenas um único ciclo de gravação e leitura com o stdin e o stdout.  "
-"Isso se ajusta ao modelo de processamento de solicitação HTTP POST, onde um "
-"programa pode ler a solicitação, gravar uma resposta e deve encerrar."
+msgstr "Execute apenas um único ciclo de gravação e leitura com o stdin e o stdout.  Isso se ajusta ao modelo de processamento de solicitação HTTP POST, onde um programa pode ler a solicitação, gravar uma resposta e deve encerrar."
 
 #. type: Labeled list
 #: en/git-upload-pack.txt:39
@@ -67621,11 +58168,7 @@ msgstr "--advertise-refs"
 #: en/git-upload-pack.txt:43
 #, priority:100
 msgid "Only the initial ref advertisement is output, and the program exits immediately. This fits with the HTTP GET request model, where no request content is received but a response must be produced."
-msgstr ""
-"Somente o anúncio da \"ref\" inicial é produzido e o programa encerra "
-"imediatamente. Isso se encaixa no modelo de solicitação HTTP GET, onde "
-"nenhum conteúdo de solicitação é recebido, porém uma resposta deve ser "
-"produzida."
+msgstr "Somente o anúncio da \"ref\" inicial é produzido e o programa encerra imediatamente. Isso se encaixa no modelo de solicitação HTTP GET, onde nenhum conteúdo de solicitação é recebido, porém uma resposta deve ser produzida."
 
 #. type: Plain text
 #: en/git-upload-pack.txt:46
@@ -67667,11 +58210,7 @@ msgstr "Imprime a variável lógica do Git."
 #: en/git-var.txt:25
 #, priority:100
 msgid "Cause the logical variables to be listed. In addition, all the variables of the Git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of `git config -l`.)"
-msgstr ""
-"Faça com que as variáveis lógicas sejam listadas. Além disso, todas as "
-"variáveis do arquivo de configuração do Git '.git/config' também sejam "
-"listadas. (No entanto, as variáveis de configuração que listam a "
-"funcionalidade, estão obsoletas em favor do `git config -l`.)"
+msgstr "Faça com que as variáveis lógicas sejam listadas. Além disso, todas as variáveis do arquivo de configuração do Git '.git/config' também sejam listadas. (No entanto, as variáveis de configuração que listam a funcionalidade, estão obsoletas em favor do `git config -l`.)"
 
 #. type: Plain text
 #: en/git-var.txt:30
@@ -67723,21 +58262,13 @@ msgstr "GIT_EDITOR"
 #: en/git-var.txt:48
 #, priority:100
 msgid "Text editor for use by Git commands.  The value is meant to be interpreted by the shell when it is used.  Examples: `~/bin/vi`, `$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --nofork`.  The order of preference is the `$GIT_EDITOR` environment variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then the default chosen at compile time, which is usually 'vi'."
-msgstr ""
-"O editor de texto para ser utilizado pelos comandos Git.  Quando for "
-"utilizado, o valor deve ser interpretado pelo shell.  Exemplos: `~/bin/vi`, "
-"`$ALGUMA_VÁRIAVEL_DO_AMBIENTE`, `\"C:\\Arquivo de Programas\\Vim\\gvim.exe\" "
-"--nofork`.  A ordem preferencial é a variável de ambiente `$GIT_EDITOR`, "
-"depois a configuração do `core.pager`, seguido do `$VISUAL`, então `$EDITOR`"
-", e a predefinição escolhida no momento da compilação (geralmente 'vi')."
+msgstr "O editor de texto para ser utilizado pelos comandos Git.  Quando for utilizado, o valor deve ser interpretado pelo shell.  Exemplos: `~/bin/vi`, `$ALGUMA_VÁRIAVEL_DO_AMBIENTE`, `\"C:\\Arquivo de Programas\\Vim\\gvim.exe\" --nofork`.  A ordem preferencial é a variável de ambiente `$GIT_EDITOR`, depois a configuração do `core.pager`, seguido do `$VISUAL`, então `$EDITOR`, e a predefinição escolhida no momento da compilação (geralmente 'vi')."
 
 #. type: Plain text
 #: en/git-var.txt:50
 #, no-wrap, priority:100
 msgid "    The build you are using chose '{git-default-editor}' as the default.\n"
-msgstr ""
-"    A construção que você está utilizando escolheu '{git-default-editor}' "
-"como o predefinido.\n"
+msgstr "    A construção que você está utilizando escolheu '{git-default-editor}' como o predefinido.\n"
 
 #. type: Labeled list
 #: en/git-var.txt:52
@@ -67749,20 +58280,13 @@ msgstr "GIT_PAGER"
 #: en/git-var.txt:58
 #, priority:100
 msgid "Text viewer for use by Git commands (e.g., 'less').  The value is meant to be interpreted by the shell.  The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less')."
-msgstr ""
-"O editor de texto para ser utilizado pelos comandos Git (como, por exemplo, "
-"'less').  Quando for utilizado, o valor deve ser interpretado pelo shell.  A "
-"ordem de preferência é a variável de ambiente `$GIT_PAGER`, depois a "
-"configuração do` core.pager`, depois o `$PAGER` e o padrão selecionado no "
-"momento da compilação (geralmente 'less')."
+msgstr "O editor de texto para ser utilizado pelos comandos Git (como, por exemplo, 'less').  Quando for utilizado, o valor deve ser interpretado pelo shell.  A ordem de preferência é a variável de ambiente `$GIT_PAGER`, depois a configuração do` core.pager`, depois o `$PAGER` e o padrão selecionado no momento da compilação (geralmente 'less')."
 
 #. type: Plain text
 #: en/git-var.txt:60
 #, no-wrap, priority:100
 msgid "    The build you are using chose '{git-default-pager}' as the default.\n"
-msgstr ""
-"    A construção que você está usando escolheu '{git-default-pager}' como a "
-"sua predefinição.\n"
+msgstr "    A construção que você está usando escolheu '{git-default-pager}' como a sua predefinição.\n"
 
 #. type: Plain text
 #: en/git-var.txt:67
@@ -67798,9 +58322,7 @@ msgstr "Valida a assinatura GPG criada por 'git commit -S'."
 #: en/git-verify-commit.txt:22 en/git-verify-tag.txt:22
 #, priority:100
 msgid "Print the raw gpg status output to standard error instead of the normal human-readable output."
-msgstr ""
-"Imprima a condição bruta do gpg na saída de erro predefinida em vez de uma "
-"saída legível para as pessoas."
+msgstr "Imprima a condição bruta do gpg na saída de erro predefinida em vez de uma saída legível para as pessoas."
 
 #. type: Plain text
 #: en/git-verify-commit.txt:26
@@ -67830,16 +58352,13 @@ msgstr "git-verify-pack - Valide os arquivos compactados do Git"
 #: en/git-verify-pack.txt:13
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n"
-msgstr ""
-"'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pacote>.idx ...\n"
+msgstr "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pacote>.idx ...\n"
 
 #. type: Plain text
 #: en/git-verify-pack.txt:20
 #, priority:100
 msgid "Reads given idx file for packed Git archive created with the 'git pack-objects' command and verifies idx file and the corresponding pack file."
-msgstr ""
-"Lê o arquivo idx compactado com o Git que foi criado com o comando 'git pack-"
-"objects' e verifica o arquivo idx e o seu respectivo arquivo de pacote."
+msgstr "Lê o arquivo idx compactado com o Git que foi criado com o comando 'git pack-objects' e verifica o arquivo idx e o seu respectivo arquivo de pacote."
 
 #. type: Labeled list
 #: en/git-verify-pack.txt:23
@@ -67857,9 +58376,7 @@ msgstr "Os arquivos idx que serão verificados."
 #: en/git-verify-pack.txt:30
 #, priority:100
 msgid "After verifying the pack, show list of objects contained in the pack and a histogram of delta chain length."
-msgstr ""
-"Após a verificação do pacote, exiba a lista dos objetos existentes no pacote "
-"e um histograma do comprimento da cadeia delta."
+msgstr "Após a verificação do pacote, exiba a lista dos objetos existentes no pacote e um histograma do comprimento da cadeia delta."
 
 #. type: Labeled list
 #: en/git-verify-pack.txt:32
@@ -67871,10 +58388,7 @@ msgstr "--stat-only"
 #: en/git-verify-pack.txt:35
 #, priority:100
 msgid "Do not verify the pack contents; only show the histogram of delta chain length.  With `--verbose`, list of objects is also shown."
-msgstr ""
-"Não verifique o conteúdo do pacote; exiba apenas o histograma do comprimento "
-"da cadeia delta.  Com a opção `--verbose`, a lista dos objetos também é "
-"exibida."
+msgstr "Não verifique o conteúdo do pacote; exiba apenas o histograma do comprimento da cadeia delta.  Com a opção `--verbose`, a lista dos objetos também é exibida."
 
 #. type: Title -
 #: en/git-verify-pack.txt:40
@@ -67904,8 +58418,7 @@ msgstr "para os objetos que não sejam \"deltificados\" no pacote e"
 #: en/git-verify-pack.txt:48
 #, no-wrap, priority:100
 msgid "\tSHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1\n"
-msgstr ""
-"\tSHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1\n"
+msgstr "\tSHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1\n"
 
 #. type: Plain text
 #: en/git-verify-pack.txt:50
@@ -67965,8 +58478,7 @@ msgstr "git-web{litdd}browse(1)"
 #: en/git-web--browse.txt:7
 #, priority:100
 msgid "git-web--browse - Git helper script to launch a web browser"
-msgstr ""
-"git-web--browse - Script assistente do Git para iniciar um navegador da web"
+msgstr "git-web--browse - Script assistente do Git para iniciar um navegador da web"
 
 #. type: Plain text
 #: en/git-web--browse.txt:12
@@ -67978,10 +58490,7 @@ msgstr "'git web{litdd}browse' [<opções>] <url|arquivo>...\n"
 #: en/git-web--browse.txt:19
 #, priority:100
 msgid "This script tries, as much as possible, to display the URLs and FILEs that are passed as arguments, as HTML pages in new tabs on an already opened web browser."
-msgstr ""
-"Esse script tenta, na medida do possível, exibir as URLs e os arquivos "
-"passados como argumentos, como páginas HTML nas novas guias em um navegador "
-"da web já aberto."
+msgstr "Esse script tenta, na medida do possível, exibir as URLs e os arquivos passados como argumentos, como páginas HTML nas novas guias em um navegador da web já aberto."
 
 #. type: Plain text
 #: en/git-web--browse.txt:21
@@ -68029,9 +58538,7 @@ msgstr "google-chrome (o chrome também é compatível)"
 #: en/git-web--browse.txt:29
 #, priority:100
 msgid "konqueror (this is the default under KDE, see 'Note about konqueror' below)"
-msgstr ""
-"konqueror (este é o predefinido do KDE, consulte 'Uma observação sobre o "
-"konqueror' abaixo)"
+msgstr "konqueror (este é o predefinido do KDE, consulte 'Uma observação sobre o konqueror' abaixo)"
 
 #. type: Plain text
 #: en/git-web--browse.txt:30
@@ -68115,9 +58622,7 @@ msgstr "--browser=<browser>"
 #: en/git-web--browse.txt:48
 #, priority:100
 msgid "Use the specified browser. It must be in the list of supported browsers."
-msgstr ""
-"Use o navegador especificado. Deve estar na lista dos navegadores "
-"compatíveis."
+msgstr "Use o navegador especificado. Deve estar na lista dos navegadores compatíveis."
 
 #. type: Labeled list
 #: en/git-web--browse.txt:49
@@ -68147,9 +58652,7 @@ msgstr "--config=<conf.var>"
 #: en/git-web--browse.txt:57
 #, priority:100
 msgid "CONF.VAR is looked up in the Git config files. If it's set, then its value specifies the browser that should be used."
-msgstr ""
-"O `CONF.VAR` é pesquisado nos arquivos de configuração do Git. Caso esteja "
-"definido, o seu valor define o navegador que deve ser utilizado."
+msgstr "O `CONF.VAR` é pesquisado nos arquivos de configuração do Git. Caso esteja definido, o seu valor define o navegador que deve ser utilizado."
 
 #. type: Title ~
 #: en/git-web--browse.txt:62
@@ -68161,10 +58664,7 @@ msgstr "O `CONF.VAR` (da opção -c) e `web.browser`"
 #: en/git-web--browse.txt:67
 #, priority:100
 msgid "The web browser can be specified using a configuration variable passed with the -c (or --config) command-line option, or the `web.browser` configuration variable if the former is not used."
-msgstr ""
-"O navegador da web pode ser definido usando uma variável de configuração "
-"passada com a opção na linha de comando '-c' (ou `--config`) ou a variável "
-"de configuração `web.browser` caso a primeira não seja utilizada."
+msgstr "O navegador da web pode ser definido usando uma variável de configuração passada com a opção na linha de comando '-c' (ou `--config`) ou a variável de configuração `web.browser` caso a primeira não seja utilizada."
 
 #. type: Title ~
 #: en/git-web--browse.txt:69
@@ -68176,13 +58676,7 @@ msgstr "browser.<ferramenta>.path"
 #: en/git-web--browse.txt:76
 #, priority:100
 msgid "You can explicitly provide a full path to your preferred browser by setting the configuration variable `browser.<tool>.path`. For example, you can configure the absolute path to firefox by setting 'browser.firefox.path'. Otherwise, 'git web{litdd}browse' assumes the tool is available in PATH."
-msgstr ""
-"Você pode informar de forma explicita um caminho completo para o seu "
-"visualizador man preferido, definindo a variável de configuração "
-"`man.<ferramenta>.path`. Como, por exemplo, você pode configurar o caminho "
-"absoluto para o firefox, configurando 'man.firefox.path'. Caso contrário, o "
-"comando 'web{litdd}browse' assume qual a ferramenta está disponível no seu "
-"`PATH`."
+msgstr "Você pode informar de forma explicita um caminho completo para o seu visualizador man preferido, definindo a variável de configuração `man.<ferramenta>.path`. Como, por exemplo, você pode configurar o caminho absoluto para o firefox, configurando 'man.firefox.path'. Caso contrário, o comando 'web{litdd}browse' assume qual a ferramenta está disponível no seu `PATH`."
 
 #. type: Title ~
 #: en/git-web--browse.txt:78
@@ -68194,13 +58688,7 @@ msgstr "browser.<ferramenta>.cmd"
 #: en/git-web--browse.txt:86
 #, priority:100
 msgid "When the browser, specified by options or configuration variables, is not among the supported ones, then the corresponding `browser.<tool>.cmd` configuration variable will be looked up. If this variable exists then 'git web{litdd}browse' will treat the specified tool as a custom command and will use a shell eval to run the command with the URLs passed as arguments."
-msgstr ""
-"Quando o navegador, informado através das opções ou das variáveis de "
-"configuração, não estiver entre os compatíveis, a variável de configuração "
-"`browser.<ferramenta>.cmd` correspondente será pesquisada. Caso esta "
-"variável exista, o comando 'git web{litdd}browse' tratará a ferramenta "
-"especificada como um comando personalizado e usará um 'shell eval' para "
-"executar o comando com as URLs encaminhadas como argumentos."
+msgstr "Quando o navegador, informado através das opções ou das variáveis de configuração, não estiver entre os compatíveis, a variável de configuração `browser.<ferramenta>.cmd` correspondente será pesquisada. Caso esta variável exista, o comando 'git web{litdd}browse' tratará a ferramenta especificada como um comando personalizado e usará um 'shell eval' para executar o comando com as URLs encaminhadas como argumentos."
 
 #. type: Title -
 #: en/git-web--browse.txt:88
@@ -68212,21 +58700,13 @@ msgstr "NOTA SOBRE O KONQUEROR"
 #: en/git-web--browse.txt:93
 #, priority:100
 msgid "When 'konqueror' is specified by a command-line option or a configuration variable, we launch 'kfmclient' to try to open the HTML man page on an already opened konqueror in a new tab if possible."
-msgstr ""
-"Quando o 'konqueror' é definido através da opção da linha de comando ou uma "
-"variável de configuração, iniciamos o 'kfmclient' para tentar abrir uma "
-"página do manual em HTML em uma nova guia de um konqueror já aberto, caso "
-"seja possível."
+msgstr "Quando o 'konqueror' é definido através da opção da linha de comando ou uma variável de configuração, iniciamos o 'kfmclient' para tentar abrir uma página do manual em HTML em uma nova guia de um konqueror já aberto, caso seja possível."
 
 #. type: Plain text
 #: en/git-web--browse.txt:97
 #, priority:100
 msgid "For consistency, we also try such a trick if 'browser.konqueror.path' is set to something like `A_PATH_TO/konqueror`. That means we will try to launch `A_PATH_TO/kfmclient` instead."
-msgstr ""
-"Para uma maior consistência, também tentamos este truque caso "
-"'browser.konqueror.path' esteja definido em algo como `UM_CAMINHO_PARA_O/"
-"konqueror`. Significa que em vez disso, tentaremos iniciar o `"
-"UM_CAMINHO_PARA_O/kfmclient`."
+msgstr "Para uma maior consistência, também tentamos este truque caso 'browser.konqueror.path' esteja definido em algo como `UM_CAMINHO_PARA_O/konqueror`. Significa que em vez disso, tentaremos iniciar o `UM_CAMINHO_PARA_O/kfmclient`."
 
 #. type: delimited block -
 #: en/git-web--browse.txt:104
@@ -68258,9 +58738,7 @@ msgstr "Nota sobre o comando `git-config --global`"
 #: en/git-web--browse.txt:114
 #, priority:100
 msgid "Note that these configuration variables should probably be set using the `--global` flag, for example like this:"
-msgstr ""
-"Observe que todas estas variáveis de configuração, provavelmente devem ser "
-"definidas utilizando a opção `--global`, assim por exemplo:"
+msgstr "Observe que todas estas variáveis de configuração, provavelmente devem ser definidas utilizando a opção `--global`, assim por exemplo:"
 
 #. type: delimited block -
 #: en/git-web--browse.txt:117
@@ -68278,9 +58756,7 @@ msgstr "git-whatchanged(1)"
 #: en/git-whatchanged.txt:7
 #, priority:100
 msgid "git-whatchanged - Show logs with difference each commit introduces"
-msgstr ""
-"git-whatchanged - Exibe os registros logs com a diferença que cada commit "
-"introduz"
+msgstr "git-whatchanged - Exibe os registros logs com a diferença que cada commit introduz"
 
 #. type: Plain text
 #: en/git-whatchanged.txt:13
@@ -68298,20 +58774,13 @@ msgstr "Exibe os registros log do commit e saída diff que cada commit introduz.
 #: en/git-whatchanged.txt:22
 #, priority:100
 msgid "New users are encouraged to use linkgit:git-log[1] instead.  The `whatchanged` command is essentially the same as linkgit:git-log[1] but defaults to show the raw format diff output and to skip merges."
-msgstr ""
-"Os novos usuários são encorajados a utilizar o linkgit:git-log[1].  O "
-"comando `whatchanged` é essencialmente o mesmo que linkgit:git-log[1], a "
-"predefinição retorna para exibir o \"diff\" gerado em formato bruto e para "
-"ignorar as mesclagens."
+msgstr "Os novos usuários são encorajados a utilizar o linkgit:git-log[1].  O comando `whatchanged` é essencialmente o mesmo que linkgit:git-log[1], a predefinição retorna para exibir o \"diff\" gerado em formato bruto e para ignorar as mesclagens."
 
 #. type: Plain text
 #: en/git-whatchanged.txt:26
 #, priority:100
 msgid "The command is kept primarily for historical reasons; fingers of many people who learned Git long before `git log` was invented by reading Linux kernel mailing list are trained to type it."
-msgstr ""
-"O comando é mantido principalmente por razões históricas; muitas pessoas que "
-"aprenderam Git bem antes do `git log` ser inventado, lendo a lista de "
-"discussão do kernel do Linux, são treinados para digitá-lo."
+msgstr "O comando é mantido principalmente por razões históricas; muitas pessoas que aprenderam Git bem antes do `git log` ser inventado, lendo a lista de discussão do kernel do Linux, são treinados para digitá-lo."
 
 #. type: Labeled list
 #: en/git-whatchanged.txt:30
@@ -68323,9 +58792,7 @@ msgstr "`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`"
 #: en/git-whatchanged.txt:34
 #, priority:100
 msgid "Show as patches the commits since version 'v2.6.12' that changed any file in the include/scsi or drivers/scsi subdirectories"
-msgstr ""
-"Exibe como correções dos commits desde a versão 'v2.6.12' que alterou "
-"qualquer arquivo nos subdiretórios 'include/scsi' ou 'drivers/scsi'"
+msgstr "Exibe como correções dos commits desde a versão 'v2.6.12' que alterou qualquer arquivo nos subdiretórios 'include/scsi' ou 'drivers/scsi'"
 
 #. type: Labeled list
 #: en/git-whatchanged.txt:35
@@ -68337,10 +58804,7 @@ msgstr "`git whatchanged --since=\"2 semanas atrás\" -- gitk`"
 #: en/git-whatchanged.txt:40
 #, priority:100
 msgid "Show the changes during the last two weeks to the file 'gitk'.  The \"--\" is necessary to avoid confusion with the *branch* named 'gitk'"
-msgstr ""
-"Exibe as alterações nas últimas duas semanas no arquivo 'gitk'. chamado "
-"'gitk'  O \"--\" é necessário para evitar confusão com o *ramo* chamado "
-"'gitk'"
+msgstr "Exibe as alterações nas últimas duas semanas no arquivo 'gitk'. chamado 'gitk'  O \"--\" é necessário para evitar confusão com o *ramo* chamado 'gitk'"
 
 #. type: Title =
 #: en/git-worktree.txt:2
@@ -68366,8 +58830,7 @@ msgid ""
 "'git worktree remove' [-f] <worktree>\n"
 "'git worktree unlock' <worktree>\n"
 msgstr ""
-"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <novo-ramo>] "
-"<caminho> [<commit-ish>]\n"
+"'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <novo-ramo>] <caminho> [<commit-ish>]\n"
 "'git worktree list' [--porcelain]\n"
 "'git worktree lock' [--reason <texto>] <árvore de trabalho>\n"
 "'git worktree move' <árvore de trabalho> <novo caminho>\n"
@@ -68385,40 +58848,19 @@ msgstr "Gerencie várias árvores de trabalho conectadas ao mesmo repositório."
 #: en/git-worktree.txt:32
 #, priority:240
 msgid "A git repository can support multiple working trees, allowing you to check out more than one branch at a time.  With `git worktree add` a new working tree is associated with the repository.  This new working tree is called a \"linked working tree\" as opposed to the \"main working tree\" prepared by \"git init\" or \"git clone\".  A repository has one main working tree (if it's not a bare repository) and zero or more linked working trees. When you are done with a linked working tree, remove it with `git worktree remove`."
-msgstr ""
-"Um repositório git é compatível com várias árvores de trabalho, permitindo "
-"que você verifique mais de um ramo por vez.  Com o `git worktree add`, uma "
-"nova árvore de trabalho é associada ao repositório.  Esta nova árvore de "
-"trabalho é chamada de \"árvore de trabalho vinculada\" em oposição à \"árvore"
-" de trabalho principal\" preparada através do comando \"git init\" ou \"git "
-"clone\".  Um repositório possui uma árvore principal de trabalho (caso não "
-"seja um repositório simples) e zero ou mais árvores de trabalho vinculadas. "
-"Quando você terminar uma árvore de trabalho vinculada, remova-a com o "
-"comando `git worktree remove`."
+msgstr "Um repositório git é compatível com várias árvores de trabalho, permitindo que você verifique mais de um ramo por vez.  Com o `git worktree add`, uma nova árvore de trabalho é associada ao repositório.  Esta nova árvore de trabalho é chamada de \"árvore de trabalho vinculada\" em oposição à \"árvore de trabalho principal\" preparada através do comando \"git init\" ou \"git clone\".  Um repositório possui uma árvore principal de trabalho (caso não seja um repositório simples) e zero ou mais árvores de trabalho vinculadas. Quando você terminar uma árvore de trabalho vinculada, remova-a com o comando `git worktree remove`."
 
 #. type: Plain text
 #: en/git-worktree.txt:39
 #, priority:240
 msgid "If a working tree is deleted without using `git worktree remove`, then its associated administrative files, which reside in the repository (see \"DETAILS\" below), will eventually be removed automatically (see `gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree prune` in the main or any linked working tree to clean up any stale administrative files."
-msgstr ""
-"Caso uma árvore de trabalho seja excluída sem o a utilização do comando `git "
-"worktree remove`, os seus arquivos administrativos associados, que residam "
-"no repositório (consulte \"DETALHES\" abaixo), serão removidos "
-"automaticamente (consulte a opção de configuração `gc.worktreePruneExpire` "
-"no linkgit:git-config[1]), ou é possível executar o comando `git worktree "
-"prune` na árvore principal ou em qualquer árvore de trabalho vinculada para "
-"fazer a limpeza de quaisquer arquivos administrativos que estejam obsoletos."
+msgstr "Caso uma árvore de trabalho seja excluída sem o a utilização do comando `git worktree remove`, os seus arquivos administrativos associados, que residam no repositório (consulte \"DETALHES\" abaixo), serão removidos automaticamente (consulte a opção de configuração `gc.worktreePruneExpire` no linkgit:git-config[1]), ou é possível executar o comando `git worktree prune` na árvore principal ou em qualquer árvore de trabalho vinculada para fazer a limpeza de quaisquer arquivos administrativos que estejam obsoletos."
 
 #. type: Plain text
 #: en/git-worktree.txt:44
 #, priority:240
 msgid "If a linked working tree is stored on a portable device or network share which is not always mounted, you can prevent its administrative files from being pruned by issuing the `git worktree lock` command, optionally specifying `--reason` to explain why the working tree is locked."
-msgstr ""
-"Caso uma árvore de trabalho vinculada estiver armazenada em um dispositivo "
-"portátil ou em um compartilhamento da rede que nem sempre seja montado, é "
-"possível impedir que os seus arquivos administrativos sejam removidos "
-"emitindo o comando `git worktree lock`, utilizando opcionalmente a opção "
-"`--reason` para explicar por que a árvore de trabalho está bloqueada."
+msgstr "Caso uma árvore de trabalho vinculada estiver armazenada em um dispositivo portátil ou em um compartilhamento da rede que nem sempre seja montado, é possível impedir que os seus arquivos administrativos sejam removidos emitindo o comando `git worktree lock`, utilizando opcionalmente a opção `--reason` para explicar por que a árvore de trabalho está bloqueada."
 
 #. type: Labeled list
 #: en/git-worktree.txt:47
@@ -68430,22 +58872,13 @@ msgstr "add <caminho> [<commit-ish>]"
 #: en/git-worktree.txt:53
 #, priority:240
 msgid "Create `<path>` and checkout `<commit-ish>` into it. The new working directory is linked to the current repository, sharing everything except working directory specific files such as HEAD, index, etc. `-` may also be specified as `<commit-ish>`; it is synonymous with `@{-1}`."
-msgstr ""
-"Crie um `<caminho>` e faça a averiguação `<commit-ish>` nele. O novo "
-"diretório de trabalho está vinculado ao repositório atual, compartilhando "
-"tudo exceto arquivos específicos do diretório de trabalho, como HEAD, "
-"índice, etc. O `-` também pode ser utilizado como `<commit-ish> `; é um "
-"sinônimo de `@{-1}`."
+msgstr "Crie um `<caminho>` e faça a averiguação `<commit-ish>` nele. O novo diretório de trabalho está vinculado ao repositório atual, compartilhando tudo exceto arquivos específicos do diretório de trabalho, como HEAD, índice, etc. O `-` também pode ser utilizado como `<commit-ish> `; é um sinônimo de `@{-1}`."
 
 #. type: Plain text
 #: en/git-worktree.txt:58
 #, priority:240
 msgid "If <commit-ish> is a branch name (call it `<branch>`) and is not found, and neither `-b` nor `-B` nor `--detach` are used, but there does exist a tracking branch in exactly one remote (call it `<remote>`)  with a matching name, treat as equivalent to:"
-msgstr ""
-"Caso o <commit-ish> seja um nome do ramo (chame-o de `<ramo>`) e não for "
-"encontrado, nem `-b`, nem `-B`, nem `--detach`, serão utilizados, porém "
-"existe um monitoramento do ramo em exatamente um ramo remoto (chame-o de "
-"`<remoto>`) com um nome coincidente, trate-o como equivalente a:"
+msgstr "Caso o <commit-ish> seja um nome do ramo (chame-o de `<ramo>`) e não for encontrado, nem `-b`, nem `-B`, nem `--detach`, serão utilizados, porém existe um monitoramento do ramo em exatamente um ramo remoto (chame-o de `<remoto>`) com um nome coincidente, trate-o como equivalente a:"
 
 #. type: delimited block -
 #: en/git-worktree.txt:61
@@ -68457,27 +58890,13 @@ msgstr "$ git worktree add --track -b <ramo> <caminho> <remoto>/<ramo>\n"
 #: en/git-worktree.txt:80
 #, priority:240
 msgid "If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used, then, as a convenience, the new worktree is associated with a branch (call it `<branch>`) named after `$(basename <path>)`.  If `<branch>` doesn't exist, a new branch based on HEAD is automatically created as if `-b <branch>` was given.  If `<branch>` does exist, it will be checked out in the new worktree, if it's not checked out anywhere else, otherwise the command will refuse to create the worktree (unless `--force` is used)."
-msgstr ""
-"Caso o `<commit-ish>` seja omitido e nem a opção `-b`, `-B` ou `--detach` "
-"sejam utilizados, então, por conveniência, a nova árvore de trabalho será "
-"associada com um ramo (chame-o de `<ramo>`) nomeado após `$(basename "
-"<caminho>)`.  Caso o `<ramo>` não exista, um novo ramo com base no `HEAD` "
-"será criado automaticamente como se a opção `-b <ramo>` fosse informado.  "
-"Caso o `<ramo>` exista, ele será averiguado na nova árvore de trabalho, se "
-"não tiver sido averiguado em nenhum outro lugar, caso contrário, o comando "
-"se recusará a criar a árvore de trabalho (a menos que `--force` seja "
-"utilizado)."
+msgstr "Caso o `<commit-ish>` seja omitido e nem a opção `-b`, `-B` ou `--detach` sejam utilizados, então, por conveniência, a nova árvore de trabalho será associada com um ramo (chame-o de `<ramo>`) nomeado após `$(basename <caminho>)`.  Caso o `<ramo>` não exista, um novo ramo com base no `HEAD` será criado automaticamente como se a opção `-b <ramo>` fosse informado.  Caso o `<ramo>` exista, ele será averiguado na nova árvore de trabalho, se não tiver sido averiguado em nenhum outro lugar, caso contrário, o comando se recusará a criar a árvore de trabalho (a menos que `--force` seja utilizado)."
 
 #. type: Plain text
 #: en/git-worktree.txt:87
 #, priority:240
 msgid "List details of each worktree.  The main worktree is listed first, followed by each of the linked worktrees.  The output details include if the worktree is bare, the revision currently checked out, and the branch currently checked out (or 'detached HEAD' if none)."
-msgstr ""
-"Liste os detalhes de cada árvore de trabalho.  A árvore de trabalho "
-"principal é listada primeiro, seguida por cada uma das árvores de trabalho "
-"vinculadas.  Os detalhes gerados incluem se a árvore de trabalho está vazia "
-"e se a revisão e o ramo foi averiguado no momento (ou tem o 'HEAD "
-"desanexado', caso não haja)."
+msgstr "Liste os detalhes de cada árvore de trabalho.  A árvore de trabalho principal é listada primeiro, seguida por cada uma das árvores de trabalho vinculadas.  Os detalhes gerados incluem se a árvore de trabalho está vazia e se a revisão e o ramo foi averiguado no momento (ou tem o 'HEAD desanexado', caso não haja)."
 
 #. type: Labeled list
 #: en/git-worktree.txt:88
@@ -68489,12 +58908,7 @@ msgstr "lock"
 #: en/git-worktree.txt:95
 #, priority:240
 msgid "If a working tree is on a portable device or network share which is not always mounted, lock it to prevent its administrative files from being pruned automatically. This also prevents it from being moved or deleted. Optionally, specify a reason for the lock with `--reason`."
-msgstr ""
-"Caso uma árvore de trabalho esteja em um dispositivo portátil ou em um "
-"compartilhamento da rede que nem sempre seja montado, bloqueie-o para "
-"impedir que os seus arquivos administrativos sejam removidos "
-"automaticamente. Isso também evita que ele seja movido ou excluído. "
-"Opcionalmente, especifique um motivo para o bloqueio com `--reason`."
+msgstr "Caso uma árvore de trabalho esteja em um dispositivo portátil ou em um compartilhamento da rede que nem sempre seja montado, bloqueie-o para impedir que os seus arquivos administrativos sejam removidos automaticamente. Isso também evita que ele seja movido ou excluído. Opcionalmente, especifique um motivo para o bloqueio com `--reason`."
 
 #. type: Labeled list
 #: en/git-worktree.txt:96
@@ -68506,10 +58920,7 @@ msgstr "move"
 #: en/git-worktree.txt:100
 #, priority:240
 msgid "Move a working tree to a new location. Note that the main working tree or linked working trees containing submodules cannot be moved."
-msgstr ""
-"Mova uma árvore de trabalho para um novo local. Observe que a árvore "
-"principal de trabalho ou as árvores de trabalho vinculadas que contenham "
-"submódulos, não poderão ser movidas."
+msgstr "Mova uma árvore de trabalho para um novo local. Observe que a árvore principal de trabalho ou as árvores de trabalho vinculadas que contenham submódulos, não poderão ser movidas."
 
 #. type: Plain text
 #: en/git-worktree.txt:104
@@ -68521,12 +58932,7 @@ msgstr "Remova as informações da árvore de trabalho no `$GIT_DIR/worktrees`."
 #: en/git-worktree.txt:111
 #, priority:240
 msgid "Remove a working tree. Only clean working trees (no untracked files and no modification in tracked files) can be removed. Unclean working trees or ones with submodules can be removed with `--force`. The main working tree cannot be removed."
-msgstr ""
-"Remova uma árvore de trabalho. Somente árvores de trabalho que estiverem "
-"vazias (sem arquivos não monitorados e nenhuma alteração nos arquivos "
-"monitorados) podem ser removidas. Árvores de trabalho que não estejam vazias "
-"ou com os sub-módulos podem ser removidas a força com a opção `--force`. A "
-"árvore principal de trabalho não pode ser removida."
+msgstr "Remova uma árvore de trabalho. Somente árvores de trabalho que estiverem vazias (sem arquivos não monitorados e nenhuma alteração nos arquivos monitorados) podem ser removidas. Árvores de trabalho que não estejam vazias ou com os sub-módulos podem ser removidas a força com a opção `--force`. A árvore principal de trabalho não pode ser removida."
 
 #. type: Labeled list
 #: en/git-worktree.txt:112
@@ -68538,412 +58944,305 @@ msgstr "unlock"
 #: en/git-worktree.txt:115
 #, priority:240
 msgid "Unlock a working tree, allowing it to be pruned, moved or deleted."
-msgstr ""
-"Desbloqueie uma árvore em funcionamento, permitindo que ela seja removida, "
-"movida ou excluída."
+msgstr "Desbloqueie uma árvore em funcionamento, permitindo que ela seja removida, movida ou excluída."
 
 #. type: Plain text
 #: en/git-worktree.txt:127
 #, priority:240
 msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
-msgstr ""
-"É predefinido que `add` se recuse a criar uma nova árvore de trabalho quando "
-"`<commit-ish>` for um nome de uma filial e já está em averiguação por outra "
-"árvore de trabalho, ou caso `<caminho>` já esteja atribuído a alguma árvore "
-"de trabalho, porém ausente (caso `<caminho>` foi excluído manualmente por "
-"exemplo). Esta opção substitui estas salvaguardas. Para adicionar um caminho "
-"de árvore de trabalho ausente porém bloqueado, utilize a opção `--force` "
-"duas vezes."
+msgstr "É predefinido que `add` se recuse a criar uma nova árvore de trabalho quando `<commit-ish>` for um nome de uma filial e já está em averiguação por outra árvore de trabalho, ou caso `<caminho>` já esteja atribuído a alguma árvore de trabalho, porém ausente (caso `<caminho>` foi excluído manualmente por exemplo). Esta opção substitui estas salvaguardas. Para adicionar um caminho de árvore de trabalho ausente porém bloqueado, utilize a opção `--force` duas vezes."
 
 #. type: Plain text
-#: en/git-worktree.txt:130
-#, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
-msgstr ""
-"O `move` se recusa a mover uma árvore de trabalho bloqueada, a menos que a "
-"opção `--force` seja utilizado duas vezes."
+#: en/git-worktree.txt:132
+#, fuzzy, priority:240
+#| msgid "By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and is already checked out by another working tree, or if `<path>` is already assigned to some working tree but is missing (for instance, if `<path>` was deleted manually). This option overrides these safeguards. To add a missing but locked working tree path, specify `--force` twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
+msgstr "É predefinido que `add` se recuse a criar uma nova árvore de trabalho quando `<commit-ish>` for um nome de uma filial e já está em averiguação por outra árvore de trabalho, ou caso `<caminho>` já esteja atribuído a alguma árvore de trabalho, porém ausente (caso `<caminho>` foi excluído manualmente por exemplo). Esta opção substitui estas salvaguardas. Para adicionar um caminho de árvore de trabalho ausente porém bloqueado, utilize a opção `--force` duas vezes."
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
-msgstr ""
-"O `remove` se recusa a remover uma árvore de trabalho cheia, a menos que a "
-"opção `--force` seja usada.  Para remover uma árvore de trabalho bloqueada, "
-"utilize a opção `--force` duas vezes."
+msgstr "O `remove` se recusa a remover uma árvore de trabalho cheia, a menos que a opção `--force` seja usada.  Para remover uma árvore de trabalho bloqueada, utilize a opção `--force` duas vezes."
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr "-b <novo-ramo>"
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr "-B <novo-ramo>"
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
-msgstr ""
-"Com `add`, crie um novo ramo chamado `<novo-ramo>` (novo-ramo) começando em "
-"`<commit-ish>` e faça uma averiguação do `<novo-ramo>` na nova árvore de "
-"trabalho.  Caso o `<commit-ish>` seja omitido, a predefinição retorna para "
-"`HEAD`.  É predefinido que `b` se recuse a criar um novo ramo, caso ele já "
-"exista. O `B` substitui esta salvaguarda, redefinindo o `<novo-ramo>` para "
-"`<commit-ish>`."
+msgstr "Com `add`, crie um novo ramo chamado `<novo-ramo>` (novo-ramo) começando em `<commit-ish>` e faça uma averiguação do `<novo-ramo>` na nova árvore de trabalho.  Caso o `<commit-ish>` seja omitido, a predefinição retorna para `HEAD`.  É predefinido que `b` se recuse a criar um novo ramo, caso ele já exista. O `B` substitui esta salvaguarda, redefinindo o `<novo-ramo>` para `<commit-ish>`."
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
-msgstr ""
-"Com `add`, desanexe o HEAD na nova árvore de trabalho. Consulte \"HEAD "
-"DESANEXADO\" em linkgit:git-checkout[1]."
+msgstr "Com `add`, desanexe o HEAD na nova árvore de trabalho. Consulte \"HEAD DESANEXADO\" em linkgit:git-checkout[1]."
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
-msgstr ""
-"É predefinido que `add` faça a averiguação do `<commit-ish> `, no entanto a "
-"opção `--no-checkout` pode ser utilizado para suprimir a averiguação a fim "
-"de fazer as personalizações, como configurar a averiguação esparsa. Consulte "
-"\"Averiguação esparsa\" em linkgit:git-read-tree[1]."
+msgstr "É predefinido que `add` faça a averiguação do `<commit-ish> `, no entanto a opção `--no-checkout` pode ser utilizado para suprimir a averiguação a fim de fazer as personalizações, como configurar a averiguação esparsa. Consulte \"Averiguação esparsa\" em linkgit:git-read-tree[1]."
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr "Com `worktree add <caminho>`, sem `<commit-ish>`, em vez de criar uma nova ramificação a partir do `HEAD`, caso exista uma ramificação de rastreamento em exatamente um ponto remoto que coincida com o `basename` do `<caminho>`, baseie a nova ramificação na ramificação remota rastreada e marque a ramificação rastreada remoto como um \"upstream\" da nova ramificação."
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr "Isso também pode ser definido como um comportamento predefinido ao usar a opção da configuração `worktree.guessRemote`."
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
-msgstr ""
-"Ao criar um novo ramo, caso `<commit-ish>` seja um ramo, marque-a como "
-"\"upstream\" a partir do novo ramo.  Essa é a predefinição caso `<commit-"
-"ish>` seja um ramo monitorado remotamente.  Para mais detalhes, consulte \"--"
-"track\" em linkgit:git-branch[1]."
+msgstr "Ao criar um novo ramo, caso `<commit-ish>` seja um ramo, marque-a como \"upstream\" a partir do novo ramo.  Essa é a predefinição caso `<commit-ish>` seja um ramo monitorado remotamente.  Para mais detalhes, consulte \"--track\" em linkgit:git-branch[1]."
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
-msgstr ""
-"Mantenha a árvore de trabalho bloqueada após a criação. Isso é equivalente "
-"ao comando `git worktree lock` após `git worktree add`, porém sem a condição "
-"de corrida."
+msgstr "Mantenha a árvore de trabalho bloqueada após a criação. Isso é equivalente ao comando `git worktree lock` após `git worktree add`, porém sem a condição de corrida."
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr "Com `prune`, não remove nada; apenas relate o que seria removido."
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr "Com `list` gere um formato para fácil análise dos scripts. Este formato permanecerá estável em todas as versões Git independentemente da configuração do usuário.  Veja abaixo os detalhes."
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr "Com `add`, suprima as mensagens de feedback."
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr "Com `prune`, relate todas as remoções."
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr "Com `prune`, expire apenas as árvores de trabalho não utilizadas mais velhas que <tempo>."
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr "--reason <texto>"
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr "Com `lock`, uma explicação é dada do por quê a árvore está \"locked\" (travada)."
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr "<árvore de trabalho>"
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
-msgstr ""
-"As árvores de trabalho podem ser identificadas através do caminho, seja "
-"relativo ou absoluto."
+msgstr "As árvores de trabalho podem ser identificadas através do caminho, seja relativo ou absoluto."
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
-msgstr ""
-"Caso os componentes do último caminho da árvore de trabalho sejam únicos "
-"entre as árvores, ele poderá ser utilizado para identificar as árvores de "
-"trabalho. Como por exemplo, caso tenha apenas duas árvores de trabalho, em \""
-"/abc/def/ghi\" e \"/abc/def/ggg\", \"ghi\" ou \"def/ghi\" serão suficientes "
-"para apontar para a antiga árvore de trabalho."
+msgstr "Caso os componentes do último caminho da árvore de trabalho sejam únicos entre as árvores, ele poderá ser utilizado para identificar as árvores de trabalho. Como por exemplo, caso tenha apenas duas árvores de trabalho, em \"/abc/def/ghi\" e \"/abc/def/ggg\", \"ghi\" ou \"def/ghi\" serão suficientes para apontar para a antiga árvore de trabalho."
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr "REFS"
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
-msgstr ""
-"Em várias árvores de trabalho diferentes, algumas refs podem ser "
-"compartilhadas entre todas as árvores de trabalho, já outras são locais. Um "
-"exemplo é o `HEAD` que é único para cada a árvores de trabalho. Um exemplo é "
-"que `HEAD` seja diferente para todas as árvores de trabalho. Esta seção é "
-"sobre as regras de compartilhamento e como acessar tais refs de uma árvore "
-"de trabalho para outra."
+msgstr "Em várias árvores de trabalho diferentes, algumas refs podem ser compartilhadas entre todas as árvores de trabalho, já outras são locais. Um exemplo é o `HEAD` que é único para cada a árvores de trabalho. Um exemplo é que `HEAD` seja diferente para todas as árvores de trabalho. Esta seção é sobre as regras de compartilhamento e como acessar tais refs de uma árvore de trabalho para outra."
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
-msgstr ""
-"Geralmente, cada árvore de trabalho possuí uma ref própria e todas as refs "
-"que iniciem com `refs/` podem ser compartilhados. Os pseudo-refs são aqueles "
-"como `HEAD` que estão diretamente sob `GIT_DIR` ao invés de estarem dentro "
-"do `GIT_DIR/refs`. Há apenas uma exceção para esta regra: as refs não serão "
-"compartilhadas quando estiverem dentro do `refs/bisect` e do `refs/worktree`."
+msgstr "Geralmente, cada árvore de trabalho possuí uma ref própria e todas as refs que iniciem com `refs/` podem ser compartilhados. Os pseudo-refs são aqueles como `HEAD` que estão diretamente sob `GIT_DIR` ao invés de estarem dentro do `GIT_DIR/refs`. Há apenas uma exceção para esta regra: as refs não serão compartilhadas quando estiverem dentro do `refs/bisect` e do `refs/worktree`."
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
-msgstr ""
-"As refs individuais de cada árvore de trabalho ainda podem ser acessadas de "
-"uma outra árvore de trabalho através de dois caminhos especiais, `main-"
-"worktree` e `worktrees`. A primeira oferece acesso `ref` individual a cada "
-"árvore de trabalho principal, enquanto a última a todas as árvores de "
-"trabalho que forem vinculadas à ela."
+msgstr "As refs individuais de cada árvore de trabalho ainda podem ser acessadas de uma outra árvore de trabalho através de dois caminhos especiais, `main-worktree` e `worktrees`. A primeira oferece acesso `ref` individual a cada árvore de trabalho principal, enquanto a última a todas as árvores de trabalho que forem vinculadas à ela."
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
-msgstr ""
-"Como por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` "
-"resolve para o mesmo valor que `HEAD` nas principais árvores, assim como `"
-"refs/bisect/good` respectivamente. Da mesma forma, `worktrees/foo/HEAD` e `"
-"worktrees/bar/refs/bisect/bad` são as mesmas que `GIT_COMMON_DIR/worktrees/"
-"foo/HEAD` e `GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
+msgstr "Como por exemplo, `main-worktree/HEAD` ou `main-worktree/refs/bisect/good` resolve para o mesmo valor que `HEAD` nas principais árvores, assim como `refs/bisect/good` respectivamente. Da mesma forma, `worktrees/foo/HEAD` e `worktrees/bar/refs/bisect/bad` são as mesmas que `GIT_COMMON_DIR/worktrees/foo/HEAD` e `GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`."
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
-msgstr ""
-"Para acessar as `refs` é melhor não olhar diretamente para dentro do "
-"`GIT_DIR`. Em vez disso, use comandos como o linkgit:git-rev-parse[1] ou "
-"linkgit:git-update-ref[1] que manipularão corretamente as refs."
+msgstr "Para acessar as `refs` é melhor não olhar diretamente para dentro do `GIT_DIR`. Em vez disso, use comandos como o linkgit:git-rev-parse[1] ou linkgit:git-update-ref[1] que manipularão corretamente as refs."
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr "É predefinido que o arquivo \"config\" do repositório seja compartilhado entre todas as árvores de trabalho. Caso as variáveis da configuração `core.bare` ou` core.worktree` estejam presentes no arquivo de configuração elas serão aplicadas apenas às principais árvores de trabalho."
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr "Você pode ativar a extensão `worktreeConfig` para ter uma configuração específica para as árvores de trabalho, por exemplo:"
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr "$ git config extensions.worktreeConfig true\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
-msgstr ""
-"Neste modo, a configuração específica permanece no caminho apontado pelo "
-"comando `git rev-parse --git-path config.worktree`. Você pode adicionar ou "
-"atualizar a configuração neste arquivo com o comando `git config --worktree`"
-". As versões mais antigas do Git se recusarão a acessar os repositórios com "
-"esta extensão."
+msgstr "Neste modo, a configuração específica permanece no caminho apontado pelo comando `git rev-parse --git-path config.worktree`. Você pode adicionar ou atualizar a configuração neste arquivo com o comando `git config --worktree`. As versões mais antigas do Git se recusarão a acessar os repositórios com esta extensão."
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
-msgstr ""
-"Observe que neste arquivo, a exceção para `core.bare` e `core.worktree` "
-"desapareceu. Caso você os possua antes no '$GIT_DIR/config', você deve movê-"
-"los para o `config.worktree` da árvore principal de trabalho. Você também "
-"pode aproveitar esta oportunidade para revisar e mover as outras "
-"configurações que não deseja compartilhar com todas as árvores de trabalho:"
+msgstr "Observe que neste arquivo, a exceção para `core.bare` e `core.worktree` desapareceu. Caso você os possua antes no '$GIT_DIR/config', você deve movê-los para o `config.worktree` da árvore principal de trabalho. Você também pode aproveitar esta oportunidade para revisar e mover as outras configurações que não deseja compartilhar com todas as árvores de trabalho:"
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr "`core.worktree` e `core.bare` nunca devem ser compartilhados"
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
-msgstr ""
-"Recomenda-se a opção de configuração `core.sparseCheckout` em cada árvore de "
-"trabalho, a menos que você tenha certeza de que sempre usa a verificação "
-"esparsa para todas as árvores de trabalho."
+msgstr "Recomenda-se a opção de configuração `core.sparseCheckout` em cada árvore de trabalho, a menos que você tenha certeza de que sempre usa a verificação esparsa para todas as árvores de trabalho."
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr "DETALHES"
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
-msgstr ""
-"Cada árvore de trabalho vinculada possui um subdiretório privado no "
-"diretório `$GIT_DIR/worktrees` do repositório.  O nome do subdiretório "
-"particular é geralmente o nome base do caminho do vínculo da árvore de "
-"trabalho, possivelmente anexada a um número para torná-lo único.  Como por "
-"exemplo, quando `$GIT_DIR=/path/main/.git` o comando` `git worktree add /"
-"path/other/test-next next` cria a árvore de trabalho vinculada no `/path/"
-"other/test-next` e também cria um diretório `$GIT_DIR/worktrees/test-next` ("
-"ou `$GIT_DIR/worktrees/test-next1` caso `test-next` já esteja em uso)."
+msgstr "Cada árvore de trabalho vinculada possui um subdiretório privado no diretório `$GIT_DIR/worktrees` do repositório.  O nome do subdiretório particular é geralmente o nome base do caminho do vínculo da árvore de trabalho, possivelmente anexada a um número para torná-lo único.  Como por exemplo, quando `$GIT_DIR=/path/main/.git` o comando` `git worktree add /path/other/test-next next` cria a árvore de trabalho vinculada no `/path/other/test-next` e também cria um diretório `$GIT_DIR/worktrees/test-next` (ou `$GIT_DIR/worktrees/test-next1` caso `test-next` já esteja em uso)."
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
-msgstr ""
-"Dentro de uma árvore de trabalho vinculada, `$GIT_DIR` é configurado para "
-"apontar para este diretório privado (`/path/main/.git/worktrees/test-next` "
-"no exemplo) e `$GIT_COMMON_DIR` é configurado para apontar de volta para a "
-"árvore de trabalho principal `$GIT_DIR` (`/path/main/.git` por exemplo). "
-"Estas configurações são feitas em um arquivo `.git` localizado no diretório "
-"vinculado mais alto da árvore de trabalho."
+msgstr "Dentro de uma árvore de trabalho vinculada, `$GIT_DIR` é configurado para apontar para este diretório privado (`/path/main/.git/worktrees/test-next` no exemplo) e `$GIT_COMMON_DIR` é configurado para apontar de volta para a árvore de trabalho principal `$GIT_DIR` (`/path/main/.git` por exemplo). Estas configurações são feitas em um arquivo `.git` localizado no diretório vinculado mais alto da árvore de trabalho."
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
-msgstr ""
-"A resolução do caminho através do comando `git rev-parse --git-path` utiliza "
-"'$GIT_DIR' ou '$GIT_COMMON_DIR', dependendo do caminho. Na árvore de "
-"trabalho vinculada, o comando `git rev-parse --git-path HEAD` retorna `/path/"
-"main/.git/worktrees/test-next/HEAD` (não `/path/other/test-next/.git/HEAD` "
-"ou `/path/main/.git/HEAD`) enquanto o comando `git rev-parse --git-path refs/"
-"heads/master` usa '$GIT_COMMON_DIR' e retorna `/path/main/.git/refs/heads/"
-"master`, já que as refs são compartilhados em todas as árvores de trabalho, "
-"exceto 'refs/bisect' e 'refs/worktree'."
+msgstr "A resolução do caminho através do comando `git rev-parse --git-path` utiliza '$GIT_DIR' ou '$GIT_COMMON_DIR', dependendo do caminho. Na árvore de trabalho vinculada, o comando `git rev-parse --git-path HEAD` retorna `/path/main/.git/worktrees/test-next/HEAD` (não `/path/other/test-next/.git/HEAD` ou `/path/main/.git/HEAD`) enquanto o comando `git rev-parse --git-path refs/heads/master` usa '$GIT_COMMON_DIR' e retorna `/path/main/.git/refs/heads/master`, já que as refs são compartilhados em todas as árvores de trabalho, exceto 'refs/bisect' e 'refs/worktree'."
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr "Para mais informações consulte linkgit:gitrepository-layout[5]. A regra geral é não fazer qualquer suposição sobre se um caminho pertence ao `$GIT_DIR` ou ao `$GIT_COMMON_DIR` quando você precisar acessar diretamente algo dentro do `$GIT_DIR`. Para obter o caminho final utilize o comando `git rev-parse --git-path`."
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
-msgstr ""
-"Caso queira mover manualmente o vínculo de uma árvore de trabalho, será "
-"preciso atualizar o arquivo 'gitdir' no diretório da entrada. Como por "
-"exemplo, caso o vínculo de uma árvore de trabalho seja movida para `/newpath/"
-"test-next` e o seu arquivo `.git` aponte para `/path/main/.git/worktrees/"
-"test-next`, então atualize `/path/main/.git/worktrees/test-next/gitdir` para "
-"a referência `/newpath/test-next`."
+msgstr "Caso queira mover manualmente o vínculo de uma árvore de trabalho, será preciso atualizar o arquivo 'gitdir' no diretório da entrada. Como por exemplo, caso o vínculo de uma árvore de trabalho seja movida para `/newpath/test-next` e o seu arquivo `.git` aponte para `/path/main/.git/worktrees/test-next`, então atualize `/path/main/.git/worktrees/test-next/gitdir` para a referência `/newpath/test-next`."
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr "Para impedir que uma entrada `$GIT_DIR/worktrees` seja removida (que pode ser útil em algumas situações, como quando a árvore de trabalho da entrada é armazenada em um dispositivo portátil), utilize o comando `git worktree lock` que adiciona um arquivo chamado 'locked' ao diretório da entrada. O arquivo contém o motivo no formato texto puro, sem formatação. Por exemplo, caso o arquivo `.git` aponte para `/path/main/.git/worktrees/test-next` então o arquivo de nome `/path/main/.git/worktrees/test-next/locked` prevenirá que a entrada `test-next` seja excluída.  Para mais detalhes consulte linkgit:gitrepository-layout[5]."
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
-msgstr ""
-"Quando a opção de configuração `extensions.worktreeConfig` está ativo, o "
-"arquivo de configuração `.git/worktrees/<id>/config.worktree` é lido após o `"
-".git/config`."
+msgstr "Quando a opção de configuração `extensions.worktreeConfig` está ativo, o arquivo de configuração `.git/worktrees/<id>/config.worktree` é lido após o `.git/config`."
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr "FORMATO DA LISTA DE SAÍDA"
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr "O comando `worktree` gera dois formatos na saída.  O formato já predefinido exibe os detalhes em uma única linha com colunas.  Por exemplo:"
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -68957,19 +59256,19 @@ msgstr ""
 "/path/to/other-linked-worktree  1234abc  (HEAD desanexado)\n"
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr "Formato Porcelana"
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  Por exemplo:"
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -68981,7 +59280,7 @@ msgstr ""
 "bare\n"
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -68993,7 +59292,7 @@ msgstr ""
 "branch refs/heads/master\n"
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -69005,21 +59304,13 @@ msgstr ""
 "detached\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
-msgstr ""
-"Você está no meio de uma sessão de refatoração e o seu chefe entra e exige "
-"que você conserte algo imediatamente. Você normalmente pode usar o linkgit"
-":git-stash[1] para armazenar temporariamente as suas alterações, no entanto, "
-"a sua árvore de trabalho está em uma condição de desordem (com arquivos "
-"novos, movidos e removidos e outros pedaços espalhados) que você não quer "
-"arriscar mexer em nenhum deles. Em vez disso, você cria uma árvore de "
-"trabalho vinculada temporária para fazer a correção de emergência, removê-la "
-"quando terminar e em seguida, retomar a sua sessão de refatoração anterior."
+msgstr "Você está no meio de uma sessão de refatoração e o seu chefe entra e exige que você conserte algo imediatamente. Você normalmente pode usar o linkgit:git-stash[1] para armazenar temporariamente as suas alterações, no entanto, a sua árvore de trabalho está em uma condição de desordem (com arquivos novos, movidos e removidos e outros pedaços espalhados) que você não quer arriscar mexer em nenhum deles. Em vez disso, você cria uma árvore de trabalho vinculada temporária para fazer a correção de emergência, removê-la quando terminar e em seguida, retomar a sua sessão de refatoração anterior."
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -69037,13 +59328,10 @@ msgstr ""
 "$ git worktree remove ../temp\n"
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
-msgstr ""
-"A averiguação múltipla em geral ainda é experimental e a compatibilidade "
-"para os submódulos ainda está incompleto. NÃO é recomendado fazer várias "
-"averiguações de um superprojeto."
+msgstr "A averiguação múltipla em geral ainda é experimental e a compatibilidade para os submódulos ainda está incompleto. NÃO é recomendado fazer várias averiguações de um superprojeto."
 
 #. type: Title =
 #: en/git-write-tree.txt:2
@@ -69067,9 +59355,7 @@ msgstr "'git write-tree' [--missing-ok] [--prefix=<prefixo>/]\n"
 #: en/git-write-tree.txt:18
 #, priority:100
 msgid "Creates a tree object using the current index. The name of the new tree object is printed to standard output."
-msgstr ""
-"Cria um objeto árvore utilizando o índice atual. O nome do novo objeto "
-"árvore é impresso na saída padrão."
+msgstr "Cria um objeto árvore utilizando o índice atual. O nome do novo objeto árvore é impresso na saída padrão."
 
 #. type: Plain text
 #: en/git-write-tree.txt:20
@@ -69081,11 +59367,7 @@ msgstr "O índice deve estar em uma condição totalmente mesclada."
 #: en/git-write-tree.txt:26
 #, priority:100
 msgid "Conceptually, 'git write-tree' sync()s the current index contents into a set of tree files.  In order to have that match what is actually in your directory right now, you need to have done a 'git update-index' phase before you did the 'git write-tree'."
-msgstr ""
-"Conceitualmente, o comando 'git write-tree' sync() é o conteúdo atual do "
-"índice em um conjunto dos arquivos na árvore.  Para ter esta coincidência "
-"com o que está realmente no seu diretório agora, é necessário ter feito uma "
-"fase com o comando 'git update-index' antes de fazer o 'git write-tree'."
+msgstr "Conceitualmente, o comando 'git write-tree' sync() é o conteúdo atual do índice em um conjunto dos arquivos na árvore.  Para ter esta coincidência com o que está realmente no seu diretório agora, é necessário ter feito uma fase com o comando 'git update-index' antes de fazer o 'git write-tree'."
 
 #. type: Labeled list
 #: en/git-write-tree.txt:30
@@ -69097,19 +59379,13 @@ msgstr "--missing-ok"
 #: en/git-write-tree.txt:34
 #, priority:100
 msgid "Normally 'git write-tree' ensures that the objects referenced by the directory exist in the object database.  This option disables this check."
-msgstr ""
-"Normalmente, 'git write-tree' garante que os objetos usando como referência "
-"pelo diretório existam no banco de dados dos objetos.  Esta opção desativa "
-"esta verificação."
+msgstr "Normalmente, 'git write-tree' garante que os objetos usando como referência pelo diretório existam no banco de dados dos objetos.  Esta opção desativa esta verificação."
 
 #. type: Plain text
 #: en/git-write-tree.txt:39
 #, priority:100
 msgid "Writes a tree object that represents a subdirectory `<prefix>`.  This can be used to write the tree object for a subproject that is in the named subdirectory."
-msgstr ""
-"Escreve o objeto árvore que represente um subdiretório `<prefixo>`.  Pode "
-"ser usado para gravar o objeto árvore em um subprojeto que está no "
-"subdiretório informado."
+msgstr "Escreve o objeto árvore que represente um subdiretório `<prefixo>`.  Pode ser usado para gravar o objeto árvore em um subprojeto que está no subdiretório informado."
 
 #. type: Title =
 #: en/gitglossary.txt:2
@@ -69139,18 +59415,13 @@ msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migrati
 #: en/glossary-content.txt:1
 #, no-wrap, priority:100
 msgid "[[def_alternate_object_database]]alternate object database"
-msgstr ""
-"[[def_alternate_object_database]]alternate object database (banco de dados "
-"alternativo do objeto)"
+msgstr "[[def_alternate_object_database]]alternate object database (banco de dados alternativo do objeto)"
 
 #. type: Plain text
 #: en/glossary-content.txt:5
 #, priority:100
 msgid "Via the alternates mechanism, a <<def_repository,repository>> can inherit part of its <<def_object_database,object database>> from another object database, which is called an \"alternate\"."
-msgstr ""
-"Através do mecanismo alternativo, um <<def_repository,repositório>> pode "
-"herdar parte do seu <<def_object_database,banco de dados do objeto>> vindo "
-"de outro banco de dados de objeto, chamado \"alternativo\"."
+msgstr "Através do mecanismo alternativo, um <<def_repository,repositório>> pode herdar parte do seu <<def_object_database,banco de dados do objeto>> vindo de outro banco de dados de objeto, chamado \"alternativo\"."
 
 #. type: Labeled list
 #: en/glossary-content.txt:6
@@ -69162,15 +59433,7 @@ msgstr "[[def_bare_repository]]bare repository (repositório simples)"
 #: en/glossary-content.txt:16
 #, priority:100
 msgid "A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, and no other files are present and checked out. Usually publishers of public repositories make bare repositories available."
-msgstr ""
-"Um repositório simples normalmente é um diretório "
-"<<def_directory,diretório>> apropriadamente denominado com um sufixo `.git` "
-"que não possui uma cópia local averiguada de nenhum dos arquivos sob "
-"controle da revisão. Ou seja, todos os arquivos administrativos e de "
-"controle do Git que normalmente estariam presentes no subdiretório `.git` "
-"oculto estão diretamente presentes no diretório `repository.git`, e nenhum "
-"outro arquivo está presente e é retirado. Normalmente, os editores dos "
-"repositórios públicos disponibilizam repositórios simples."
+msgstr "Um repositório simples normalmente é um diretório <<def_directory,diretório>> apropriadamente denominado com um sufixo `.git` que não possui uma cópia local averiguada de nenhum dos arquivos sob controle da revisão. Ou seja, todos os arquivos administrativos e de controle do Git que normalmente estariam presentes no subdiretório `.git` oculto estão diretamente presentes no diretório `repository.git`, e nenhum outro arquivo está presente e é retirado. Normalmente, os editores dos repositórios públicos disponibilizam repositórios simples."
 
 #. type: Labeled list
 #: en/glossary-content.txt:17
@@ -69182,9 +59445,7 @@ msgstr "[[def_blob_object]]blob object (objeto bolha)"
 #: en/glossary-content.txt:19
 #, priority:100
 msgid "Untyped <<def_object,object>>, e.g. the contents of a file."
-msgstr ""
-"Um <<def_object,objeto>> sem tipo, como por exemplo, o conteúdo de um "
-"arquivo."
+msgstr "Um <<def_object,objeto>> sem tipo, como por exemplo, o conteúdo de um arquivo."
 
 #. type: Labeled list
 #: en/glossary-content.txt:20
@@ -69196,15 +59457,7 @@ msgstr "[[def_branch]]branch (ramo)"
 #: en/glossary-content.txt:30
 #, priority:100
 msgid "A \"branch\" is an active line of development.  The most recent <<def_commit,commit>> on a branch is referred to as the tip of that branch.  The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development is done on the branch.  A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the \"current\" or \"checked out\" branch), and <<def_HEAD,HEAD>> points to that branch."
-msgstr ""
-"Um \"ramo\" é uma linha ativa de desenvolvimento.  O <<def_commit,commit >> "
-"mais recente em um ramo é referido como o cume deste ramo.  O cume do ramo é "
-"referenciado por um ramo <<def_head,head>>, que avança à medida que o "
-"desenvolvimento adicional é feito no ramo.  Um único Git "
-"<<def_repository,repositório>> pode monitorar um número arbitrário de ramos, "
-"porém a sua <<def_working_tree,árvore de trabalho>> está associada apenas a "
-"uma delas (o ramo \"atual\" ou \"averiguado\") e <<def_HEAD,HEAD>> aponte "
-"para esse ramo."
+msgstr "Um \"ramo\" é uma linha ativa de desenvolvimento.  O <<def_commit,commit >> mais recente em um ramo é referido como o cume deste ramo.  O cume do ramo é referenciado por um ramo <<def_head,head>>, que avança à medida que o desenvolvimento adicional é feito no ramo.  Um único Git <<def_repository,repositório>> pode monitorar um número arbitrário de ramos, porém a sua <<def_working_tree,árvore de trabalho>> está associada apenas a uma delas (o ramo \"atual\" ou \"averiguado\") e <<def_HEAD,HEAD>> aponte para esse ramo."
 
 #. type: Labeled list
 #: en/glossary-content.txt:31
@@ -69228,10 +59481,7 @@ msgstr "[[def_chain]]chain (cadeia ou corrente)"
 #: en/glossary-content.txt:38
 #, priority:100
 msgid "A list of objects, where each <<def_object,object>> in the list contains a reference to its successor (for example, the successor of a <<def_commit,commit>> could be one of its <<def_parent,parents>>)."
-msgstr ""
-"Uma lista dos objetos onde cada objeto <<def_object,objeto>> contém uma "
-"referência ao seu sucessor (como por exemplo, o sucessor de um "
-"<<def_commit,commit>> pode ser uma das suas <<def_parent,origens>>)."
+msgstr "Uma lista dos objetos onde cada objeto <<def_object,objeto>> contém uma referência ao seu sucessor (como por exemplo, o sucessor de um <<def_commit,commit>> pode ser uma das suas <<def_parent,origens>>)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:39
@@ -69243,10 +59493,7 @@ msgstr "[[def_changeset]]changeset (conjunto de alterações)"
 #: en/glossary-content.txt:43
 #, priority:100
 msgid "BitKeeper/cvsps speak for \"<<def_commit,commit>>\". Since Git does not store changes, but states, it really does not make sense to use the term \"changesets\" with Git."
-msgstr ""
-"O BitKeeper/cvsps fala por \"<<def_commit,commit>>\". Como o Git não "
-"armazena as alterações, mas declara, que realmente não faz sentido utilizar "
-"o termo \"changesets\" com o Git."
+msgstr "O BitKeeper/cvsps fala por \"<<def_commit,commit>>\". Como o Git não armazena as alterações, mas declara, que realmente não faz sentido utilizar o termo \"changesets\" com o Git."
 
 #. type: Labeled list
 #: en/glossary-content.txt:44
@@ -69258,12 +59505,7 @@ msgstr "[[def_checkout]]checkout (averiguação)"
 #: en/glossary-content.txt:51
 #, priority:100
 msgid "The action of updating all or part of the <<def_working_tree,working tree>> with a <<def_tree_object,tree object>> or <<def_blob_object,blob>> from the <<def_object_database,object database>>, and updating the <<def_index,index>> and <<def_HEAD,HEAD>> if the whole working tree has been pointed at a new <<def_branch,branch>>."
-msgstr ""
-"A ação de atualizar todos ou parte da <<def_working_tree,árvore de "
-"trabalho>> com o <<def_tree_object,objeto da árvore>> ou "
-"<<def_blob_object,bolha>> vindo do <<def_object_database,banco de dados do "
-"objeto>>, e atualizando o <<def_index,índice>> e <<def_HEAD,HEAD>> caso toda "
-"a árvore tenha um ponteiro para um novo <<def_branch,ramo>>."
+msgstr "A ação de atualizar todos ou parte da <<def_working_tree,árvore de trabalho>> com o <<def_tree_object,objeto da árvore>> ou <<def_blob_object,bolha>> vindo do <<def_object_database,banco de dados do objeto>>, e atualizando o <<def_index,índice>> e <<def_HEAD,HEAD>> caso toda a árvore tenha um ponteiro para um novo <<def_branch,ramo>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:52
@@ -69275,14 +59517,7 @@ msgstr "[[def_cherry-picking]]cherry-picking (escolha-seletiva)"
 #: en/glossary-content.txt:59
 #, priority:100
 msgid "In <<def_SCM,SCM>> jargon, \"cherry pick\" means to choose a subset of changes out of a series of changes (typically commits) and record them as a new series of changes on top of a different codebase. In Git, this is performed by the \"git cherry-pick\" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit."
-msgstr ""
-"No jargão <<def_SCM,SCM>>, a \"escolha seletiva\" (cherry pick) significa "
-"escolher um subconjunto das alterações de uma série de alterações (em geral, "
-"commits) e registrá-las como uma nova série de alterações sobre uma base de "
-"código diferente. No Git, isso é executado pelo comando `git cherry-pick` "
-"para extrair a alteração introduzida através de um <<def_commit,commit>> já "
-"existente e registrá-lo com base no cume do <<def_branch,ramo>> atual como "
-"um novo commit."
+msgstr "No jargão <<def_SCM,SCM>>, a \"escolha seletiva\" (cherry pick) significa escolher um subconjunto das alterações de uma série de alterações (em geral, commits) e registrá-las como uma nova série de alterações sobre uma base de código diferente. No Git, isso é executado pelo comando `git cherry-pick` para extrair a alteração introduzida através de um <<def_commit,commit>> já existente e registrá-lo com base no cume do <<def_branch,ramo>> atual como um novo commit."
 
 #. type: Labeled list
 #: en/glossary-content.txt:60
@@ -69294,10 +59529,7 @@ msgstr "[[def_clean]]clean (limpar, limpeza)"
 #: en/glossary-content.txt:64
 #, priority:100
 msgid "A <<def_working_tree,working tree>> is clean, if it corresponds to the <<def_revision,revision>> referenced by the current <<def_head,head>>. Also see \"<<def_dirty,dirty>>\"."
-msgstr ""
-"Uma <<def_working_tree,árvore de trabalho>> está limpa, caso corresponda à "
-"<<def_revision,revisão>> referenciada pelo <<def_head,cabeçalho>> atual. "
-"Consulte também \"<<def_dirty,dirty>>\"."
+msgstr "Uma <<def_working_tree,árvore de trabalho>> está limpa, caso corresponda à <<def_revision,revisão>> referenciada pelo <<def_head,cabeçalho>> atual. Consulte também \"<<def_dirty,dirty>>\"."
 
 #. type: Labeled list
 #: en/glossary-content.txt:65
@@ -69309,23 +59541,13 @@ msgstr "[[def_commit]]commit"
 #: en/glossary-content.txt:72
 #, priority:100
 msgid "As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits.  The word \"commit\" is often used by Git in the same places other revision control systems use the words \"revision\" or \"version\".  Also used as a short hand for <<def_commit_object,commit object>>."
-msgstr ""
-"Como um substantivo: um único ponto no histórico do Git; todo o histórico de "
-"um projeto é representado como um conjunto de commits inter-relacionados.  A "
-"palavra \"commit\" é frequentemente utilizada pelo Git nos mesmos locais "
-"onde outros sistemas para o controle da revisão utilizem as palavras "
-"\"revision\" (revisão) ou \"version\" (versão).  Também utilizado como uma "
-"abreviação para um <<def_commit_object,objeto commit>>."
+msgstr "Como um substantivo: um único ponto no histórico do Git; todo o histórico de um projeto é representado como um conjunto de commits inter-relacionados.  A palavra \"commit\" é frequentemente utilizada pelo Git nos mesmos locais onde outros sistemas para o controle da revisão utilizem as palavras \"revision\" (revisão) ou \"version\" (versão).  Também utilizado como uma abreviação para um <<def_commit_object,objeto commit>>."
 
 #. type: Plain text
 #: en/glossary-content.txt:77
 #, priority:100
 msgid "As a verb: The action of storing a new snapshot of the project's state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit."
-msgstr ""
-"Como um verbo: A ação de armazenar um novo instantâneo da condição do "
-"projeto no histórico do Git, criando um novo commit que representa a "
-"condição atual do <<def_index,índice>> e avançando o <<def_HEAD,HEAD>> "
-"apontando para o novo commit."
+msgstr "Como um verbo: A ação de armazenar um novo instantâneo da condição do projeto no histórico do Git, criando um novo commit que representa a condição atual do <<def_index,índice>> e avançando o <<def_HEAD,HEAD>> apontando para o novo commit."
 
 #. type: Labeled list
 #: en/glossary-content.txt:78
@@ -69337,11 +59559,7 @@ msgstr "[[def_commit_object]]commit object (objeto commit)"
 #: en/glossary-content.txt:84
 #, priority:100
 msgid "An <<def_object,object>> which contains the information about a particular <<def_revision,revision>>, such as <<def_parent,parents>>, committer, author, date and the <<def_tree_object,tree object>> which corresponds to the top <<def_directory,directory>> of the stored revision."
-msgstr ""
-"Um objeto <<def_object,objeto>>, que contém as informações sobre uma "
-"<<def_revision,revisão>> específica, como <<def_parent,origem>>, de quem fez "
-"o commit, o autor, a data e o <<def_tree_object,objeto árvore>> que "
-"corresponde <<def_directory,diretório>> da revisão que foi armazenada."
+msgstr "Um objeto <<def_object,objeto>>, que contém as informações sobre uma <<def_revision,revisão>> específica, como <<def_parent,origem>>, de quem fez o commit, o autor, a data e o <<def_tree_object,objeto árvore>> que corresponde <<def_directory,diretório>> da revisão que foi armazenada."
 
 #. type: Labeled list
 #: en/glossary-content.txt:85
@@ -69353,12 +59571,7 @@ msgstr "[[def_commit-ish]]commit-ish (também committish)"
 #: en/glossary-content.txt:96
 #, priority:100
 msgid "A <<def_commit_object,commit object>> or an <<def_object,object>> that can be recursively dereferenced to a commit object.  The following are all commit-ishes: a commit object, a <<def_tag_object,tag object>> that points to a commit object, a tag object that points to a tag object that points to a commit object, etc."
-msgstr ""
-"Um <<def_commit_object,objeto commit>> ou um <<def_object,objeto>> que pode "
-"perder a referência de forma recursiva para um objeto commit.  A seguir "
-"estão todos os 'commit-ishes': um objeto commit, um <<def_tag_object,objeto "
-"tag>> que aponta para um objeto commit, um objeto tag que aponta para um "
-"objeto tag que aponta para um objeto commit, etc."
+msgstr "Um <<def_commit_object,objeto commit>> ou um <<def_object,objeto>> que pode perder a referência de forma recursiva para um objeto commit.  A seguir estão todos os 'commit-ishes': um objeto commit, um <<def_tag_object,objeto tag>> que aponta para um objeto commit, um objeto tag que aponta para um objeto tag que aponta para um objeto commit, etc."
 
 #. type: Labeled list
 #: en/glossary-content.txt:97
@@ -69370,9 +59583,7 @@ msgstr "[[def_core_git]]core Git (núcleo do Git)"
 #: en/glossary-content.txt:100
 #, priority:100
 msgid "Fundamental data structures and utilities of Git. Exposes only limited source code management tools."
-msgstr ""
-"Estruturas de dados e utilitários fundamentais do Git. Expõe apenas as "
-"ferramentas limitadas ao gerenciamento de código-fonte."
+msgstr "Estruturas de dados e utilitários fundamentais do Git. Expõe apenas as ferramentas limitadas ao gerenciamento de código-fonte."
 
 #. type: Labeled list
 #: en/glossary-content.txt:101
@@ -69384,11 +59595,7 @@ msgstr "[[def_DAG]]DAG"
 #: en/glossary-content.txt:106
 #, priority:100
 msgid "Directed acyclic graph. The <<def_commit_object,commit objects>> form a directed acyclic graph, because they have parents (directed), and the graph of commit objects is acyclic (there is no <<def_chain,chain>> which begins and ends with the same <<def_object,object>>)."
-msgstr ""
-"Gráfico acíclico dirigido. Os <<def_commit_object,objetos commit>> forma um "
-"grafo acíclico direcionado, porque eles têm parentes (direcionados), e o "
-"grafo dos objetos commit são acíclicos (não existe <<def_chain,cadeia>> que "
-"comece e termine com o mesmo <<def_object,objeto>>)."
+msgstr "Gráfico acíclico dirigido. Os <<def_commit_object,objetos commit>> forma um grafo acíclico direcionado, porque eles têm parentes (direcionados), e o grafo dos objetos commit são acíclicos (não existe <<def_chain,cadeia>> que comece e termine com o mesmo <<def_object,objeto>>)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:107
@@ -69400,11 +59607,7 @@ msgstr "[[def_dangling_object]]dangling object (objeto pendurado, pendente)"
 #: en/glossary-content.txt:112
 #, priority:100
 msgid "An <<def_unreachable_object,unreachable object>> which is not <<def_reachable,reachable>> even from other unreachable objects; a dangling object has no references to it from any reference or <<def_object,object>> in the <<def_repository,repository>>."
-msgstr ""
-"Um objeto <<def_unreachable_object,objeto inacessível>> que não seja "
-"<<def_reachable,acessível>>, mesmo a partir dos outros objetos inacessíveis; "
-"um objeto pendente não tem referências a ele vinda de nenhuma referência ou "
-"<<def_object,objeto>> no <<def_repository,repositório>>."
+msgstr "Um objeto <<def_unreachable_object,objeto inacessível>> que não seja <<def_reachable,acessível>>, mesmo a partir dos outros objetos inacessíveis; um objeto pendente não tem referências a ele vinda de nenhuma referência ou <<def_object,objeto>> no <<def_repository,repositório>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:113
@@ -69416,27 +59619,13 @@ msgstr "[[def_detached_HEAD]]detached HEAD (HEAD desanexado, CABEÇA desanexada)
 #: en/glossary-content.txt:122
 #, priority:100
 msgid "Normally the <<def_HEAD,HEAD>> stores the name of a <<def_branch,branch>>, and commands that operate on the history HEAD represents operate on the history leading to the tip of the branch the HEAD points at.  However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch.  The HEAD in such a state is called \"detached\"."
-msgstr ""
-"Normalmente, o <<def_HEAD,HEAD>> armazena o nome do <<def_branch,ramo>> e os "
-"comandos que operam no histórico que o `HEAD` representa, operam no "
-"histórico que leva ao cume do ramo onde o HEAD aponta.  No entanto, o Git "
-"também permite que você <<def_checkout,averigue>> um <<def_commit,commit>> "
-"arbitrário que não seja necessariamente o cume de qualquer ramo em "
-"particular.  O HEAD em tal condição é chamado de \"desanexado\" (detached)."
+msgstr "Normalmente, o <<def_HEAD,HEAD>> armazena o nome do <<def_branch,ramo>> e os comandos que operam no histórico que o `HEAD` representa, operam no histórico que leva ao cume do ramo onde o HEAD aponta.  No entanto, o Git também permite que você <<def_checkout,averigue>> um <<def_commit,commit>> arbitrário que não seja necessariamente o cume de qualquer ramo em particular.  O HEAD em tal condição é chamado de \"desanexado\" (detached)."
 
 #. type: Plain text
 #: en/glossary-content.txt:131
 #, priority:100
 msgid "Note that commands that operate on the history of the current branch (e.g. `git commit` to build a new history on top of it) still work while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch.  Commands that update or inquire information _about_ the current branch (e.g. `git branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state."
-msgstr ""
-"Observe que os comandos que operam no histórico do ramo atual (como por "
-"exemplo o `git commit` para criar um novo histórico sobre ele) ainda "
-"funcionam enquanto o `HEAD` for desanexado. Eles atualizam o `HEAD` para "
-"apontar no topo do histórico atualizado sem afetar nenhum ramo.  Os comandos "
-"que atualizam ou consultam informações _sobre_ o ramo atual (como por "
-"exemplo o comando `git branch --set-upstream-to` que define com qual ramo "
-"monitorado remotamente o ramo atual se integra) obviamente não funcionam, "
-"pois não há um ramo atual (real) para perguntar sobre esta condição."
+msgstr "Observe que os comandos que operam no histórico do ramo atual (como por exemplo o `git commit` para criar um novo histórico sobre ele) ainda funcionam enquanto o `HEAD` for desanexado. Eles atualizam o `HEAD` para apontar no topo do histórico atualizado sem afetar nenhum ramo.  Os comandos que atualizam ou consultam informações _sobre_ o ramo atual (como por exemplo o comando `git branch --set-upstream-to` que define com qual ramo monitorado remotamente o ramo atual se integra) obviamente não funcionam, pois não há um ramo atual (real) para perguntar sobre esta condição."
 
 #. type: Labeled list
 #: en/glossary-content.txt:132
@@ -69460,10 +59649,7 @@ msgstr "[[def_dirty]]dirty (sujo)"
 #: en/glossary-content.txt:139
 #, priority:100
 msgid "A <<def_working_tree,working tree>> is said to be \"dirty\" if it contains modifications which have not been <<def_commit,committed>> to the current <<def_branch,branch>>."
-msgstr ""
-"Se diz que uma <<def_working_tree,árvore de trabalho>> está \"suja\" caso "
-"contenha alterações que não foram <<def_commit,feito os commits>> no "
-"<<def_branch,ramo>> atual."
+msgstr "Se diz que uma <<def_working_tree,árvore de trabalho>> está \"suja\" caso contenha alterações que não foram <<def_commit,feito os commits>> no <<def_branch,ramo>> atual."
 
 #. type: Labeled list
 #: en/glossary-content.txt:140
@@ -69475,9 +59661,7 @@ msgstr "[[def_evil_merge]]evil merge (mesclagem má, mau, ruim)"
 #: en/glossary-content.txt:143
 #, priority:100
 msgid "An evil merge is a <<def_merge,merge>> that introduces changes that do not appear in any <<def_parent,parent>>."
-msgstr ""
-"Uma mesclagem má é uma <<def_merge,mesclagem>> que introduz as alterações "
-"que não aparecem em nenhuma <<def_parent,origem>>."
+msgstr "Uma mesclagem má é uma <<def_merge,mesclagem>> que introduz as alterações que não aparecem em nenhuma <<def_parent,origem>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:144
@@ -69489,14 +59673,7 @@ msgstr "[[def_fast_forward]]fast-forward (avanço-rápido)"
 #: en/glossary-content.txt:153
 #, priority:100
 msgid "A fast-forward is a special type of <<def_merge,merge>> where you have a <<def_revision,revision>> and you are \"merging\" another <<def_branch,branch>>'s changes that happen to be a descendant of what you have. In such a case, you do not make a new <<def_merge,merge>> <<def_commit,commit>> but instead just update to his revision. This will happen frequently on a <<def_remote_tracking_branch,remote-tracking branch>> of a remote <<def_repository,repository>>."
-msgstr ""
-"Um avanço rápido é um tipo especial de <<def_merge,mesclagem>>, onde você "
-"tem uma <<def_revision,revisão>> e está \"mesclando\" outras alterações do "
-"<<def_branch,ramo>> que são descendentes do que você tem. Nesse caso, você "
-"não faz um <<def_merge,merge>> <<def_commit,commit>>, apenas atualiza a "
-"revisão dele. Isso acontecerá frequentemente em um "
-"<<def_remote_tracking_branch,ramo monitorado remotamente>> de um "
-"<<def_repository,repositório>> remoto."
+msgstr "Um avanço rápido é um tipo especial de <<def_merge,mesclagem>>, onde você tem uma <<def_revision,revisão>> e está \"mesclando\" outras alterações do <<def_branch,ramo>> que são descendentes do que você tem. Nesse caso, você não faz um <<def_merge,merge>> <<def_commit,commit>>, apenas atualiza a revisão dele. Isso acontecerá frequentemente em um <<def_remote_tracking_branch,ramo monitorado remotamente>> de um <<def_repository,repositório>> remoto."
 
 #. type: Labeled list
 #: en/glossary-content.txt:154
@@ -69508,11 +59685,7 @@ msgstr "[[def_fetch]]fetch (busca)"
 #: en/glossary-content.txt:160
 #, priority:100
 msgid "Fetching a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, to find out which objects are missing from the local <<def_object_database,object database>>, and to get them, too.  See also linkgit:git-fetch[1]."
-msgstr ""
-"Busque um <<def_branch,ramo>> significa obter o <<def_head_ref,cabeçalho "
-"ref>> de um ramo remoto <<def_repository,repositório>>, para descobrir quais "
-"os objetos estão faltando no local <<def_object_database,banco de dados do "
-"objeto>> e para obtê-los também.  Consulte também linkgit:git-fetch[1]."
+msgstr "Busque um <<def_branch,ramo>> significa obter o <<def_head_ref,cabeçalho ref>> de um ramo remoto <<def_repository,repositório>>, para descobrir quais os objetos estão faltando no local <<def_object_database,banco de dados do objeto>> e para obtê-los também.  Consulte também linkgit:git-fetch[1]."
 
 #. type: Labeled list
 #: en/glossary-content.txt:161
@@ -69524,10 +59697,7 @@ msgstr "[[def_file_system]]file system (sistema de arquivo)"
 #: en/glossary-content.txt:165
 #, priority:100
 msgid "Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the efficiency and speed of Git."
-msgstr ""
-"O Linus Torvalds originalmente projetou o Git para ser um sistema de "
-"arquivos no espaço do usuário, ou seja, a infraestrutura para armazenar os "
-"arquivos e os diretórios. Isso garantiu a eficiência e a velocidade do Git."
+msgstr "O Linus Torvalds originalmente projetou o Git para ser um sistema de arquivos no espaço do usuário, ou seja, a infraestrutura para armazenar os arquivos e os diretórios. Isso garantiu a eficiência e a velocidade do Git."
 
 #. type: Labeled list
 #: en/glossary-content.txt:166
@@ -69539,8 +59709,7 @@ msgstr "[[def_git_archive]]Git archive (arquivo Git)"
 #: en/glossary-content.txt:168
 #, priority:100
 msgid "Synonym for <<def_repository,repository>> (for arch people)."
-msgstr ""
-"É um sinônimo para <<def_repository,repositório>> (para o pessoal do arch)."
+msgstr "É um sinônimo para <<def_repository,repositório>> (para o pessoal do arch)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:169
@@ -69552,9 +59721,7 @@ msgstr "[[def_gitfile]]gitfile"
 #: en/glossary-content.txt:172
 #, priority:100
 msgid "A plain file `.git` at the root of a working tree that points at the directory that is the real repository."
-msgstr ""
-"Um arquivo simples `.git` na raiz de uma árvore em funcionamento que aponte "
-"para o diretório que seja o repositório real."
+msgstr "Um arquivo simples `.git` na raiz de uma árvore em funcionamento que aponte para o diretório que seja o repositório real."
 
 #. type: Labeled list
 #: en/glossary-content.txt:173
@@ -69566,13 +59733,7 @@ msgstr "[[def_grafts]]grafts (grafos)"
 #: en/glossary-content.txt:179
 #, priority:100
 msgid "Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file."
-msgstr ""
-"O Grafts permite que duas linhas de desenvolvimento diferentes sejam unidas, "
-"registrando informações falsas de ancestralidade para os commits. Dessa "
-"forma, é possível fazer o Git fingir que o conjunto de "
-"<<def_parent,parents>> um <<def_commit,commit>> tenha é diferente do que foi "
-"registrado quando o commit foi criado. Configurado através do arquivo `.git/"
-"info/grafts`."
+msgstr "O Grafts permite que duas linhas de desenvolvimento diferentes sejam unidas, registrando informações falsas de ancestralidade para os commits. Dessa forma, é possível fazer o Git fingir que o conjunto de <<def_parent,parents>> um <<def_commit,commit>> tenha é diferente do que foi registrado quando o commit foi criado. Configurado através do arquivo `.git/info/grafts`."
 
 #. type: Plain text
 #: en/glossary-content.txt:183
@@ -69590,8 +59751,7 @@ msgstr "[[def_hash]]hash"
 #: en/glossary-content.txt:186
 #, priority:100
 msgid "In Git's context, synonym for <<def_object_name,object name>>."
-msgstr ""
-"Em termos do Git, é um sinônimo para <<def_object_name,nome do objeto>>."
+msgstr "Em termos do Git, é um sinônimo para <<def_object_name,nome do objeto>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:187
@@ -69603,11 +59763,7 @@ msgstr "[[def_head]]head (cabeçalho, cabeça)"
 #: en/glossary-content.txt:192
 #, priority:100
 msgid "A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a <<def_branch,branch>>.  Heads are stored in a file in `$GIT_DIR/refs/heads/` directory, except when using packed refs. (See linkgit:git-pack-refs[1].)"
-msgstr ""
-"Um <<def_ref,named reference>> para o <<def_commit,commit>> no topo do "
-"<<def_branch,ramo>>.  Os `HEADS` são armazenados em um arquivo no diretório "
-"`$GIT_DIR/refs/heads/`, exceto quando é utilizado um `ref` empacotado. ("
-"Consulte linkgit:git-pack-refs[1].)"
+msgstr "Um <<def_ref,named reference>> para o <<def_commit,commit>> no topo do <<def_branch,ramo>>.  Os `HEADS` são armazenados em um arquivo no diretório `$GIT_DIR/refs/heads/`, exceto quando é utilizado um `ref` empacotado. (Consulte linkgit:git-pack-refs[1].)"
 
 #. type: Labeled list
 #: en/glossary-content.txt:193
@@ -69619,13 +59775,7 @@ msgstr "[[def_HEAD]]HEAD (CABEÇALHO, CABEÇA)"
 #: en/glossary-content.txt:200
 #, priority:100
 msgid "The current <<def_branch,branch>>.  In more detail: Your <<def_working_tree, working tree>> is normally derived from the state of the tree referred to by HEAD.  HEAD is a reference to one of the <<def_head,heads>> in your repository, except when using a <<def_detached_HEAD,detached HEAD>>, in which case it directly references an arbitrary commit."
-msgstr ""
-"O <<def_branch,ramo>> atual.  Com mais detalhes: A sua "
-"<<def_working_tree,árvore de trabalho>> normalmente deriva da condição da "
-"referência da árvore através do `HEAD`.  O `HEAD` é a referência para um dos "
-"<<def_head,cabeçalhos>> no seu repositório, exceto quando utilizar um "
-"<<def_detached_HEAD,HEAD desanexado>>, neste caso, referencia diretamente um "
-"commit arbitrário."
+msgstr "O <<def_branch,ramo>> atual.  Com mais detalhes: A sua <<def_working_tree,árvore de trabalho>> normalmente deriva da condição da referência da árvore através do `HEAD`.  O `HEAD` é a referência para um dos <<def_head,cabeçalhos>> no seu repositório, exceto quando utilizar um <<def_detached_HEAD,HEAD desanexado>>, neste caso, referencia diretamente um commit arbitrário."
 
 #. type: Labeled list
 #: en/glossary-content.txt:201
@@ -69649,15 +59799,7 @@ msgstr "[[def_hook]]hook (gancho)"
 #: en/glossary-content.txt:213
 #, priority:100
 msgid "During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions of Git you had to make them executable."
-msgstr ""
-"Durante a execução normal dos vários comandos Git, são feitas chamadas para "
-"os scripts opcionais que permitem que um desenvolvedor adicione mais "
-"funcionalidades ou verificações. Normalmente, os ganchos permitem que um "
-"comando seja pré-verificado e potencialmente abortado e permite uma "
-"notificação após a conclusão da operação. Os scripts do gancho são "
-"encontrados no diretório `$GIT_DIR/hooks/` e são ativados simplesmente ao "
-"remover o sufixo `.sample` do nome do arquivo. Nas versões anteriores do "
-"Git, era necessário torná-los executáveis."
+msgstr "Durante a execução normal dos vários comandos Git, são feitas chamadas para os scripts opcionais que permitem que um desenvolvedor adicione mais funcionalidades ou verificações. Normalmente, os ganchos permitem que um comando seja pré-verificado e potencialmente abortado e permite uma notificação após a conclusão da operação. Os scripts do gancho são encontrados no diretório `$GIT_DIR/hooks/` e são ativados simplesmente ao remover o sufixo `.sample` do nome do arquivo. Nas versões anteriores do Git, era necessário torná-los executáveis."
 
 #. type: Labeled list
 #: en/glossary-content.txt:214
@@ -69669,12 +59811,7 @@ msgstr "[[def_index]]index (índice)"
 #: en/glossary-content.txt:220
 #, priority:100
 msgid "A collection of files with stat information, whose contents are stored as objects. The index is a stored version of your <<def_working_tree,working tree>>. Truth be told, it can also contain a second, and even a third version of a working tree, which are used when <<def_merge,merging>>."
-msgstr ""
-"Uma coleção dos arquivos com as informações das estatísticas, cujo conteúdo "
-"é armazenado como objetos. O índice é uma versão armazenada da sua "
-"<<def_working_tree,árvore de trabalho>>. Na verdade, ele também pode conter "
-"uma segunda e até terceira versão de uma árvore em funcionamento, que são "
-"usadas quando for <<def_merge,mesclado>>."
+msgstr "Uma coleção dos arquivos com as informações das estatísticas, cujo conteúdo é armazenado como objetos. O índice é uma versão armazenada da sua <<def_working_tree,árvore de trabalho>>. Na verdade, ele também pode conter uma segunda e até terceira versão de uma árvore em funcionamento, que são usadas quando for <<def_merge,mesclado>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:221
@@ -69686,11 +59823,7 @@ msgstr "[[def_index_entry]]index entry (lançamento, entrada do índice)"
 #: en/glossary-content.txt:226
 #, priority:100
 msgid "The information regarding a particular file, stored in the <<def_index,index>>. An index entry can be unmerged, if a <<def_merge,merge>> was started, but not yet finished (i.e. if the index contains multiple versions of that file)."
-msgstr ""
-"As informações sobre um determinado arquivo, armazenadas no "
-"<<def_index,índice>>. Uma entrada do índice pode ter a mesclagem removida, "
-"caso uma <<def_merge,mesclagem>> seja iniciada, porém ainda não foi "
-"concluído (ou seja, caso o índice contenha várias versões deste arquivo)."
+msgstr "As informações sobre um determinado arquivo, armazenadas no <<def_index,índice>>. Uma entrada do índice pode ter a mesclagem removida, caso uma <<def_merge,mesclagem>> seja iniciada, porém ainda não foi concluído (ou seja, caso o índice contenha várias versões deste arquivo)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:227
@@ -69702,48 +59835,25 @@ msgstr "[[def_master]]master (mestre)"
 #: en/glossary-content.txt:233
 #, priority:100
 msgid "The default development <<def_branch,branch>>. Whenever you create a Git <<def_repository,repository>>, a branch named \"master\" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required."
-msgstr ""
-"O desenvolvimento predefinido do <<def_branch,ramo>>. Sempre quando você "
-"cria um <<def_repository,repositório>> Git, um ramo chamado \"master\" é "
-"criado e se torna o ramo ativo. Na maioria dos casos, contém o "
-"desenvolvimento local, embora isto seja puramente por convenção e não seja "
-"necessário."
+msgstr "O desenvolvimento predefinido do <<def_branch,ramo>>. Sempre quando você cria um <<def_repository,repositório>> Git, um ramo chamado \"master\" é criado e se torna o ramo ativo. Na maioria dos casos, contém o desenvolvimento local, embora isto seja puramente por convenção e não seja necessário."
 
 #. type: Labeled list
 #: en/glossary-content.txt:234
 #, no-wrap, priority:100
 msgid "[[def_merge]]merge"
-msgstr ""
-"[[def_merge]]merge (mesclar, mesclagem, juntar, combinar, misturar, fundir-"
-"se, unir, ligar-se)"
+msgstr "[[def_merge]]merge (mesclar, mesclagem, juntar, combinar, misturar, fundir-se, unir, ligar-se)"
 
 #. type: Plain text
 #: en/glossary-content.txt:247
 #, priority:100
 msgid "As a verb: To bring the contents of another <<def_branch,branch>> (possibly from an external <<def_repository,repository>>) into the current branch.  In the case where the merged-in branch is from a different repository, this is done by first <<def_fetch,fetching>> the remote branch and then merging the result into the current branch.  This combination of fetch and merge operations is called a <<def_pull,pull>>.  Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together.  In cases where changes conflict, manual intervention may be required to complete the merge."
-msgstr ""
-"Como verbo: Para trazer o conteúdo de outro <<def_branch,ramo>> ("
-"possivelmente de um <<def_repository,repositório>> externo) para o ramo "
-"atual.  No caso onde a ramificação mesclada seja de um repositório "
-"diferente, primeiro isto é feito ao <<def_fetch,buscar>> (fetch) o ramo "
-"remoto e depois mesclando o seu resultado no ramo atual.  Essa combinação "
-"das operações de busca e mesclagem é chamada de <<def_pull,captura>> (pull)"
-".  A mesclagem é realizada através de um processo automático que identifica "
-"as alterações feitas desde que as ramificações divirjam e depois aplique "
-"todas estas alterações juntas.  Nos casos onde as alterações entrem em "
-"conflito, pode ser necessária intervenção manual para concluir a mesclagem."
+msgstr "Como verbo: Para trazer o conteúdo de outro <<def_branch,ramo>> (possivelmente de um <<def_repository,repositório>> externo) para o ramo atual.  No caso onde a ramificação mesclada seja de um repositório diferente, primeiro isto é feito ao <<def_fetch,buscar>> (fetch) o ramo remoto e depois mesclando o seu resultado no ramo atual.  Essa combinação das operações de busca e mesclagem é chamada de <<def_pull,captura>> (pull).  A mesclagem é realizada através de um processo automático que identifica as alterações feitas desde que as ramificações divirjam e depois aplique todas estas alterações juntas.  Nos casos onde as alterações entrem em conflito, pode ser necessária intervenção manual para concluir a mesclagem."
 
 #. type: Plain text
 #: en/glossary-content.txt:254
 #, priority:100
 msgid "As a noun: unless it is a <<def_fast_forward,fast-forward>>, a successful merge results in the creation of a new <<def_commit,commit>> representing the result of the merge, and having as <<def_parent,parents>> the tips of the merged <<def_branch,branches>>.  This commit is referred to as a \"merge commit\", or sometimes just a \"merge\"."
-msgstr ""
-"Como substantivo: a menos que seja um <<def_fast_forward,avanço rápido>>, "
-"uma mesclagem bem-sucedida resulta na criação de um novo "
-"<<def_commit,commit>> representando o resultado da mesclagem e tendo como "
-"<<def_parent,parentes>> as dicas das <<def_branch,ramificações>>.  Este "
-"commit refere-se ao chamado \"merge commit\" (commit da mesclagem) ou às "
-"vezes, apenas como \"mesclagem\"."
+msgstr "Como substantivo: a menos que seja um <<def_fast_forward,avanço rápido>>, uma mesclagem bem-sucedida resulta na criação de um novo <<def_commit,commit>> representando o resultado da mesclagem e tendo como <<def_parent,parentes>> as dicas das <<def_branch,ramificações>>.  Este commit refere-se ao chamado \"merge commit\" (commit da mesclagem) ou às vezes, apenas como \"mesclagem\"."
 
 #. type: Labeled list
 #: en/glossary-content.txt:255
@@ -69755,10 +59865,7 @@ msgstr "[[def_object]]object (objeto)"
 #: en/glossary-content.txt:259
 #, priority:100
 msgid "The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA-1>> of its contents. Consequently, an object cannot be changed."
-msgstr ""
-"A unidade de armazenamento no Git. Ele é identificado exclusivamente pelo "
-"<<def_SHA1,SHA-1>> do seu conteúdo. Consequentemente, um objeto não pode ser "
-"alterado."
+msgstr "A unidade de armazenamento no Git. Ele é identificado exclusivamente pelo <<def_SHA1,SHA-1>> do seu conteúdo. Consequentemente, um objeto não pode ser alterado."
 
 #. type: Labeled list
 #: en/glossary-content.txt:260
@@ -69770,10 +59877,7 @@ msgstr "[[def_object_database]]object database (banco de dados do objeto)"
 #: en/glossary-content.txt:264
 #, priority:100
 msgid "Stores a set of \"objects\", and an individual <<def_object,object>> is identified by its <<def_object_name,object name>>. The objects usually live in `$GIT_DIR/objects/`."
-msgstr ""
-"Armazena o conjunto de \"objetos\", e um <<def_object,objeto>> individual é "
-"identificado pelos seus <<def_object_name,nomes dos objetos>>. Geralmente o "
-"objeto reside no `$GIT_DIR/objects/`."
+msgstr "Armazena o conjunto de \"objetos\", e um <<def_object,objeto>> individual é identificado pelos seus <<def_object_name,nomes dos objetos>>. Geralmente o objeto reside no `$GIT_DIR/objects/`."
 
 #. type: Labeled list
 #: en/glossary-content.txt:265
@@ -69797,10 +59901,7 @@ msgstr "[[def_object_name]]object name (nome do objeto)"
 #: en/glossary-content.txt:272
 #, priority:100
 msgid "The unique identifier of an <<def_object,object>>.  The object name is usually represented by a 40 character hexadecimal string.  Also colloquially called <<def_SHA1,SHA-1>>."
-msgstr ""
-"O identificador único para um <<def_object,objeto>>.  O nome do objeto "
-"geralmente é representado por uma sequência com 40 caracteres hexadecimais.  "
-"Também chamado coloquialmente de <<def_SHA1,SHA-1>>."
+msgstr "O identificador único para um <<def_object,objeto>>.  O nome do objeto geralmente é representado por uma sequência com 40 caracteres hexadecimais.  Também chamado coloquialmente de <<def_SHA1,SHA-1>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:273
@@ -69812,10 +59913,7 @@ msgstr "[[def_object_type]]tipo do objeto"
 #: en/glossary-content.txt:278
 #, priority:100
 msgid "One of the identifiers \"<<def_commit_object,commit>>\", \"<<def_tree_object,tree>>\", \"<<def_tag_object,tag>>\" or \"<<def_blob_object,blob>>\" describing the type of an <<def_object,object>>."
-msgstr ""
-"Um dos identificadores \"<<def_commit_object,commit>>\", \""
-"<<def_tree_object,árvore>>\", \"<<def_tag_object,tag>>\" ou \""
-"<<def_blob_object,bolha>>\" descrevendo o tipo de um <<def_object,objeto>>."
+msgstr "Um dos identificadores \"<<def_commit_object,commit>>\", \"<<def_tree_object,árvore>>\", \"<<def_tag_object,tag>>\" ou \"<<def_blob_object,bolha>>\" descrevendo o tipo de um <<def_object,objeto>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:279
@@ -69839,13 +59937,7 @@ msgstr "[[def_origin]]origin (origem)"
 #: en/glossary-content.txt:289
 #, priority:100
 msgid "The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`."
-msgstr ""
-"O <<def_repository,repositório>> upstream predefinido. A maioria dos "
-"projetos possui pelo menos um projeto \"upstream\" que eles monitoram. A "
-"predefinição 'origin' é usada para isso. As atualizações do novo \"upstream\""
-" serão buscados no <<def_remote_tracking_branch,ramo monitorado "
-"remotamente>> chamado 'origin/name-of-upstream-branch', que você pode ver "
-"usando o comando `git branch -r`."
+msgstr "O <<def_repository,repositório>> upstream predefinido. A maioria dos projetos possui pelo menos um projeto \"upstream\" que eles monitoram. A predefinição 'origin' é usada para isso. As atualizações do novo \"upstream\" serão buscados no <<def_remote_tracking_branch,ramo monitorado remotamente>> chamado 'origin/name-of-upstream-branch', que você pode ver usando o comando `git branch -r`."
 
 #. type: Labeled list
 #: en/glossary-content.txt:290
@@ -69857,14 +59949,7 @@ msgstr "[[def_overlay]]overlay (cobrir, revestir, sobrepor, capa, camada)"
 #: en/glossary-content.txt:298
 #, priority:100
 msgid "Only update and add files to the working directory, but don't delete them, similar to how 'cp -R' would update the contents in the destination directory.  This is the default mode in a <<def_checkout,checkout>> when checking out files from the <<def_index,index>> or a <<def_tree-ish,tree-ish>>.  In contrast, no-overlay mode also deletes tracked files not present in the source, similar to 'rsync --delete'."
-msgstr ""
-"Atualize e adicione apenas os arquivos ao diretório de trabalho porém não os "
-"exclua, semelhante a como o comando 'cp -R' atualizaria o conteúdo no "
-"diretório de destino.  Este é o modo predefinido em "
-"<<def_checkout,checkout>> ao fazer averiguação dos arquivos vindo do "
-"<<def_index,índice>> ou <<def_tree-ish,tree-ish>>.  Por outro lado, o modo "
-"sem sobreposição também exclui os arquivos monitorados que não estão "
-"presentes na fonte, semelhante ao comando 'rsync --delete'."
+msgstr "Atualize e adicione apenas os arquivos ao diretório de trabalho porém não os exclua, semelhante a como o comando 'cp -R' atualizaria o conteúdo no diretório de destino.  Este é o modo predefinido em <<def_checkout,checkout>> ao fazer averiguação dos arquivos vindo do <<def_index,índice>> ou <<def_tree-ish,tree-ish>>.  Por outro lado, o modo sem sobreposição também exclui os arquivos monitorados que não estão presentes na fonte, semelhante ao comando 'rsync --delete'."
 
 #. type: Labeled list
 #: en/glossary-content.txt:299
@@ -69876,9 +59961,7 @@ msgstr "[[def_pack]]pack (pacote)"
 #: en/glossary-content.txt:302
 #, priority:100
 msgid "A set of objects which have been compressed into one file (to save space or to transmit them efficiently)."
-msgstr ""
-"Um conjunto de objetos que foram compactados em um arquivo (para economizar "
-"espaço ou transmiti-los com eficiência)."
+msgstr "Um conjunto de objetos que foram compactados em um arquivo (para economizar espaço ou transmiti-los com eficiência)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:303
@@ -69890,10 +59973,7 @@ msgstr "[[def_pack_index]]pack index (índice do pacote)"
 #: en/glossary-content.txt:307
 #, priority:100
 msgid "The list of identifiers, and other information, of the objects in a <<def_pack,pack>>, to assist in efficiently accessing the contents of a pack."
-msgstr ""
-"A lista de identificadores e das outras informações dos objetos em um "
-"<<def_pack,pacote>>, para ajudar no acesso eficiente ao conteúdo de um "
-"pacote."
+msgstr "A lista de identificadores e das outras informações dos objetos em um <<def_pack,pacote>>, para ajudar no acesso eficiente ao conteúdo de um pacote."
 
 #. type: Labeled list
 #: en/glossary-content.txt:308
@@ -69911,13 +59991,7 @@ msgstr "O padrão utilizado para limitar os caminhos nos comandos do Git."
 #: en/glossary-content.txt:318
 #, priority:100
 msgid "Pathspecs are used on the command line of \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\", and many other commands to limit the scope of operations to some subset of the tree or worktree.  See the documentation of each command for whether paths are relative to the current directory or toplevel.  The pathspec syntax is as follows:"
-msgstr ""
-"Os pathspecs são utilizados na linha de comando, os comando \"git ls-files\""
-", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\" "
-"e muitos outros para limitar o escopo das operações para algum subconjunto "
-"da árvore ou da árvore de trabalho.  Consulte a documentação de cada comando "
-"para saber se os caminhos são relativos ao diretório atual ou ao nível mais "
-"alto.  A sintaxe do pathspec é a seguinte:"
+msgstr "Os pathspecs são utilizados na linha de comando, os comando \"git ls-files\", \"git ls-tree\", \"git add\", \"git grep\", \"git diff\", \"git checkout\" e muitos outros para limitar o escopo das operações para algum subconjunto da árvore ou da árvore de trabalho.  Consulte a documentação de cada comando para saber se os caminhos são relativos ao diretório atual ou ao nível mais alto.  A sintaxe do pathspec é a seguinte:"
 
 #. type: Plain text
 #: en/glossary-content.txt:322
@@ -69929,61 +60003,37 @@ msgstr "qualquer caminho corresponde a si próprio"
 #: en/glossary-content.txt:325
 #, priority:100
 msgid "the pathspec up to the last slash represents a directory prefix.  The scope of that pathspec is limited to that subtree."
-msgstr ""
-"o pathspec até a última barra representa um prefixo do diretório.  O escopo "
-"deste pathspec é limitado a esta subárvore."
+msgstr "o pathspec até a última barra representa um prefixo do diretório.  O escopo deste pathspec é limitado a esta subárvore."
 
 #. type: Plain text
 #: en/glossary-content.txt:329
 #, priority:100
 msgid "the rest of the pathspec is a pattern for the remainder of the pathname.  Paths relative to the directory prefix will be matched against that pattern using fnmatch(3); in particular, '*' and '?' _can_ match directory separators."
-msgstr ""
-"o restante do pathspec é um padrão para o restante do nome do caminho.  Os "
-"caminhos relativos ao prefixo do diretório serão comparados com este padrão "
-"usando fnmatch(3); '*' e '?' em particular _podem_ ser comparados com os "
-"separadores dos diretórios."
+msgstr "o restante do pathspec é um padrão para o restante do nome do caminho.  Os caminhos relativos ao prefixo do diretório serão comparados com este padrão usando fnmatch(3); '*' e '?' em particular _podem_ ser comparados com os separadores dos diretórios."
 
 #. type: Plain text
 #: en/glossary-content.txt:335
 #, priority:100
 msgid "For example, Documentation/*.jpg will match all .jpg files in the Documentation subtree, including Documentation/chapter_1/figure_1.jpg."
-msgstr ""
-"Como por exemplo, 'Documentação/*.jpg' irá coincidir com todos os arquivos ."
-"jpg na subárvore 'Documentação', incluindo 'Documentação/capítulo_1/figura_1."
-"jpg'."
+msgstr "Como por exemplo, 'Documentação/*.jpg' irá coincidir com todos os arquivos .jpg na subárvore 'Documentação', incluindo 'Documentação/capítulo_1/figura_1.jpg'."
 
 #. type: Plain text
 #: en/glossary-content.txt:345
 #, priority:100
 msgid "A pathspec that begins with a colon `:` has special meaning.  In the short form, the leading colon `:` is followed by zero or more \"magic signature\" letters (which optionally is terminated by another colon `:`), and the remainder is the pattern to match against the path.  The \"magic signature\" consists of ASCII symbols that are neither alphanumeric, glob, regex special characters nor colon.  The optional colon that terminates the \"magic signature\" can be omitted if the pattern begins with a character that does not belong to \"magic signature\" symbol set and is not a colon."
-msgstr ""
-"Um pathspec que começa com dois pontos `:` tem um significado especial.  Na "
-"forma abreviada, os dois pontos iniciais `:` são seguidos por zero ou mais "
-"letras da \"assinatura mágica\" (que opcionalmente são terminadas por outros "
-"dois pontos `:`), o restante é o padrão que será comparado ao caminho.  A "
-"\"assinatura mágica\" consiste em símbolos ASCII que não são caracteres "
-"alfanuméricos, 'glob', 'regex' nem caracteres especiais.  Os dois pontos "
-"opcionais que encerram a \"assinatura mágica\" podem ser omitidos caso o "
-"padrão comece com um caractere que não pertença ao conjunto dos símbolos da "
-"\"assinatura mágica\" e não seja dois pontos."
+msgstr "Um pathspec que começa com dois pontos `:` tem um significado especial.  Na forma abreviada, os dois pontos iniciais `:` são seguidos por zero ou mais letras da \"assinatura mágica\" (que opcionalmente são terminadas por outros dois pontos `:`), o restante é o padrão que será comparado ao caminho.  A \"assinatura mágica\" consiste em símbolos ASCII que não são caracteres alfanuméricos, 'glob', 'regex' nem caracteres especiais.  Os dois pontos opcionais que encerram a \"assinatura mágica\" podem ser omitidos caso o padrão comece com um caractere que não pertença ao conjunto dos símbolos da \"assinatura mágica\" e não seja dois pontos."
 
 #. type: Plain text
 #: en/glossary-content.txt:350
 #, priority:100
 msgid "In the long form, the leading colon `:` is followed by an open parenthesis `(`, a comma-separated list of zero or more \"magic words\", and a close parentheses `)`, and the remainder is the pattern to match against the path."
-msgstr ""
-"Na forma longa, os dois pontos iniciais `:` são seguidos por um parêntese "
-"aberto `(`, uma lista separada por vírgula de zeros ou mais \"palavras "
-"mágicas\" e parênteses próximos `)`, o restante é o padrão para coincidir "
-"contra o caminho."
+msgstr "Na forma longa, os dois pontos iniciais `:` são seguidos por um parêntese aberto `(`, uma lista separada por vírgula de zeros ou mais \"palavras mágicas\" e parênteses próximos `)`, o restante é o padrão para coincidir contra o caminho."
 
 #. type: Plain text
 #: en/glossary-content.txt:353
 #, priority:100
 msgid "A pathspec with only a colon means \"there is no pathspec\". This form should not be combined with other pathspec."
-msgstr ""
-"Um pathspec com apenas dois pontos significa \"não há um pathspec\". Este "
-"formulário não deve ser combinado com um outro pathspec."
+msgstr "Um pathspec com apenas dois pontos significa \"não há um pathspec\". Este formulário não deve ser combinado com um outro pathspec."
 
 #. type: Labeled list
 #: en/glossary-content.txt:355
@@ -70079,12 +60129,7 @@ msgstr "attr"
 #: en/glossary-content.txt:402
 #, priority:100
 msgid "After `attr:` comes a space separated list of \"attribute requirements\", all of which must be met in order for the path to be considered a match; this is in addition to the usual non-magic pathspec pattern matching.  See linkgit:gitattributes[5]."
-msgstr ""
-"Após o `attr:`, vem um espaço separado da lista do \"attribute requirements\""
-" (requisitos dos atributos), todos os quais devem ser atendidos para que o "
-"caminho seja considerado uma correspondência; isso é um acréscimo à "
-"coincidência usual dos padrões do `pathspec`.  Consulte "
-"linkgit:gitattributes[5]."
+msgstr "Após o `attr:`, vem um espaço separado da lista do \"attribute requirements\" (requisitos dos atributos), todos os quais devem ser atendidos para que o caminho seja considerado uma correspondência; isso é um acréscimo à coincidência usual dos padrões do `pathspec`.  Consulte linkgit:gitattributes[5]."
 
 #. type: Plain text
 #: en/glossary-content.txt:405
@@ -70144,10 +60189,7 @@ msgstr "[[def_parent]]parent (pai, origem, matriz)"
 #: en/glossary-content.txt:431
 #, priority:100
 msgid "A <<def_commit_object,commit object>> contains a (possibly empty) list of the logical predecessor(s) in the line of development, i.e. its parents."
-msgstr ""
-"Um <<def_commit_object,objeto commit>> contém uma lista (possivelmente vazia)"
-" dos predecessores lógicos na linha de desenvolvimento, ou seja, as suas "
-"origens."
+msgstr "Um <<def_commit_object,objeto commit>> contém uma lista (possivelmente vazia) dos predecessores lógicos na linha de desenvolvimento, ou seja, as suas origens."
 
 #. type: Labeled list
 #: en/glossary-content.txt:432
@@ -70183,28 +60225,19 @@ msgstr "[[def_porcelain]]porcelain (porcelana)"
 #: en/glossary-content.txt:447
 #, priority:100
 msgid "Cute name for programs and program suites depending on <<def_core_git,core Git>>, presenting a high level access to core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>."
-msgstr ""
-"Nome bonito para programas e conjunto de programas, dependendo do "
-"<<def_core_git,núcleo do Git>>, apresentando um acesso de alto nível ao "
-"núcleo do Git principal. As porcelanas expõem mais uma interface "
-"<<def_SCM,SCM>> do que o <<def_plumbing,plumbing>>."
+msgstr "Nome bonito para programas e conjunto de programas, dependendo do <<def_core_git,núcleo do Git>>, apresentando um acesso de alto nível ao núcleo do Git principal. As porcelanas expõem mais uma interface <<def_SCM,SCM>> do que o <<def_plumbing,plumbing>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:448
 #, no-wrap, priority:100
 msgid "[[def_per_worktree_ref]]per-worktree ref"
-msgstr ""
-"[[def_per_worktree_ref]]per-worktree ref (referência por árvore de trabalho)"
+msgstr "[[def_per_worktree_ref]]per-worktree ref (referência por árvore de trabalho)"
 
 #. type: Plain text
 #: en/glossary-content.txt:453
 #, priority:100
 msgid "Refs that are per-<<def_working_tree,worktree>>, rather than global.  This is presently only <<def_HEAD,HEAD>> and any refs that start with `refs/bisect/`, but might later include other unusual refs."
-msgstr ""
-"As refs que são por-<<def_working_tree,árvore de trabalho>> em vez de "
-"global.  Atualmente isto é apresentado apenas como <<def_HEAD,HEAD>> e "
-"qualquer outra `refs` que inicie com `refs/bisect/`, mas podem "
-"posteriormente, incluir outras `refs` incomuns."
+msgstr "As refs que são por-<<def_working_tree,árvore de trabalho>> em vez de global.  Atualmente isto é apresentado apenas como <<def_HEAD,HEAD>> e qualquer outra `refs` que inicie com `refs/bisect/`, mas podem posteriormente, incluir outras `refs` incomuns."
 
 #. type: Labeled list
 #: en/glossary-content.txt:454
@@ -70216,20 +60249,7 @@ msgstr "[[def_pseudoref]]pseudoref (pseudo referência)"
 #: en/glossary-content.txt:469
 #, priority:100
 msgid "Pseudorefs are a class of files under `$GIT_DIR` which behave like refs for the purposes of rev-parse, but which are treated specially by git.  Pseudorefs both have names that are all-caps, and always start with a line consisting of a <<def_SHA1,SHA-1>> followed by whitespace.  So, HEAD is not a pseudoref, because it is sometimes a symbolic ref.  They might optionally contain some additional data.  `MERGE_HEAD` and `CHERRY_PICK_HEAD` are examples.  Unlike <<def_per_worktree_ref,per-worktree refs>>, these files cannot be symbolic refs, and never have reflogs.  They also cannot be updated through the normal ref update machinery.  Instead, they are updated by directly writing to the files.  However, they can be read as if they were refs, so `git rev-parse MERGE_HEAD` will work."
-msgstr ""
-"`Pseudorefs` são uma classe de arquivos em `$GIT_DIR` que se comporta como "
-"`refs` para fins de análise de revisão, no entanto, são tratados "
-"especialmente pelo git.  Os `pseudorefs` têm nomes com maiúsculas e sempre "
-"começam com uma linha que consiste em <<def_SHA1,SHA-1>>, seguido por um "
-"espaço.  Portanto, `HEAD` não é um `pseudoref` pois às vezes é um `ref` "
-"simbólico.  Opcionalmente eles podem conter alguns dados adicionais.  São "
-"exemplos `MERGE_HEAD` e `CHERRY_PICK_HEAD`.  Ao contrário do "
-"<<def_per_worktree_ref,per-worktree refs>>, estes arquivos não podem ser "
-"`refs` simbólicos e nunca possuem um `reflogs`.  Eles também não podem ser "
-"atualizados através do mecanismo `ref` normal de atualização.  Em vez disso, "
-"eles são atualizados gravando diretamente nos arquivos.  No entanto, eles "
-"podem ser lidos como se fossem `refs`, portanto, `git rev-parse MERGE_HEAD` "
-"funcionará."
+msgstr "`Pseudorefs` são uma classe de arquivos em `$GIT_DIR` que se comporta como `refs` para fins de análise de revisão, no entanto, são tratados especialmente pelo git.  Os `pseudorefs` têm nomes com maiúsculas e sempre começam com uma linha que consiste em <<def_SHA1,SHA-1>>, seguido por um espaço.  Portanto, `HEAD` não é um `pseudoref` pois às vezes é um `ref` simbólico.  Opcionalmente eles podem conter alguns dados adicionais.  São exemplos `MERGE_HEAD` e `CHERRY_PICK_HEAD`.  Ao contrário do <<def_per_worktree_ref,per-worktree refs>>, estes arquivos não podem ser `refs` simbólicos e nunca possuem um `reflogs`.  Eles também não podem ser atualizados através do mecanismo `ref` normal de atualização.  Em vez disso, eles são atualizados gravando diretamente nos arquivos.  No entanto, eles podem ser lidos como se fossem `refs`, portanto, `git rev-parse MERGE_HEAD` funcionará."
 
 #. type: Labeled list
 #: en/glossary-content.txt:470
@@ -70241,32 +60261,19 @@ msgstr "[[def_pull]]pull (captura, puxar, atrair, apertar)"
 #: en/glossary-content.txt:473
 #, priority:100
 msgid "Pulling a <<def_branch,branch>> means to <<def_fetch,fetch>> it and <<def_merge,merge>> it.  See also linkgit:git-pull[1]."
-msgstr ""
-"Captura um <<def_branch,ramo>> significa <<def_fetch,fetch (obter)>> e "
-"<<def_merge,merge (mesclar)>>.  Consulte também linkgit:git-pull[1]."
+msgstr "Captura um <<def_branch,ramo>> significa <<def_fetch,fetch (obter)>> e <<def_merge,merge (mesclar)>>.  Consulte também linkgit:git-pull[1]."
 
 #. type: Labeled list
 #: en/glossary-content.txt:474
 #, no-wrap, priority:100
 msgid "[[def_push]]push"
-msgstr ""
-"[[def_push]]push (impulsionar, impulso, empurrar, apertar, pressionar, "
-"forçar, investida)"
+msgstr "[[def_push]]push (impulsionar, impulso, empurrar, apertar, pressionar, forçar, investida)"
 
 #. type: Plain text
 #: en/glossary-content.txt:485
 #, priority:100
 msgid "Pushing a <<def_branch,branch>> means to get the branch's <<def_head_ref,head ref>> from a remote <<def_repository,repository>>, find out if it is an ancestor to the branch's local head ref, and in that case, putting all objects, which are <<def_reachable,reachable>> from the local head ref, and which are missing from the remote repository, into the remote <<def_object_database,object database>>, and updating the remote head ref. If the remote <<def_head,head>> is not an ancestor to the local head, the push fails."
-msgstr ""
-"Fazer um impulsionamento ao <<def_branch,ramo>> significa pegar a "
-"<<def_head_ref,ref do cabeçalho>> do ramo de um "
-"<<def_repository,repositório>> remoto, descobrir se é um ancestral da ref "
-"(referência) do cabeçalho local e nesse caso, colocar todos os objetos que "
-"são <<def_reachable,acessíveis>> com base na ref do cabeçalho local e que "
-"estão faltando a partir do repositório remoto, para o "
-"<<def_object_database,banco de dados do objeto>> que atualiza a ref do "
-"cabeçalho remoto. Caso o <<def_head,cabeçalho>> não seja um ancestral do "
-"cabeçalho local, o impulsionamento (push) vai falhar."
+msgstr "Fazer um impulsionamento ao <<def_branch,ramo>> significa pegar a <<def_head_ref,ref do cabeçalho>> do ramo de um <<def_repository,repositório>> remoto, descobrir se é um ancestral da ref (referência) do cabeçalho local e nesse caso, colocar todos os objetos que são <<def_reachable,acessíveis>> com base na ref do cabeçalho local e que estão faltando a partir do repositório remoto, para o <<def_object_database,banco de dados do objeto>> que atualiza a ref do cabeçalho remoto. Caso o <<def_head,cabeçalho>> não seja um ancestral do cabeçalho local, o impulsionamento (push) vai falhar."
 
 #. type: Labeled list
 #: en/glossary-content.txt:486
@@ -70278,14 +60285,7 @@ msgstr "[[def_reachable]]reachable (acessível ou alcançável)"
 #: en/glossary-content.txt:495
 #, priority:100
 msgid "All of the ancestors of a given <<def_commit,commit>> are said to be \"reachable\" from that commit. More generally, one <<def_object,object>> is reachable from another if we can reach the one from the other by a <<def_chain,chain>> that follows <<def_tag,tags>> to whatever they tag, <<def_commit_object,commits>> to their parents or trees, and <<def_tree_object,trees>> to the trees or <<def_blob_object,blobs>> that they contain."
-msgstr ""
-"Todos os ancestrais de um determinado <<def_commit,commit>> são considerados "
-"\"reachable\" (ou acessíveis) a partir deste commit. De um modo mais geral, "
-"um <<def_object,objeto>> é acessível a partir do outro se pudermos alcançá-"
-"lo através de um <<def_chain,chain>> seguido de <<def_tag,tags>> para o que "
-"quer que eles marque com uma tag, <<def_commit_object,commits>> para as suas "
-"origens ou árvores, e as <<def_tree_object,árvores>> para as árvores ou as "
-"<<def_blob_object,bolhas>> que os contém."
+msgstr "Todos os ancestrais de um determinado <<def_commit,commit>> são considerados \"reachable\" (ou acessíveis) a partir deste commit. De um modo mais geral, um <<def_object,objeto>> é acessível a partir do outro se pudermos alcançá-lo através de um <<def_chain,chain>> seguido de <<def_tag,tags>> para o que quer que eles marque com uma tag, <<def_commit_object,commits>> para as suas origens ou árvores, e as <<def_tree_object,árvores>> para as árvores ou as <<def_blob_object,bolhas>> que os contém."
 
 #. type: Labeled list
 #: en/glossary-content.txt:496
@@ -70297,10 +60297,7 @@ msgstr "[[def_rebase]]rebase (reconstrução da fundação ou reconstrução)"
 #: en/glossary-content.txt:500
 #, priority:100
 msgid "To reapply a series of changes from a <<def_branch,branch>> to a different base, and reset the <<def_head,head>> of that branch to the result."
-msgstr ""
-"Para reaplicar uma série de alterações de uma <<def_branch,ramo>> para uma "
-"base diferente e redefinir o <<def_head,head>> dessa ramificação para o "
-"resultado."
+msgstr "Para reaplicar uma série de alterações de uma <<def_branch,ramo>> para uma base diferente e redefinir o <<def_head,head>> dessa ramificação para o resultado."
 
 #. type: Labeled list
 #: en/glossary-content.txt:501
@@ -70312,22 +60309,13 @@ msgstr "[[def_ref]]ref (referência)"
 #: en/glossary-content.txt:509
 #, priority:100
 msgid "A name that begins with `refs/` (e.g. `refs/heads/master`)  that points to an <<def_object_name,object name>> or another ref (the latter is called a <<def_symref,symbolic ref>>).  For convenience, a ref can sometimes be abbreviated when used as an argument to a Git command; see linkgit:gitrevisions[7] for details.  Refs are stored in the <<def_repository,repository>>."
-msgstr ""
-"Um nome que comece com `refs/` (por exemplo, `refs/heads/master`) que aponte "
-"para um <<def_object_name,object name>> ou outro ref (o último é chamado de "
-"<<def_symref,ref simbólica>>).  Por conveniência, uma `ref` as vezes pode "
-"ser abreviado quando utilizado como um argumento em um comando Git; Para "
-"mais detalhes consulte linkgit:gitrevisions[7].  As `refs` são armazenadas "
-"no <<def_repository,repositório>>."
+msgstr "Um nome que comece com `refs/` (por exemplo, `refs/heads/master`) que aponte para um <<def_object_name,object name>> ou outro ref (o último é chamado de <<def_symref,ref simbólica>>).  Por conveniência, uma `ref` as vezes pode ser abreviado quando utilizado como um argumento em um comando Git; Para mais detalhes consulte linkgit:gitrevisions[7].  As `refs` são armazenadas no <<def_repository,repositório>>."
 
 #. type: Plain text
 #: en/glossary-content.txt:513
 #, priority:100
 msgid "The ref namespace is hierarchical.  Different subhierarchies are used for different purposes (e.g. the `refs/heads/` hierarchy is used to represent local branches)."
-msgstr ""
-"O espaço de nomes da ref é hierárquico.  Sub-hierarquias diferentes são "
-"utilizadas para diferentes propósitos (por exemplo, a hierarquia `refs/heads/"
-"` é utilizada para representar as ramificações locais)."
+msgstr "O espaço de nomes da ref é hierárquico.  Sub-hierarquias diferentes são utilizadas para diferentes propósitos (por exemplo, a hierarquia `refs/heads/` é utilizada para representar as ramificações locais)."
 
 #. type: Plain text
 #: en/glossary-content.txt:516
@@ -70345,11 +60333,7 @@ msgstr "[[def_reflog]]reflog"
 #: en/glossary-content.txt:522
 #, priority:100
 msgid "A reflog shows the local \"history\" of a ref.  In other words, it can tell you what the 3rd last revision in _this_ repository was, and what was the current state in _this_ repository, yesterday 9:14pm.  See linkgit:git-reflog[1] for details."
-msgstr ""
-"Um `reflog` exibe o \"histórico\" local de uma `ref`.  Em outras palavras, "
-"ele pode informar qual foi a 3ª última revisão _neste_ repositório e qual "
-"era a sua condição atual, ontem às 21:14.  Para mais detalhes consulte o "
-"comando linkgit:git-reflog[1]."
+msgstr "Um `reflog` exibe o \"histórico\" local de uma `ref`.  Em outras palavras, ele pode informar qual foi a 3ª última revisão _neste_ repositório e qual era a sua condição atual, ontem às 21:14.  Para mais detalhes consulte o comando linkgit:git-reflog[1]."
 
 #. type: Labeled list
 #: en/glossary-content.txt:523
@@ -70373,30 +60357,19 @@ msgstr "[[def_remote]]remote repository (repositório remoto)"
 #: en/glossary-content.txt:532
 #, priority:100
 msgid "A <<def_repository,repository>> which is used to track the same project but resides somewhere else. To communicate with remotes, see <<def_fetch,fetch>> or <<def_push,push>>."
-msgstr ""
-"Um <<def_repository,repositório>> que é utilizado para rastrear os mesmo "
-"projeto porém reside em um outro lugar. Para se comunicar com ramos remotos, "
-"consulte <<def_fetch,fetch>> ou <<def_push,push>>."
+msgstr "Um <<def_repository,repositório>> que é utilizado para rastrear os mesmo projeto porém reside em um outro lugar. Para se comunicar com ramos remotos, consulte <<def_fetch,fetch>> ou <<def_push,push>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:533
 #, no-wrap, priority:100
 msgid "[[def_remote_tracking_branch]]remote-tracking branch"
-msgstr ""
-"[[def_remote_tracking_branch]]remote-tracking branch (monitorando os ramos "
-"remotamente)"
+msgstr "[[def_remote_tracking_branch]]remote-tracking branch (monitorando os ramos remotamente)"
 
 #. type: Plain text
 #: en/glossary-content.txt:541
 #, priority:100
 msgid "A <<def_ref,ref>> that is used to follow changes from another <<def_repository,repository>>. It typically looks like 'refs/remotes/foo/bar' (indicating that it tracks a branch named 'bar' in a remote named 'foo'), and matches the right-hand-side of a configured fetch <<def_refspec,refspec>>. A remote-tracking branch should not contain direct modifications or have local commits made to it."
-msgstr ""
-"Um <<def_ref,ref>> que é utilizado para rastrear as modificações de outro "
-"<<def_repository,repositório>>. Normalmente se parece com 'refs/remotes/foo/"
-"bar' (indicando que rastreia um ramo com nome 'bar' e um remoto chamado "
-"'foo'), coincide o lado direito do `fetch` configurado "
-"<<def_refspec,refspec>>. Um ramo monitorado remotamente não deve conter "
-"alterações diretas, tão pouco, ter commits locais."
+msgstr "Um <<def_ref,ref>> que é utilizado para rastrear as modificações de outro <<def_repository,repositório>>. Normalmente se parece com 'refs/remotes/foo/bar' (indicando que rastreia um ramo com nome 'bar' e um remoto chamado 'foo'), coincide o lado direito do `fetch` configurado <<def_refspec,refspec>>. Um ramo monitorado remotamente não deve conter alterações diretas, tão pouco, ter commits locais."
 
 #. type: Labeled list
 #: en/glossary-content.txt:542
@@ -70408,13 +60381,7 @@ msgstr "[[def_repository]]repository (repositório)"
 #: en/glossary-content.txt:549
 #, priority:100
 msgid "A collection of <<def_ref,refs>> together with an <<def_object_database,object database>> containing all objects which are <<def_reachable,reachable>> from the refs, possibly accompanied by meta data from one or more <<def_porcelain,porcelains>>. A repository can share an object database with other repositories via <<def_alternate_object_database,alternates mechanism>>."
-msgstr ""
-"Uma coleção de <<def_ref,refs>> junto com um <<def_object_database,banco de "
-"dados do objeto>> contendo todos os objetos que são "
-"<<def_reachable,acessível>> vindas das `refs`, possivelmente acompanhados "
-"por metadados de um ou mais <<def_porcelain,porcelanas>>. Um repositório "
-"pode compartilhar um banco de dados de objetos com outros repositórios "
-"através de <<def_alternate_object_database,mecanismo alternativo>>."
+msgstr "Uma coleção de <<def_ref,refs>> junto com um <<def_object_database,banco de dados do objeto>> contendo todos os objetos que são <<def_reachable,acessível>> vindas das `refs`, possivelmente acompanhados por metadados de um ou mais <<def_porcelain,porcelanas>>. Um repositório pode compartilhar um banco de dados de objetos com outros repositórios através de <<def_alternate_object_database,mecanismo alternativo>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:550
@@ -70426,9 +60393,7 @@ msgstr "[[def_resolve]]resolve"
 #: en/glossary-content.txt:553
 #, priority:100
 msgid "The action of fixing up manually what a failed automatic <<def_merge,merge>> left behind."
-msgstr ""
-"A ação de corrigir manualmente o que uma falha automática "
-"<<def_merge,mesclagem>> deixou para trás."
+msgstr "A ação de corrigir manualmente o que uma falha automática <<def_merge,mesclagem>> deixou para trás."
 
 #. type: Labeled list
 #: en/glossary-content.txt:554
@@ -70452,9 +60417,7 @@ msgstr "[[def_rewind]]rewind (rebobinar, retroceder)"
 #: en/glossary-content.txt:560
 #, priority:100
 msgid "To throw away part of the development, i.e. to assign the <<def_head,head>> to an earlier <<def_revision,revision>>."
-msgstr ""
-"Para jogar fora parte do desenvolvimento, ou seja, atribuir "
-"<<def_head,head>> a um <<def_revision,revisão>> anterior."
+msgstr "Para jogar fora parte do desenvolvimento, ou seja, atribuir <<def_head,head>> a um <<def_revision,revisão>> anterior."
 
 #. type: Labeled list
 #: en/glossary-content.txt:561
@@ -70502,16 +60465,7 @@ msgstr "[[def_shallow_repository]]shallow repository (repositório raso)"
 #: en/glossary-content.txt:583
 #, priority:100
 msgid "A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the upstream is much larger. A shallow repository is created by giving the `--depth` option to linkgit:git-clone[1], and its history can be later deepened with linkgit:git-fetch[1]."
-msgstr ""
-"Um <<def_repository,repositório>> repositório raso possui um histórico "
-"incompleto da quais <<def_commit,commits>> possui <<def_parent,parents>> dos "
-"quais cauterizam (em outras palavras, o Git é informado para fingir que "
-"estes commits não possuam origens, ainda que esteja cadastrados no "
-"<<def_commit_object,objeto commit>>). Algumas vezes é útil quando você está "
-"interessado apenas no histórico recente de um projeto, ainda que o histórico "
-"real registrado no \"upstream\" seja muito maior. Um repositório raso é "
-"criado, ao usar a opção `--depth` para linkgit:git-clone[1] e o seu "
-"histórico pode ser aprofundado posteriormente com linkgit:git-fetch[1]."
+msgstr "Um <<def_repository,repositório>> repositório raso possui um histórico incompleto da quais <<def_commit,commits>> possui <<def_parent,parents>> dos quais cauterizam (em outras palavras, o Git é informado para fingir que estes commits não possuam origens, ainda que esteja cadastrados no <<def_commit_object,objeto commit>>). Algumas vezes é útil quando você está interessado apenas no histórico recente de um projeto, ainda que o histórico real registrado no \"upstream\" seja muito maior. Um repositório raso é criado, ao usar a opção `--depth` para linkgit:git-clone[1] e o seu histórico pode ser aprofundado posteriormente com linkgit:git-fetch[1]."
 
 #. type: Labeled list
 #: en/glossary-content.txt:584
@@ -70523,10 +60477,7 @@ msgstr "[[def_stash]]stash entry (lançamento para estocagem)"
 #: en/glossary-content.txt:587
 #, priority:100
 msgid "An <<def_object,object>> used to temporarily store the contents of a <<def_dirty,dirty>> working directory and the index for future reuse."
-msgstr ""
-"Um <<def_object,objeto>> é utilizado para armazenar temporariamente o "
-"conteúdo de um diretório de trabalho <<def_dirty,sujo>> e o seu índice para "
-"utilização futura."
+msgstr "Um <<def_object,objeto>> é utilizado para armazenar temporariamente o conteúdo de um diretório de trabalho <<def_dirty,sujo>> e o seu índice para utilização futura."
 
 #. type: Labeled list
 #: en/glossary-content.txt:588
@@ -70538,10 +60489,7 @@ msgstr "[[def_submodule]]submodule (submódulo)"
 #: en/glossary-content.txt:592
 #, priority:100
 msgid "A <<def_repository,repository>> that holds the history of a separate project inside another repository (the latter of which is called <<def_superproject, superproject>>)."
-msgstr ""
-"Um <<def_repository,repositório>> retém o histórico de um projeto separado "
-"dentro de um outro repositório (o último na qual é chamado de "
-"<<def_superproject, superproject>>)."
+msgstr "Um <<def_repository,repositório>> retém o histórico de um projeto separado dentro de um outro repositório (o último na qual é chamado de <<def_superproject, superproject>>)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:593
@@ -70553,12 +60501,7 @@ msgstr "[[def_superproject]]superproject (superprojeto)"
 #: en/glossary-content.txt:598
 #, priority:100
 msgid "A <<def_repository,repository>> that references repositories of other projects in its working tree as <<def_submodule,submodules>>.  The superproject knows about the names of (but does not hold copies of) commit objects of the contained submodules."
-msgstr ""
-"Um <<def_repository,repositório>> se refere a repositórios de outros "
-"projetos em suas próprias árvores de trabalho como "
-"<<def_submodule,submódulo>>.  O superprojeto conhece os nomes dos (mas não "
-"mantém cópias de nenhum deles) commits dos objetos que contenham os "
-"submódulos."
+msgstr "Um <<def_repository,repositório>> se refere a repositórios de outros projetos em suas próprias árvores de trabalho como <<def_submodule,submódulo>>.  O superprojeto conhece os nomes dos (mas não mantém cópias de nenhum deles) commits dos objetos que contenham os submódulos."
 
 #. type: Labeled list
 #: en/glossary-content.txt:599
@@ -70582,15 +60525,7 @@ msgstr "[[def_tag]]tag (etiqueta)"
 #: en/glossary-content.txt:616
 #, priority:100
 msgid "A <<def_ref,ref>> under `refs/tags/` namespace that points to an object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>).  In contrast to a <<def_head,head>>, a tag is not updated by the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>."
-msgstr ""
-"Um <<def_ref,ref>> sob `refs/tags/` no espaço de nomes que aponte para um "
-"objeto arbitrário (em geral uma tag que aponta seja para "
-"<<def_tag_object,tag>> ou um <<def_commit_object,objeto commit>>).  Em "
-"contraste de um <<def_head,head>>, a tag não é atualizada pelo comando "
-"`commit`. Uma tag Git não tem nada a ver com uma tag `Lisp` (que seria "
-"chamada de <<def_object_type,object type>> dentro do contexto do Git). Uma "
-"tag é normalmente utilizada para marcar um ponto específico na "
-"ancestralidade de um commit <<def_chain,chain>>."
+msgstr "Um <<def_ref,ref>> sob `refs/tags/` no espaço de nomes que aponte para um objeto arbitrário (em geral uma tag que aponta seja para <<def_tag_object,tag>> ou um <<def_commit_object,objeto commit>>).  Em contraste de um <<def_head,head>>, a tag não é atualizada pelo comando `commit`. Uma tag Git não tem nada a ver com uma tag `Lisp` (que seria chamada de <<def_object_type,object type>> dentro do contexto do Git). Uma tag é normalmente utilizada para marcar um ponto específico na ancestralidade de um commit <<def_chain,chain>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:617
@@ -70602,11 +60537,7 @@ msgstr "[[def_tag_object]]objeto tag (objeto etiqueta, objeto da etiqueta)"
 #: en/glossary-content.txt:622
 #, priority:100
 msgid "An <<def_object,object>> containing a <<def_ref,ref>> pointing to another object, which can contain a message just like a <<def_commit_object,commit object>>. It can also contain a (PGP)  signature, in which case it is called a \"signed tag object\"."
-msgstr ""
-"Um <<def_object,objeto>> contendo um <<def_ref,ref>> apontando para outro "
-"objeto que pode conter uma mensagem como um <<def_commit_object,objeto "
-"commit>>. Também pode conter uma assinatura (PGP); nesse caso, é chamado de "
-"\"signed tag object\"."
+msgstr "Um <<def_object,objeto>> contendo um <<def_ref,ref>> apontando para outro objeto que pode conter uma mensagem como um <<def_commit_object,objeto commit>>. Também pode conter uma assinatura (PGP); nesse caso, é chamado de \"signed tag object\"."
 
 #. type: Labeled list
 #: en/glossary-content.txt:623
@@ -70618,12 +60549,7 @@ msgstr "[[def_topic_branch]]topic branch (tópico do ramo)"
 #: en/glossary-content.txt:629
 #, priority:100
 msgid "A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet related changes."
-msgstr ""
-"Um Git comum <<def_branch,ramo>> que é utilizado por um desenvolvedor para "
-"identificar uma linha conceitual de desenvolvimento. Como as ramificações "
-"são muito fáceis e baratas, muitas vezes é desejável ter várias ramificações "
-"pequenas, cada uma contendo conceitos muito bem definidos ou pequenas "
-"alterações incrementais, porém relacionadas."
+msgstr "Um Git comum <<def_branch,ramo>> que é utilizado por um desenvolvedor para identificar uma linha conceitual de desenvolvimento. Como as ramificações são muito fáceis e baratas, muitas vezes é desejável ter várias ramificações pequenas, cada uma contendo conceitos muito bem definidos ou pequenas alterações incrementais, porém relacionadas."
 
 #. type: Labeled list
 #: en/glossary-content.txt:630
@@ -70635,11 +60561,7 @@ msgstr "[[def_tree]]tree (árvore)"
 #: en/glossary-content.txt:634
 #, priority:100
 msgid "Either a <<def_working_tree,working tree>>, or a <<def_tree_object,tree object>> together with the dependent <<def_blob_object,blob>> and tree objects (i.e. a stored representation of a working tree)."
-msgstr ""
-"Entre um <<def_working_tree,árvore de trabalho>> ou um "
-"<<def_tree_object,objeto árvore>> junto com os objetos dependentes "
-"<<def_blob_object,blob>> e os objetos das árvores (uma representação de uma "
-"árvore de trabalho)."
+msgstr "Entre um <<def_working_tree,árvore de trabalho>> ou um <<def_tree_object,objeto árvore>> junto com os objetos dependentes <<def_blob_object,blob>> e os objetos das árvores (uma representação de uma árvore de trabalho)."
 
 #. type: Labeled list
 #: en/glossary-content.txt:635
@@ -70651,10 +60573,7 @@ msgstr "[[def_tree_object]]tree object (objeto árvore)"
 #: en/glossary-content.txt:639
 #, priority:100
 msgid "An <<def_object,object>> containing a list of file names and modes along with refs to the associated blob and/or tree objects. A <<def_tree,tree>> is equivalent to a <<def_directory,directory>>."
-msgstr ""
-"Um <<def_object,objeto>> contendo uma lista de nomes e modos em conjunto com "
-"`refs` associados as sua gotas e ou objetos da árvore. Um <<def_tree,tree>> "
-"é equivalente a um <<def_directory,diretório>>."
+msgstr "Um <<def_object,objeto>> contendo uma lista de nomes e modos em conjunto com `refs` associados as sua gotas e ou objetos da árvore. Um <<def_tree,tree>> é equivalente a um <<def_directory,diretório>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:640
@@ -70666,15 +60585,7 @@ msgstr "[[def_tree-ish]]tree-ish (também treeish)"
 #: en/glossary-content.txt:653
 #, priority:100
 msgid "A <<def_tree_object,tree object>> or an <<def_object,object>> that can be recursively dereferenced to a tree object.  Dereferencing a <<def_commit_object,commit object>> yields the tree object corresponding to the <<def_revision,revision>>'s top <<def_directory,directory>>.  The following are all tree-ishes: a <<def_commit-ish,commit-ish>>, a tree object, a <<def_tag_object,tag object>> that points to a tree object, a tag object that points to a tag object that points to a tree object, etc."
-msgstr ""
-"Um <<def_tree_object,objeto árvore>> ou um <<def_object,objeto>> que pode "
-"perder uma referência recursivamente em um objeto da árvore.  Perder um "
-"<<def_commit_object,objeto commit>> retorna o objeto da árvore "
-"<<def_revision,revisão>> correspondente ao topo "
-"<<def_directory,diretório>>.  São todos os tree-ishes: um <<def_commit-ish"
-",commit-ish>>, um objeto da árvore, um <<def_tag_object,objeto tag>> que "
-"aponta para o objeto da árvore, um objeto tag que aponta para o objeto tag "
-"que aponta para o objeto árvore, etc."
+msgstr "Um <<def_tree_object,objeto árvore>> ou um <<def_object,objeto>> que pode perder uma referência recursivamente em um objeto da árvore.  Perder um <<def_commit_object,objeto commit>> retorna o objeto da árvore <<def_revision,revisão>> correspondente ao topo <<def_directory,diretório>>.  São todos os tree-ishes: um <<def_commit-ish,commit-ish>>, um objeto da árvore, um <<def_tag_object,objeto tag>> que aponta para o objeto da árvore, um objeto tag que aponta para o objeto tag que aponta para o objeto árvore, etc."
 
 #. type: Labeled list
 #: en/glossary-content.txt:654
@@ -70686,9 +60597,7 @@ msgstr "[[def_unmerged_index]]unmerged index (índices não mesclados)"
 #: en/glossary-content.txt:657
 #, priority:100
 msgid "An <<def_index,index>> which contains unmerged <<def_index_entry,index entries>>."
-msgstr ""
-"Um <<def_index,índice>> que contenha índices não mesclados "
-"<<def_index_entry,entradas do índice>>."
+msgstr "Um <<def_index,índice>> que contenha índices não mesclados <<def_index_entry,entradas do índice>>."
 
 #. type: Labeled list
 #: en/glossary-content.txt:658
@@ -70700,9 +60609,7 @@ msgstr "[[def_unreachable_object]]unreachable object (objetos inacessíveis)"
 #: en/glossary-content.txt:661
 #, priority:100
 msgid "An <<def_object,object>> which is not <<def_reachable,reachable>> from a <<def_branch,branch>>, <<def_tag,tag>>, or any other reference."
-msgstr ""
-"Um <<def_object,objeto>> que não é <<def_reachable,acessível>> de um "
-"<<def_branch,ramo>>, <<def_tag,tag>>, ou de qualquer outra referência."
+msgstr "Um <<def_object,objeto>> que não é <<def_reachable,acessível>> de um <<def_branch,ramo>>, <<def_tag,tag>>, ou de qualquer outra referência."
 
 #. type: Labeled list
 #: en/glossary-content.txt:662
@@ -70714,12 +60621,7 @@ msgstr "[[def_upstream_branch]]upstream branch (ramo upstream)"
 #: en/glossary-content.txt:667
 #, priority:100
 msgid "The default <<def_branch,branch>> that is merged into the branch in question (or the branch in question is rebased onto). It is configured via branch.<name>.remote and branch.<name>.merge. If the upstream branch of 'A' is 'origin/B' sometimes we say \"'A' is tracking 'origin/B'\"."
-msgstr ""
-"É predefinido que o <<def_branch,ramo>> que seja mesclado na árvore em "
-"questão (ou no ramo onde uma reconstrução (rebase) seja feita). É "
-"configurado através do `branch.<nome>.remote` e `branch.<nome>.merge`. Caso "
-"o ramo \"upstream\" de 'A' seja 'origin/B' algumas vezes nós dizemos que \""
-"'A' está monitorando 'origin/B'\"."
+msgstr "É predefinido que o <<def_branch,ramo>> que seja mesclado na árvore em questão (ou no ramo onde uma reconstrução (rebase) seja feita). É configurado através do `branch.<nome>.remote` e `branch.<nome>.merge`. Caso o ramo \"upstream\" de 'A' seja 'origin/B' algumas vezes nós dizemos que \"'A' está monitorando 'origin/B'\"."
 
 #. type: Labeled list
 #: en/glossary-content.txt:668
@@ -70731,10 +60633,7 @@ msgstr "[[def_working_tree]]working tree (árvore de trabalho)"
 #: en/glossary-content.txt:671
 #, priority:100
 msgid "The tree of actual checked out files.  The working tree normally contains the contents of the <<def_HEAD,HEAD>> commit's tree, plus any local changes that you have made but not yet committed."
-msgstr ""
-"A árvore dos arquivos atualmente averiguados.  A árvore de trabalho "
-"normalmente contém o conteúdo <<def_HEAD,HEAD>> do commit da árvore, além de "
-"quaisquer alterações locais que você fizer, mas ainda o commit não foi feito."
+msgstr "A árvore dos arquivos atualmente averiguados.  A árvore de trabalho normalmente contém o conteúdo <<def_HEAD,HEAD>> do commit da árvore, além de quaisquer alterações locais que você fizer, mas ainda o commit não foi feito."
 
 #. type: Plain text
 #: en/i18n.txt:2
@@ -70798,12 +60697,7 @@ msgstr "Os objetos commit que foram criados com a configuração acima registram
 #: en/i18n.txt:58
 #, priority:280
 msgid "'git log', 'git show', 'git blame' and friends look at the `encoding` header of a commit object, and try to re-code the log message into UTF-8 unless otherwise specified.  You can specify the desired output encoding with `i18n.logOutputEncoding` in `.git/config` file, like this:"
-msgstr ""
-"Os comandos 'git log', 'git show', 'git blame' e relacionados fazem vista "
-"para o cabeçalho `encoding` de um objeto commit e tentam codificar novamente "
-"a mensagem do registro log em UTF-8 a menos que seja definido de outra "
-"maneira.  É possível especificar a codificação da saída desejada com  a "
-"variável `i18n.logOutputEncoding` no arquivo `.git/config`, assim:"
+msgstr "Os comandos 'git log', 'git show', 'git blame' e relacionados fazem vista para o cabeçalho `encoding` de um objeto commit e tentam codificar novamente a mensagem do registro log em UTF-8 a menos que seja definido de outra maneira.  É possível especificar a codificação da saída desejada com  a variável `i18n.logOutputEncoding` no arquivo `.git/config`, assim:"
 
 #. type: delimited block -
 #: en/i18n.txt:62
@@ -70843,9 +60737,7 @@ msgstr "número"
 #: en/line-range-format.txt:7
 #, priority:260
 msgid "If <start> or <end> is a number, it specifies an absolute line number (lines count from 1)."
-msgstr ""
-"Caso <inicio> ou <fim> seja um número, ele especifica um número de linha "
-"absoluto (as linhas contam a partir do 1)."
+msgstr "Caso <inicio> ou <fim> seja um número, ele especifica um número de linha absoluto (as linhas contam a partir do 1)."
 
 #. type: Plain text
 #: en/line-range-format.txt:10
@@ -70857,13 +60749,7 @@ msgstr "/regex/"
 #: en/line-range-format.txt:17
 #, priority:260
 msgid "This form will use the first line matching the given POSIX regex. If <start> is a regex, it will search from the end of the previous `-L` range, if any, otherwise from the start of file.  If <start> is ``^/regex/'', it will search from the start of file.  If <end> is a regex, it will search starting at the line given by <start>."
-msgstr ""
-"Este formulário usará a primeira linha correspondente ao regex POSIX "
-"informado. Caso <inicio> seja um regex, ele procurará no final do `L` do "
-"intervalo, se houver, caso contrário, desde o início do arquivo.  Caso "
-"<inicio> seja ``^/regex/'', ele pesquisará desde o início do arquivo.  Caso "
-"`<fim>` seja um regex, ele pesquisará a partir da linha fornecida através do "
-"`<inicio>`."
+msgstr "Este formulário usará a primeira linha correspondente ao regex POSIX informado. Caso <inicio> seja um regex, ele procurará no final do `L` do intervalo, se houver, caso contrário, desde o início do arquivo.  Caso <inicio> seja ``^/regex/'', ele pesquisará desde o início do arquivo.  Caso `<fim>` seja um regex, ele pesquisará a partir da linha fornecida através do `<inicio>`."
 
 #. type: Plain text
 #: en/line-range-format.txt:20
@@ -70875,21 +60761,13 @@ msgstr "+offset ou -offset"
 #: en/line-range-format.txt:23
 #, priority:260
 msgid "This is only valid for <end> and will specify a number of lines before or after the line given by <start>."
-msgstr ""
-"Válido apenas para `<fim>` que definirá uma quantidade de linhas antes ou "
-"depois da linha utilizada por `<inicio>`."
+msgstr "Válido apenas para `<fim>` que definirá uma quantidade de linhas antes ou depois da linha utilizada por `<inicio>`."
 
 #. type: Plain text
 #: en/line-range-format.txt:30
 #, priority:260
 msgid "If ``:<funcname>'' is given in place of <start> and <end>, it is a regular expression that denotes the range from the first funcname line that matches <funcname>, up to the next funcname line. ``:<funcname>'' searches from the end of the previous `-L` range, if any, otherwise from the start of file. ``^:<funcname>'' searches from the start of file."
-msgstr ""
-"Caso ``:<funcname>'' seja informado no lugar de <inicio> e <fim>, é uma "
-"expressão regular que indica o intervalo da primeira \"funcname\" que "
-"coincide com <funcname> até a próxima linha \"funcname\". ``:<funcname>'' "
-"pesquisa no final do intervalo `L` anterior, se houver, caso contrário, a "
-"pesquisa ocorrerá desde o início do arquivo. ``^:<funcname>'' pesquisa desde "
-"o início do arquivo."
+msgstr "Caso ``:<funcname>'' seja informado no lugar de <inicio> e <fim>, é uma expressão regular que indica o intervalo da primeira \"funcname\" que coincide com <funcname> até a próxima linha \"funcname\". ``:<funcname>'' pesquisa no final do intervalo `L` anterior, se houver, caso contrário, a pesquisa ocorrerá desde o início do arquivo. ``^:<funcname>'' pesquisa desde o início do arquivo."
 
 #. type: Plain text
 #: en/mailmap.txt:6
@@ -70901,10 +60779,7 @@ msgstr "Caso o arquivo `.mailmap` exista no topo do repositório ou no local apo
 #: en/mailmap.txt:10
 #, priority:260
 msgid "In the simple form, each line in the file consists of the canonical real name of an author, whitespace, and an email address used in the commit (enclosed by '<' and '>') to map to the name. For example:"
-msgstr ""
-"No formato simples, cada linha do arquivo consiste no nome real de um autor, "
-"espaço e um endereço de email utilizado no commit (delimitado por '<' and "
-"'>') mapeando para o nome. Por exemplo:"
+msgstr "No formato simples, cada linha do arquivo consiste no nome real de um autor, espaço e um endereço de email utilizado no commit (delimitado por '<' and '>') mapeando para o nome. Por exemplo:"
 
 #. type: Plain text
 #: en/mailmap.txt:12
@@ -70940,9 +60815,7 @@ msgstr "\tNome Próprio <proper@email.xx> <commit@email.xx>\n"
 #: en/mailmap.txt:24
 #, priority:260
 msgid "which allows mailmap to replace both the name and the email of a commit matching the specified commit email address, and:"
-msgstr ""
-"o que permite que o mailmap substitua ambos os nomes e o email de um commit "
-"correspondente ao endereço de email do commit especificado, e:"
+msgstr "o que permite que o mailmap substitua ambos os nomes e o email de um commit correspondente ao endereço de email do commit especificado, e:"
 
 #. type: Plain text
 #: en/mailmap.txt:26
@@ -71056,59 +60929,37 @@ msgstr "Utilize o sinal de jogo da velha '#' para comentários que estejam em su
 #: en/merge-options.txt:5
 #, priority:240
 msgid "Perform the merge and commit the result. This option can be used to override --no-commit."
-msgstr ""
-"Execute a mesclagem e faça o commit com o resultado. Esta opção pode ser "
-"usada para substituir a opção `--no-commit`."
+msgstr "Execute a mesclagem e faça o commit com o resultado. Esta opção pode ser usada para substituir a opção `--no-commit`."
 
 #. type: Plain text
 #: en/merge-options.txt:9
 #, priority:240
 msgid "With --no-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing."
-msgstr ""
-"Com a opção `--no-commit`, executa a mesclagem e para imediatamente antes de "
-"criar a mesclagem de um commit, para dar ao usuário a chance de inspecionar "
-"e ajustar ainda mais o resultado da mesclagem antes de fazer o commit."
+msgstr "Com a opção `--no-commit`, executa a mesclagem e para imediatamente antes de criar a mesclagem de um commit, para dar ao usuário a chance de inspecionar e ajustar ainda mais o resultado da mesclagem antes de fazer o commit."
 
 #. type: Plain text
 #: en/merge-options.txt:14
 #, priority:240
 msgid "Note that fast-forward updates do not create a merge commit and therefore there is no way to stop those merges with --no-commit.  Thus, if you want to ensure your branch is not changed or updated by the merge command, use --no-ff with --no-commit."
-msgstr ""
-"Observe que as atualizações com avanço rápido não criam a mesclagem de um "
-"commit e portanto, não há como interromper essas mesclagens com a opção "
-"`--no-commit`.  Portanto, caso queira garantir que o seu ramo não seja "
-"alterado ou atualizado pelo comando mesclar, utilize --no-ff with --no-"
-"commit."
+msgstr "Observe que as atualizações com avanço rápido não criam a mesclagem de um commit e portanto, não há como interromper essas mesclagens com a opção `--no-commit`.  Portanto, caso queira garantir que o seu ramo não seja alterado ou atualizado pelo comando mesclar, utilize --no-ff with --no-commit."
 
 #. type: Plain text
 #: en/merge-options.txt:23
 #, priority:240
 msgid "Invoke an editor before committing successful mechanical merge to further edit the auto-generated merge message, so that the user can explain and justify the merge. The `--no-edit` option can be used to accept the auto-generated message (this is generally discouraged)."
-msgstr ""
-"Chame um editor antes de fazer a mesclagem mecânica de um commit bem "
-"sucedido para editar ainda mais a mensagem da mesclagem que foi gerada "
-"automaticamente, para que o usuário possa explicar e justificar a mesclagem. "
-"A opção `--no-edit` pode ser utilizada para aceitar a mensagem que foi "
-"gerada automaticamente (em geral isso é desencorajado)."
+msgstr "Chame um editor antes de fazer a mesclagem mecânica de um commit bem sucedido para editar ainda mais a mensagem da mesclagem que foi gerada automaticamente, para que o usuário possa explicar e justificar a mesclagem. A opção `--no-edit` pode ser utilizada para aceitar a mensagem que foi gerada automaticamente (em geral isso é desencorajado)."
 
 #. type: Plain text
 #: en/merge-options.txt:27
 #, priority:240
 msgid "The `--edit` (or `-e`) option is still useful if you are giving a draft message with the `-m` option from the command line and want to edit it in the editor."
-msgstr ""
-"A opção `--edit` (ou `-e`) ainda é útil caso esteja enviando uma mensagem de "
-"rascunho com a opção `-m` na linha de comando e queira editá-la no editor."
+msgstr "A opção `--edit` (ou `-e`) ainda é útil caso esteja enviando uma mensagem de rascunho com a opção `-m` na linha de comando e queira editá-la no editor."
 
 #. type: Plain text
 #: en/merge-options.txt:34
 #, priority:240
 msgid "Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message. They will see an editor opened when they run `git merge`. To make it easier to adjust such scripts to the updated behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` at the beginning of them."
-msgstr ""
-"Os scripts mais antigos podem depender do comportamento histórico de não "
-"permitir que o usuário edite a mensagem do registro log da mesclagem. Eles "
-"verão um editor aberto quando executar o `git merge`. Para facilitar o "
-"ajuste destes scripts para o comportamento que foi atualizado, a variável de "
-"ambiente `GIT_MERGE_AUTOEDIT` pode ser definido como `no` no início deles."
+msgstr "Os scripts mais antigos podem depender do comportamento histórico de não permitir que o usuário edite a mensagem do registro log da mesclagem. Eles verão um editor aberto quando executar o `git merge`. Para facilitar o ajuste destes scripts para o comportamento que foi atualizado, a variável de ambiente `GIT_MERGE_AUTOEDIT` pode ser definido como `no` no início deles."
 
 #. type: Plain text
 #: en/merge-options.txt:41
@@ -71126,68 +60977,43 @@ msgstr "--ff-only"
 #: en/merge-options.txt:50
 #, priority:240
 msgid "Specifies how a merge is handled when the merged-in history is already a descendant of the current history.  `--ff` is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the `refs/tags/` hierarchy, in which case `--no-ff` is assumed."
-msgstr ""
-"Especifica como uma mesclagem é manipulada quando o histórico mesclado já é "
-"um descendente do histórico atual.  A predefinição é a opção `--ff` , a "
-"menos que durante a mesclagem de uma tag anotada (e possivelmente assinada) "
-"que não seja armazenada em seu local natural na hierarquia `refs/tags/`, no "
-"caso onde a opção `--ff` não será assumida."
+msgstr "Especifica como uma mesclagem é manipulada quando o histórico mesclado já é um descendente do histórico atual.  A predefinição é a opção `--ff` , a menos que durante a mesclagem de uma tag anotada (e possivelmente assinada) que não seja armazenada em seu local natural na hierarquia `refs/tags/`, no caso onde a opção `--ff` não será assumida."
 
 #. type: Plain text
 #: en/merge-options.txt:55
 #, priority:240
 msgid "With `--ff`, when possible resolve the merge as a fast-forward (only update the branch pointer to match the merged branch; do not create a merge commit).  When not possible (when the merged-in history is not a descendant of the current history), create a merge commit."
-msgstr ""
-"Com `--ff`, quando for possível, resolva a mesclagem como um avanço rápido ("
-"atualize apenas o ponteiro do ramo para coincidir com a ramificação que foi "
-"mesclada; não crie um commit da mesclagem).  Quando não for possível (quando "
-"o histórico mesclado não for um descendente do histórico atual), crie um "
-"commit da mesclagem."
+msgstr "Com `--ff`, quando for possível, resolva a mesclagem como um avanço rápido (atualize apenas o ponteiro do ramo para coincidir com a ramificação que foi mesclada; não crie um commit da mesclagem).  Quando não for possível (quando o histórico mesclado não for um descendente do histórico atual), crie um commit da mesclagem."
 
 #. type: Plain text
 #: en/merge-options.txt:58
 #, priority:240
 msgid "With `--no-ff`, create a merge commit in all cases, even when the merge could instead be resolved as a fast-forward."
-msgstr ""
-"Com `--no-ff`, crie um commit da mesclagem em todos os casos, mesmo quando a "
-"mesclagem puder ser resolvida como um avanço rápido."
+msgstr "Com `--no-ff`, crie um commit da mesclagem em todos os casos, mesmo quando a mesclagem puder ser resolvida como um avanço rápido."
 
 #. type: Plain text
 #: en/merge-options.txt:61
 #, priority:240
 msgid "With `--ff-only`, resolve the merge as a fast-forward when possible.  When not possible, refuse to merge and exit with a non-zero status."
-msgstr ""
-"Com a opção `--ff-only`, quando for possível, resolva a mesclagem com avanço "
-"rápido.  Quando não for possível, recuse a mesclagem e encerre com uma "
-"condição diferente de zero."
+msgstr "Com a opção `--ff-only`, quando for possível, resolva a mesclagem com avanço rápido.  Quando não for possível, recuse a mesclagem e encerre com uma condição diferente de zero."
 
 #. type: Plain text
 #: en/merge-options.txt:70
 #, priority:240
 msgid "GPG-sign the resulting merge commit. The `keyid` argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space. `--no-gpg-sign` is useful to countermand both `commit.gpgSign` configuration variable, and earlier `--gpg-sign`."
-msgstr ""
-"Assine a mesclagem resultante do commit com o GPG. O argumento `keyid` é "
-"opcional e a predefinição retorna para a identidade de quem fez o commit; se "
-"utilizado, deve estar anexado a opção sem espaço. A opção `--no-gpg-sign` é "
-"útil para revogar a variável de configuração `commit.gpgSign` e a anterior "
-"`--gpg-sign`."
+msgstr "Assine a mesclagem resultante do commit com o GPG. O argumento `keyid` é opcional e a predefinição retorna para a identidade de quem fez o commit; se utilizado, deve estar anexado a opção sem espaço. A opção `--no-gpg-sign` é útil para revogar a variável de configuração `commit.gpgSign` e a anterior `--gpg-sign`."
 
 #. type: Plain text
 #: en/merge-options.txt:76
 #, priority:240
 msgid "In addition to branch names, populate the log message with one-line descriptions from at most <n> actual commits that are being merged. See also linkgit:git-fmt-merge-msg[1]."
-msgstr ""
-"Além dos nomes dos ramos, preencha a mensagem do registro log com descrições "
-"de uma linha com no máximo <n> commits atuais que estão sendo mesclados. "
-"Consulte também linkgit:git-fmt-merge-msg[1]."
+msgstr "Além dos nomes dos ramos, preencha a mensagem do registro log com descrições de uma linha com no máximo <n> commits atuais que estão sendo mesclados. Consulte também linkgit:git-fmt-merge-msg[1]."
 
 #. type: Plain text
 #: en/merge-options.txt:79
 #, priority:240
 msgid "With --no-log do not list one-line descriptions from the actual commits being merged."
-msgstr ""
-"Com '--no-log', não liste as descrições de uma linha vindas do commits que "
-"estão atualmente sendo mescladas."
+msgstr "Com '--no-log', não liste as descrições de uma linha vindas do commits que estão atualmente sendo mescladas."
 
 #. type: Labeled list
 #: en/merge-options.txt:81
@@ -71205,9 +61031,7 @@ msgstr "A opção `--no-signoff` não adiciona a linha de assinatura \"Signed-of
 #: en/merge-options.txt:96
 #, priority:240
 msgid "Show a diffstat at the end of the merge. The diffstat is also controlled by the configuration option merge.stat."
-msgstr ""
-"Exiba um \"diffstat\" no final da mesclagem. O 'diffstat' também é "
-"controlado pela opção da configuração merge.stat."
+msgstr "Exiba um \"diffstat\" no final da mesclagem. O 'diffstat' também é controlado pela opção da configuração merge.stat."
 
 #. type: Plain text
 #: en/merge-options.txt:99
@@ -71231,28 +61055,19 @@ msgstr "--no-squash"
 #: en/merge-options.txt:109
 #, priority:240
 msgid "Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the `HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` command to create a merge commit).  This allows you to create a single commit on top of the current branch whose effect is the same as merging another branch (or more in case of an octopus)."
-msgstr ""
-"Produza a árvore de trabalho e a condição do índice como se uma mesclagem "
-"real tivesse acontecido (exceto as informações da mesclagem), porém não "
-"efetue um commit, mova o `HEAD` ou registre o `$GIT_DIR/MERGE_HEAD` (para "
-"causar o próximo comando `git commit` para criar uma mesclagem).  Isso "
-"permite que você crie um único commit sobre o ramo atual, cujo efeito é o "
-"mesmo que mesclar um outro ramo (ou mais no caso da mesclagem \"octopus\")."
+msgstr "Produza a árvore de trabalho e a condição do índice como se uma mesclagem real tivesse acontecido (exceto as informações da mesclagem), porém não efetue um commit, mova o `HEAD` ou registre o `$GIT_DIR/MERGE_HEAD` (para causar o próximo comando `git commit` para criar uma mesclagem).  Isso permite que você crie um único commit sobre o ramo atual, cujo efeito é o mesmo que mesclar um outro ramo (ou mais no caso da mesclagem \"octopus\")."
 
 #. type: Plain text
 #: en/merge-options.txt:112
 #, priority:240
 msgid "With --no-squash perform the merge and commit the result. This option can be used to override --squash."
-msgstr ""
-"Com a opção `--no-squash`, execute a mesclagem e faça o commit com o "
-"resultado. Esta opção pode ser usada para substituir a opção `--squash`."
+msgstr "Com a opção `--no-squash`, execute a mesclagem e faça o commit com o resultado. Esta opção pode ser usada para substituir a opção `--squash`."
 
 #. type: Plain text
 #: en/merge-options.txt:114
 #, priority:240
 msgid "With --squash, --commit is not allowed, and will fail."
-msgstr ""
-"Com a opção `--squash`, a opção `--commit` não é permitida e irá falhar."
+msgstr "Com a opção `--squash`, a opção `--commit` não é permitida e irá falhar."
 
 #. type: Plain text
 #: en/merge-options.txt:118
@@ -71264,12 +61079,7 @@ msgstr "Esta opção ignora os ganchos dos commits anteriores e os ganchos das m
 #: en/merge-options.txt:126
 #, priority:240
 msgid "Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried.  If there is no `-s` option, a built-in list of strategies is used instead ('git merge-recursive' when merging a single head, 'git merge-octopus' otherwise)."
-msgstr ""
-"Use a estratégia de mesclagem informada; podem ser utilizado mais de uma vez "
-"para defini-los na ordem em que devem ser tentados.  Caso não haja a opção "
-"`-s`, em vez disso será usada uma lista de estratégias incorporada ('git "
-"merge-recursive' ao mesclar um único cabeçalho, caso contrário 'git merge "
-"octopus')."
+msgstr "Use a estratégia de mesclagem informada; podem ser utilizado mais de uma vez para defini-los na ordem em que devem ser tentados.  Caso não haja a opção `-s`, em vez disso será usada uma lista de estratégias incorporada ('git merge-recursive' ao mesclar um único cabeçalho, caso contrário 'git merge octopus')."
 
 #. type: Labeled list
 #: en/merge-options.txt:127
@@ -71281,8 +61091,7 @@ msgstr "-X <opção>"
 #: en/merge-options.txt:131
 #, priority:240
 msgid "Pass merge strategy specific option through to the merge strategy."
-msgstr ""
-"Passe a opção específica da estratégia através da estratégia de mesclagem."
+msgstr "Passe a opção específica da estratégia através da estratégia de mesclagem."
 
 #. type: Labeled list
 #: en/merge-options.txt:132
@@ -71300,12 +61109,7 @@ msgstr "--no-verify-signatures"
 #: en/merge-options.txt:139
 #, priority:240
 msgid "Verify that the tip commit of the side branch being merged is signed with a valid key, i.e. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key.  If the tip commit of the side branch is not signed with a valid key, the merge is aborted."
-msgstr ""
-"Verifique se o topo do commit do lado do ramo mesclado está assinado com uma "
-"chave válida, ou seja, uma chave que possua um uid válida: no modelo de "
-"confiança predefinido, isso significa que a chave da assinatura foi assinada "
-"através de uma chave confiável.  Caso o topo do commit do lado do ramo não "
-"seja assinada com uma chave válida, a mesclagem será cancelada."
+msgstr "Verifique se o topo do commit do lado do ramo mesclado está assinado com uma chave válida, ou seja, uma chave que possua um uid válida: no modelo de confiança predefinido, isso significa que a chave da assinatura foi assinada através de uma chave confiável.  Caso o topo do commit do lado do ramo não seja assinada com uma chave válida, a mesclagem será cancelada."
 
 #. type: Labeled list
 #: en/merge-options.txt:141
@@ -71317,9 +61121,7 @@ msgstr "--no-summary"
 #: en/merge-options.txt:144
 #, priority:240
 msgid "Synonyms to --stat and --no-stat; these are deprecated and will be removed in the future."
-msgstr ""
-"É um sinônimos para `--stat` e `--no-stat`; estas opções foram "
-"descontinuadas e serão removidas no futuro."
+msgstr "É um sinônimos para `--stat` e `--no-stat`; estas opções foram descontinuadas e serão removidas no futuro."
 
 #. type: Plain text
 #: en/merge-options.txt:149
@@ -71331,11 +61133,7 @@ msgstr "Opere em silêncio. Implica no uso da opção `--no-progress`."
 #: en/merge-options.txt:160
 #, priority:240
 msgid "Turn progress on/off explicitly. If neither is specified, progress is shown if standard error is connected to a terminal.  Note that not all merge strategies may support progress reporting."
-msgstr ""
-"Ativa/desativa o progresso de maneira explicita. Se nenhum seja definido, o "
-"progresso será exibido caso o erro predefinido esteja conectado a um "
-"terminal.  Observe que nem todas as estratégias de mesclagem podem se "
-"compatíveis com os relatórios de progresso."
+msgstr "Ativa/desativa o progresso de maneira explicita. Se nenhum seja definido, o progresso será exibido caso o erro predefinido esteja conectado a um terminal.  Observe que nem todas as estratégias de mesclagem podem se compatíveis com os relatórios de progresso."
 
 #. type: Plain text
 #: en/merge-options.txt:170
@@ -71353,13 +61151,7 @@ msgstr "--allow-unrelated-histories"
 #: en/merge-options.txt:177
 #, priority:240
 msgid "By default, `git merge` command refuses to merge histories that do not share a common ancestor.  This option can be used to override this safety when merging histories of two projects that started their lives independently. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added."
-msgstr ""
-"É predefinido que o comando `git merge` se recuse a mesclar os históricos "
-"que não compartilham de um ancestral comum.  Esta opção pode ser utilizada "
-"para substituir esta segurança durante a mesclagem dos históricos dos dois "
-"projetos que iniciaram as suas vidas de forma independente. Como esta é uma "
-"ocasião muito rara, não existe variável de configuração para ativar isso de "
-"forma predefinida e não será adicionada."
+msgstr "É predefinido que o comando `git merge` se recuse a mesclar os históricos que não compartilham de um ancestral comum.  Esta opção pode ser utilizada para substituir esta segurança durante a mesclagem dos históricos dos dois projetos que iniciaram as suas vidas de forma independente. Como esta é uma ocasião muito rara, não existe variável de configuração para ativar isso de forma predefinida e não será adicionada."
 
 #. type: Title -
 #: en/merge-strategies.txt:2
@@ -71371,12 +61163,7 @@ msgstr "ESTRATÉGIAS DE MESCLAGEM"
 #: en/merge-strategies.txt:8
 #, priority:240
 msgid "The merge mechanism (`git merge` and `git pull` commands) allows the backend 'merge strategies' to be chosen with `-s` option.  Some strategies can also take their own options, which can be passed by giving `-X<option>` arguments to `git merge` and/or `git pull`."
-msgstr ""
-"O mecanismo da mesclagem (comandos `git merge` e `git pull`) permite que as "
-"estruturas das 'estratégias de mesclagem' sejam escolhidas com a opção `-s`"
-".  Algumas estratégias também podem ter suas próprias opções, que podem ser "
-"passadas usando `-X<opção>` como argumentos para o comando `git merge` e/ou `"
-"git pull`."
+msgstr "O mecanismo da mesclagem (comandos `git merge` e `git pull`) permite que as estruturas das 'estratégias de mesclagem' sejam escolhidas com a opção `-s`.  Algumas estratégias também podem ter suas próprias opções, que podem ser passadas usando `-X<opção>` como argumentos para o comando `git merge` e/ou `git pull`."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:9
@@ -71388,11 +61175,7 @@ msgstr "resolve"
 #: en/merge-strategies.txt:15
 #, priority:240
 msgid "This can only resolve two heads (i.e. the current branch and another branch you pulled from) using a 3-way merge algorithm.  It tries to carefully detect criss-cross merge ambiguities and is considered generally safe and fast."
-msgstr ""
-"Isso só pode resultar em dois cabeçalhos (ou seja, a ramificação atual e uma "
-"outra ramificada da que você obteve) utilizando um algoritmo de mesclagem de "
-"três vias.  Ele tenta detectar cuidadosamente as ambiguidades cruzadas da "
-"mesclagem e geralmente é considerado seguro e rápido."
+msgstr "Isso só pode resultar em dois cabeçalhos (ou seja, a ramificação atual e uma outra ramificada da que você obteve) utilizando um algoritmo de mesclagem de três vias.  Ele tenta detectar cuidadosamente as ambiguidades cruzadas da mesclagem e geralmente é considerado seguro e rápido."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:16
@@ -71404,17 +61187,7 @@ msgstr "recursive"
 #: en/merge-strategies.txt:29
 #, priority:240
 msgid "This can only resolve two heads using a 3-way merge algorithm.  When there is more than one common ancestor that can be used for 3-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3-way merge.  This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history.  Additionally this can detect and handle merges involving renames, but currently cannot make use of detected copies.  This is the default merge strategy when pulling or merging one branch."
-msgstr ""
-"Isso pode resolver apenas duas cabeças usando o algoritmo da mesclagem de 3 "
-"vias.  Quando há mais de um ancestral comum que pode ser usado para a "
-"mesclagem de 3 vias, ele cria uma árvore mesclada dos ancestrais comuns e o "
-"usa como a árvore de referência para a mesclagem de 3 vias.  Foi informado "
-"que isso resulta em menos conflitos durante mesclagem sem causar distorções "
-"pelos testes feitos nas mesclagens reais dos commits, retiradas do histórico "
-"de desenvolvimento do Linux kernel 2.6.  Além disso, isso pode detectar e "
-"manipular as mesclagens envolvendo renomeações, porém atualmente não pode "
-"fazer uso das cópias detectadas.  Essa é a estratégia de mesclagem "
-"predefinida ao extrair ou mesclar um ramo."
+msgstr "Isso pode resolver apenas duas cabeças usando o algoritmo da mesclagem de 3 vias.  Quando há mais de um ancestral comum que pode ser usado para a mesclagem de 3 vias, ele cria uma árvore mesclada dos ancestrais comuns e o usa como a árvore de referência para a mesclagem de 3 vias.  Foi informado que isso resulta em menos conflitos durante mesclagem sem causar distorções pelos testes feitos nas mesclagens reais dos commits, retiradas do histórico de desenvolvimento do Linux kernel 2.6.  Além disso, isso pode detectar e manipular as mesclagens envolvendo renomeações, porém atualmente não pode fazer uso das cópias detectadas.  Essa é a estratégia de mesclagem predefinida ao extrair ou mesclar um ramo."
 
 #. type: Plain text
 #: en/merge-strategies.txt:31
@@ -71432,22 +61205,13 @@ msgstr "ours"
 #: en/merge-strategies.txt:37
 #, priority:240
 msgid "This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version.  Changes from the other tree that do not conflict with our side are reflected in the merge result.  For a binary file, the entire contents are taken from our side."
-msgstr ""
-"Esta opção impõem que os pedaços conflitantes que sejam resolvidos de forma "
-"automática e de maneira limpa, favorecendo a 'nossa' versão.  As alterações "
-"vindos de outra árvore que não conflitam com o nosso lado são refletidas no "
-"resultado da mesclagem.  Para um arquivo binário, todo o conteúdo é retirado "
-"do nosso lado."
+msgstr "Esta opção impõem que os pedaços conflitantes que sejam resolvidos de forma automática e de maneira limpa, favorecendo a 'nossa' versão.  As alterações vindos de outra árvore que não conflitam com o nosso lado são refletidas no resultado da mesclagem.  Para um arquivo binário, todo o conteúdo é retirado do nosso lado."
 
 #. type: Plain text
 #: en/merge-strategies.txt:41
 #, priority:240
 msgid "This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all.  It discards everything the other tree did, declaring 'our' history contains all that happened in it."
-msgstr ""
-"Isso não deve ser confundido com a estratégia da 'nossa' de mesclagem, que "
-"sequer olha para o que a outra árvore contém.  Descarta tudo o que a outra "
-"árvore fez, declarando que o 'nosso' histórico contém tudo o que aconteceu "
-"nela."
+msgstr "Isso não deve ser confundido com a estratégia da 'nossa' de mesclagem, que sequer olha para o que a outra árvore contém.  Descarta tudo o que a outra árvore fez, declarando que o 'nosso' histórico contém tudo o que aconteceu nela."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:42
@@ -71459,10 +61223,7 @@ msgstr "theirs"
 #: en/merge-strategies.txt:45
 #, priority:240
 msgid "This is the opposite of 'ours'; note that, unlike 'ours', there is no 'theirs' merge strategy to confuse this merge option with."
-msgstr ""
-"Este é o oposto do 'nosso'; observe que, diferentemente do 'nosso', não "
-"existe uma estratégia de mesclagem 'deles' para confundir esta opção de "
-"mesclagem."
+msgstr "Este é o oposto do 'nosso'; observe que, diferentemente do 'nosso', não existe uma estratégia de mesclagem 'deles' para confundir esta opção de mesclagem."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:46
@@ -71474,12 +61235,7 @@ msgstr "patience"
 #: en/merge-strategies.txt:52
 #, priority:240
 msgid "With this option, 'merge-recursive' spends a little extra time to avoid mismerges that sometimes occur due to unimportant matching lines (e.g., braces from distinct functions).  Use this when the branches to be merged have diverged wildly.  See also linkgit:git-diff[1] `--patience`."
-msgstr ""
-"Com esta opção, 'merge-recursive' gasta um pouco de tempo extra para evitar "
-"as distorções que às vezes ocorrem devido as coincidência das linhas sem "
-"importância (como, por exemplo, chaves das funções distintas).  Use isso "
-"quando os ramos que serão mesclados divergirem bastante.  Consulte também "
-"linkgit:git-diff[1] `--patience`."
+msgstr "Com esta opção, 'merge-recursive' gasta um pouco de tempo extra para evitar as distorções que às vezes ocorrem devido as coincidência das linhas sem importância (como, por exemplo, chaves das funções distintas).  Use isso quando os ramos que serão mesclados divergirem bastante.  Consulte também linkgit:git-diff[1] `--patience`."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:53
@@ -71491,11 +61247,7 @@ msgstr "diff-algorithm=[patience|minimal|histogram|myers]"
 #: en/merge-strategies.txt:58
 #, priority:240
 msgid "Tells 'merge-recursive' to use a different diff algorithm, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions).  See also linkgit:git-diff[1] `--diff-algorithm`."
-msgstr ""
-"Informa ao 'merge-recursive' para usar um algoritmo diff diferente, que pode "
-"ajudar a evitar as distorções que ocorrem devido as linhas coincidentes sem "
-"importância (como chaves das funções distintas).  Consulte também linkgit"
-":git-diff[1] `--diff-algorithm`."
+msgstr "Informa ao 'merge-recursive' para usar um algoritmo diff diferente, que pode ajudar a evitar as distorções que ocorrem devido as linhas coincidentes sem importância (como chaves das funções distintas).  Consulte também linkgit:git-diff[1] `--diff-algorithm`."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:62
@@ -71507,28 +61259,19 @@ msgstr "ignore-cr-at-eol"
 #: en/merge-strategies.txt:68
 #, priority:240
 msgid "Treats lines with the indicated type of whitespace change as unchanged for the sake of a three-way merge.  Whitespace changes mixed with other changes to a line are not ignored.  See also linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, and `--ignore-cr-at-eol`."
-msgstr ""
-"Trata as linhas com o tipo indicado da mudança do espaço como inalterado por "
-"uma mesclagem de três vias.  As alterações de espaço combinadas com outras "
-"alterações em uma linha não são ignoradas.  Consulte também linkgit:git-"
-"diff[1] `-b`, `-w`, `--ignore-space-at-eol`, e `--ignore-cr-at-eol`."
+msgstr "Trata as linhas com o tipo indicado da mudança do espaço como inalterado por uma mesclagem de três vias.  As alterações de espaço combinadas com outras alterações em uma linha não são ignoradas.  Consulte também linkgit:git-diff[1] `-b`, `-w`, `--ignore-space-at-eol`, e `--ignore-cr-at-eol`."
 
 #. type: Plain text
 #: en/merge-strategies.txt:71
 #, priority:240
 msgid "If 'their' version only introduces whitespace changes to a line, 'our' version is used;"
-msgstr ""
-"Caso a versão 'their' (dele) introduzir apenas as alterações de espaço em "
-"uma linha, a 'our' (nossa) versão será utilizada;"
+msgstr "Caso a versão 'their' (dele) introduzir apenas as alterações de espaço em uma linha, a 'our' (nossa) versão será utilizada;"
 
 #. type: Plain text
 #: en/merge-strategies.txt:73
 #, priority:240
 msgid "If 'our' version introduces whitespace changes but 'their' version includes a substantial change, 'their' version is used;"
-msgstr ""
-"Caso a 'our' (nossa) versão introduzir alterações nos espaços, porém a "
-"versão 'their' (dele) incluir uma alteração substancial, a versão 'their' "
-"(dele) será utilizada;"
+msgstr "Caso a 'our' (nossa) versão introduzir alterações nos espaços, porém a versão 'their' (dele) incluir uma alteração substancial, a versão 'their' (dele) será utilizada;"
 
 #. type: Plain text
 #: en/merge-strategies.txt:74
@@ -71546,13 +61289,7 @@ msgstr "renormalize"
 #: en/merge-strategies.txt:82
 #, priority:240
 msgid "This runs a virtual check-out and check-in of all three stages of a file when resolving a three-way merge.  This option is meant to be used when merging branches with different clean filters or end-of-line normalization rules.  See \"Merging branches with differing checkin/checkout attributes\" in linkgit:gitattributes[5] for details."
-msgstr ""
-"Executa uma averiguação e um check-in virtual de três estágios em um arquivo "
-"ao resolver uma mesclagem de três vias.  Esta opção deve ser utilizada ao "
-"mesclar os ramos com diferentes filtros que estejam limpos ou as regras "
-"normais para a quebra de linha.  Para obter mais detalhes, consulte "
-"\"Mesclando ramificações com diferentes atributos de check-in/check-out\" em "
-"linkgit:gitattributes[5]."
+msgstr "Executa uma averiguação e um check-in virtual de três estágios em um arquivo ao resolver uma mesclagem de três vias.  Esta opção deve ser utilizada ao mesclar os ramos com diferentes filtros que estejam limpos ou as regras normais para a quebra de linha.  Para obter mais detalhes, consulte \"Mesclando ramificações com diferentes atributos de check-in/check-out\" em linkgit:gitattributes[5]."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:83
@@ -71564,9 +61301,7 @@ msgstr "no-renormalize"
 #: en/merge-strategies.txt:86
 #, priority:240
 msgid "Disables the `renormalize` option.  This overrides the `merge.renormalize` configuration variable."
-msgstr ""
-"Desativa a opção `renormalize`.  Substitui a variável de configuração `merge."
-"renormalize`."
+msgstr "Desativa a opção `renormalize`.  Substitui a variável de configuração `merge.renormalize`."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:87
@@ -71614,12 +61349,7 @@ msgstr "subtree[=<caminho>]"
 #: en/merge-strategies.txt:107
 #, priority:240
 msgid "This option is a more advanced form of 'subtree' strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging.  Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match."
-msgstr ""
-"Essa opção é uma forma mais avançada da estratégia da 'subárvore', onde a "
-"estratégia adivinha como as duas árvores devem ser deslocadas para "
-"coincidirem uma com a outra durante a mesclagem.  Em vez disso, o caminho "
-"definido é prefixado (ou removido desde o início) para criar a forma das "
-"duas árvores que serão coincididas."
+msgstr "Essa opção é uma forma mais avançada da estratégia da 'subárvore', onde a estratégia adivinha como as duas árvores devem ser deslocadas para coincidirem uma com a outra durante a mesclagem.  Em vez disso, o caminho definido é prefixado (ou removido desde o início) para criar a forma das duas árvores que serão coincididas."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:108
@@ -71631,24 +61361,13 @@ msgstr "octopus"
 #: en/merge-strategies.txt:114
 #, priority:240
 msgid "This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution.  It is primarily meant to be used for bundling topic branch heads together.  This is the default merge strategy when pulling or merging more than one branch."
-msgstr ""
-"Isso resolve os casos com mais de dois cabeçalhos, porém se recusa a fazer "
-"uma mesclagem complexa que precise de uma resolução manual.  Destina-se "
-"primeiramente para ser usado para agrupar junto o tópico dos cabeçalhos.  "
-"Esra é a estratégia de mesclagem predefinida durante a extração ou a "
-"mesclagem com mais de um ramo."
+msgstr "Isso resolve os casos com mais de dois cabeçalhos, porém se recusa a fazer uma mesclagem complexa que precise de uma resolução manual.  Destina-se primeiramente para ser usado para agrupar junto o tópico dos cabeçalhos.  Esra é a estratégia de mesclagem predefinida durante a extração ou a mesclagem com mais de um ramo."
 
 #. type: Plain text
 #: en/merge-strategies.txt:122
 #, priority:240
 msgid "This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches.  It is meant to be used to supersede old development history of side branches.  Note that this is different from the -Xours option to the 'recursive' merge strategy."
-msgstr ""
-"Isso resolve qualquer quantidade dos cabeçalhos, porém a árvore resultante "
-"da mesclagem é sempre a do cabeçalho atual do ramo, ignorando efetivamente "
-"todas as alterações de todas os outros ramos.  Ele deve ser usado para "
-"substituir o histórico antigo de desenvolvimento das ramificações laterais.  "
-"Observe que isso é diferente da opção `-Xours` da estratégia de mesclagem "
-"'recursiva'."
+msgstr "Isso resolve qualquer quantidade dos cabeçalhos, porém a árvore resultante da mesclagem é sempre a do cabeçalho atual do ramo, ignorando efetivamente todas as alterações de todas os outros ramos.  Ele deve ser usado para substituir o histórico antigo de desenvolvimento das ramificações laterais.  Observe que isso é diferente da opção `-Xours` da estratégia de mesclagem 'recursiva'."
 
 #. type: Labeled list
 #: en/merge-strategies.txt:123
@@ -71660,25 +61379,13 @@ msgstr "subtree"
 #: en/merge-strategies.txt:129
 #, priority:240
 msgid "This is a modified recursive strategy. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level. This adjustment is also done to the common ancestor tree."
-msgstr ""
-"Esta é uma estratégia recursiva modificada. Ao mesclar as árvores 'A' e 'B', "
-"caso 'B' corresponda a uma subárvore de 'A', o 'B' será ajustado primeiro "
-"para coincidir à estrutura da árvore 'A', em vez de ler as árvores no mesmo "
-"nível. Esse ajuste também é feito na árvore ancestral comum."
+msgstr "Esta é uma estratégia recursiva modificada. Ao mesclar as árvores 'A' e 'B', caso 'B' corresponda a uma subárvore de 'A', o 'B' será ajustado primeiro para coincidir à estrutura da árvore 'A', em vez de ler as árvores no mesmo nível. Esse ajuste também é feito na árvore ancestral comum."
 
 #. type: Plain text
 #: en/merge-strategies.txt:136
 #, priority:240
 msgid "With the strategies that use 3-way merge (including the default, 'recursive'), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing.  It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits.  The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead."
-msgstr ""
-"Com as estratégias que usma a mesclagem de 3 vias (incluindo a predefinição, "
-"'recursive'), caso uma alteração seja feita em ambas as ramificações, porém "
-"depois revertida em uma das ramificações, essa alteração estará presente no "
-"resultado mesclado; algumas pessoas acham este comportamento confuso.  Isso "
-"ocorre porque apenas os cabeçalhos e a base da mesclagem são consideradas ao "
-"fazer uma mesclagem, e não os commits individuais.  Portanto, o algoritmo da "
-"mesclagem considera a alteração revertida como nenhuma alteração e substitui "
-"a versão alterada."
+msgstr "Com as estratégias que usma a mesclagem de 3 vias (incluindo a predefinição, 'recursive'), caso uma alteração seja feita em ambas as ramificações, porém depois revertida em uma das ramificações, essa alteração estará presente no resultado mesclado; algumas pessoas acham este comportamento confuso.  Isso ocorre porque apenas os cabeçalhos e a base da mesclagem são consideradas ao fazer uma mesclagem, e não os commits individuais.  Portanto, o algoritmo da mesclagem considera a alteração revertida como nenhuma alteração e substitui a versão alterada."
 
 #. type: Plain text
 #: en/mergetools-merge.txt:2
@@ -72006,10 +61713,7 @@ msgstr "'mboxrd'"
 #: en/pretty-formats.txt:91
 #, priority:260
 msgid "Like 'email', but lines in the commit message starting with \"From \" (preceded by zero or more \">\") are quoted with \">\" so they aren't confused as starting a new commit."
-msgstr ""
-"Como 'e-mail', porém as linhas no commit da mensagem iniciando com \"From\" ("
-"precedidas por zero ou mais \">\") são citadas com \">\" para que não sejam "
-"confundidas ao iniciar um novo commit."
+msgstr "Como 'e-mail', porém as linhas no commit da mensagem iniciando com \"From\" (precedidas por zero ou mais \">\") são citadas com \">\" para que não sejam confundidas ao iniciar um novo commit."
 
 #. type: Plain text
 #: en/pretty-formats.txt:93
@@ -72033,11 +61737,7 @@ msgstr "'format:<texto>'"
 #: en/pretty-formats.txt:110
 #, priority:260
 msgid "The 'format:<string>' format allows you to specify which information you want to show. It works a little bit like printf format, with the notable exception that you get a newline with '%n' instead of '\\n'."
-msgstr ""
-"O formato 'format:<texto>' permite especificar quais as informações que você "
-"deseja exibir. Funciona um pouco como o formato \"printf\" com a exceção "
-"notável de que você obtém uma nova linha com '%n' em vez de '\\n"
-"'."
+msgstr "O formato 'format:<texto>' permite especificar quais as informações que você deseja exibir. Funciona um pouco como o formato \"printf\" com a exceção notável de que você obtém uma nova linha com '%n' em vez de '\\n'."
 
 #. type: Plain text
 #: en/pretty-formats.txt:113
@@ -72269,9 +61969,7 @@ msgstr "semelhante a '%>(<N>)', '%>|(<N>)'"
 #: en/pretty-formats.txt:166
 #, priority:260
 msgid "respectively, except that if the next placeholder takes more spaces than given and there are spaces on its left, use those spaces"
-msgstr ""
-"respectivamente, exceto caso o próximo espaço reservado ocupe mais espaços "
-"do que o informado e haja espaços à esquerda, utilize estes espaços"
+msgstr "respectivamente, exceto caso o próximo espaço reservado ocupe mais espaços do que o informado e haja espaços à esquerda, utilize estes espaços"
 
 #. type: Labeled list
 #: en/pretty-formats.txt:166
@@ -72430,7 +62128,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr "parte local do e-mail do autor (a parte antes do sinal '@')"
@@ -72591,6 +62289,13 @@ msgstr "e-mail de quem fez o commit (respeitando .mailmap, consulte"
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, fuzzy, priority:260
+#| msgid "author email local-part (the part before the '@' sign)"
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr "parte local do e-mail do autor (a parte antes do sinal '@')"
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -72599,8 +62304,9 @@ msgstr "'%cL'"
 
 #. type: Plain text
 #: en/pretty-formats.txt:201
-#, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+#, fuzzy, priority:260
+#| msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr "parte local do autor (consulte '%cl') respeitando .mailmap, consulte"
 
 #. type: Labeled list
@@ -73009,89 +62715,49 @@ msgstr "'key=<K>': exibe apenas os caracteres de resposta com as chaves que fore
 #: en/pretty-formats.txt:270
 #, priority:260
 msgid "'only[=val]': select whether non-trailer lines from the trailer block should be included. The `only` keyword may optionally be followed by an equal sign and one of `true`, `on`, `yes` to omit or `false`, `off`, `no` to show the non-trailer lines. If option is given without value it is enabled. If given multiple times the last value is used."
-msgstr ""
-"'only[=val]': seleciona se o atributo das linhas dos caracteres de resposta "
-"devem ser incluídos. A palavra-chave `only` pode opcionalmente ser seguido "
-"por um sinal de igual e uma das opções `true`, `on`, `yes` para omitir ou "
-"`false`, `off`, `no` para exibir as linhas que não sejam caracteres de "
-"resposta. Caso a opção seja usada sem qualquer valor, ela será ativada. Caso "
-"seja usado várias vezes, apenas o último valor será considerado."
+msgstr "'only[=val]': seleciona se o atributo das linhas dos caracteres de resposta devem ser incluídos. A palavra-chave `only` pode opcionalmente ser seguido por um sinal de igual e uma das opções `true`, `on`, `yes` para omitir ou `false`, `off`, `no` para exibir as linhas que não sejam caracteres de resposta. Caso a opção seja usada sem qualquer valor, ela será ativada. Caso seja usado várias vezes, apenas o último valor será considerado."
 
 #. type: Plain text
 #: en/pretty-formats.txt:279
 #, priority:260
 msgid "'separator=<SEP>': specify a separator inserted between trailer lines. When this option is not given each trailer line is terminated with a line feed character. The string SEP may contain the literal formatting codes described above. To use comma as separator one must use `%x2C` as it would otherwise be parsed as next option. If separator option is given multiple times only the last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )` shows all trailer lines whose key is \"Ticket\" separated by a comma and a space."
-msgstr ""
-"'separator=<SEP>': defina um separador inserido entre as linhas dos "
-"caracteres de resposta. Quando esta opção não é utilizada, cada linha do "
-"caractere de resposta é finalizada com um caractere de avanço da linha. A "
-"sequência SEP poderá conter os códigos de formatação literal descritos "
-"acima. Para usar uma vírgula como separador, é necessário utilizar `%x2C`, "
-"pois caso contrário, seria analisado como fosse uma próxima opção. Caso a "
-"opção separadora seja utilizada várias vezes, apenas a última será levada em "
-"consideração. Como por exemplo, `%(trailers:key=Ticket,separator=%x2C )` "
-"mostra todas as linhas do caractere de resposta cuja chave é \"Ticket\" "
-"separada por vírgula e espaço."
+msgstr "'separator=<SEP>': defina um separador inserido entre as linhas dos caracteres de resposta. Quando esta opção não é utilizada, cada linha do caractere de resposta é finalizada com um caractere de avanço da linha. A sequência SEP poderá conter os códigos de formatação literal descritos acima. Para usar uma vírgula como separador, é necessário utilizar `%x2C`, pois caso contrário, seria analisado como fosse uma próxima opção. Caso a opção separadora seja utilizada várias vezes, apenas a última será levada em consideração. Como por exemplo, `%(trailers:key=Ticket,separator=%x2C )` mostra todas as linhas do caractere de resposta cuja chave é \"Ticket\" separada por vírgula e espaço."
 
 #. type: Plain text
 #: en/pretty-formats.txt:283
 #, priority:260
 msgid "'unfold[=val]': make it behave as if interpret-trailer's `--unfold` option was given. In same way as to for `only` it can be followed by an equal sign and explicit value. E.g., `%(trailers:only,unfold=true)` unfolds and shows all trailer lines."
-msgstr ""
-"'unfold[=val]': faça com que se comporte como se a opção do interpretador do "
-"caractere de resposta da opção `--unfold` tenha sido utilizada. Da mesma "
-"maneira que `only`, .que pode ser seguido através de um sinal de igual ou "
-"valores explícitos. Como por exemplo, `%(trailers:only,unfold=true)` revela "
-"e exibe todas as linhas dos caracteres de resposta."
+msgstr "'unfold[=val]': faça com que se comporte como se a opção do interpretador do caractere de resposta da opção `--unfold` tenha sido utilizada. Da mesma maneira que `only`, .que pode ser seguido através de um sinal de igual ou valores explícitos. Como por exemplo, `%(trailers:only,unfold=true)` revela e exibe todas as linhas dos caracteres de resposta."
 
 #. type: Plain text
 #: en/pretty-formats.txt:285
 #, priority:260
 msgid "'valueonly[=val]': skip over the key part of the trailer line and only show the value part. Also this optionally allows explicit value."
-msgstr ""
-"'valueonly[=val]': ignore a parte principal da linha caractere de resposta e "
-"exiba apenas a parte do valor. Além disso, isto também permite que o valor "
-"seja explícito de maneira opcional."
+msgstr "'valueonly[=val]': ignore a parte principal da linha caractere de resposta e exiba apenas a parte do valor. Além disso, isto também permite que o valor seja explícito de maneira opcional."
 
 #. type: Plain text
 #: en/pretty-formats.txt:292
 #, priority:260
 msgid "Some placeholders may depend on other options given to the revision traversal engine. For example, the `%g*` reflog options will insert an empty string unless we are traversing reflog entries (e.g., by `git log -g`). The `%d` and `%D` placeholders will use the \"short\" decoration format if `--decorate` was not already provided on the command line."
-msgstr ""
-"Alguns espaços reservados podem depender das outras opções passadas para o "
-"motor percorrer a revisão. Por exemplo o opção `%g*` do reflog insere um "
-"espaço vazio a menos que estejamos percorrendo as entradas do reflog ("
-"exemplo, através do comando `git log -g`). Os espaços reservados `%d` e `%D` "
-"usarão o formato de decoração \"curta\" caso a opção `--decorate` já não "
-"esteja sendo utilizada na linha de comando."
+msgstr "Alguns espaços reservados podem depender das outras opções passadas para o motor percorrer a revisão. Por exemplo o opção `%g*` do reflog insere um espaço vazio a menos que estejamos percorrendo as entradas do reflog (exemplo, através do comando `git log -g`). Os espaços reservados `%d` e `%D` usarão o formato de decoração \"curta\" caso a opção `--decorate` já não esteja sendo utilizada na linha de comando."
 
 #. type: Plain text
 #: en/pretty-formats.txt:296
 #, priority:260
 msgid "If you add a `+` (plus sign) after '%' of a placeholder, a line-feed is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
-msgstr ""
-"Caso adicionemos um `+` (sinal de adição) após o '%' de um espaço reservado, "
-"um feed de linha será inserido imediatamente antes da expansão, se e somente "
-"se o espaço reservado se expandir para uma sequência de caracteres não vazio."
+msgstr "Caso adicionemos um `+` (sinal de adição) após o '%' de um espaço reservado, um feed de linha será inserido imediatamente antes da expansão, se e somente se o espaço reservado se expandir para uma sequência de caracteres não vazio."
 
 #. type: Plain text
 #: en/pretty-formats.txt:300
 #, priority:260
 msgid "If you add a `-` (minus sign) after '%' of a placeholder, all consecutive line-feeds immediately preceding the expansion are deleted if and only if the placeholder expands to an empty string."
-msgstr ""
-"Caso adicione um `-` (sinal de menos) após o '%' de um espaço reservado, "
-"imediatamente todos os feeds consecutivos das linhas anteriores à expansão "
-"serão excluídos caso e somente caso o espaço reservado se expanda para um "
-"texto vazio."
+msgstr "Caso adicione um `-` (sinal de menos) após o '%' de um espaço reservado, imediatamente todos os feeds consecutivos das linhas anteriores à expansão serão excluídos caso e somente caso o espaço reservado se expanda para um texto vazio."
 
 #. type: Plain text
 #: en/pretty-formats.txt:304
 #, priority:260
 msgid "If you add a ` ` (space) after '%' of a placeholder, a space is inserted immediately before the expansion if and only if the placeholder expands to a non-empty string."
-msgstr ""
-"Caso adicionemos um ` ` (espaço) após o '%' de um espaço reservado, um "
-"espaço será inserido imediatamente antes da expansão, se e somente se o "
-"espaço reservado se expandir para uma sequência de caracteres não vazios."
+msgstr "Caso adicionemos um ` ` (espaço) após o '%' de um espaço reservado, um espaço será inserido imediatamente antes da expansão, se e somente se o espaço reservado se expandir para uma sequência de caracteres não vazios."
 
 #. type: Plain text
 #: en/pretty-formats.txt:306
@@ -73137,10 +62803,7 @@ msgstr ""
 #: en/pretty-formats.txt:330
 #, priority:260
 msgid "In addition, any unrecognized string that has a `%` in it is interpreted as if it has `tformat:` in front of it.  For example, these two are equivalent:"
-msgstr ""
-"Além disso, qualquer string não reconhecida que tenha um `%` nela, é "
-"interpretada como se tivesse `tformat:` na frente.  Como por exemplo, estes "
-"dois são equivalentes:"
+msgstr "Além disso, qualquer string não reconhecida que tenha um `%` nela, é interpretada como se tivesse `tformat:` na frente.  Como por exemplo, estes dois são equivalentes:"
 
 #. type: delimited block -
 #: en/pretty-formats.txt:334
@@ -73162,22 +62825,13 @@ msgstr "--pretty[=<formato>]"
 #: en/pretty-options.txt:10
 #, priority:260
 msgid "Pretty-print the contents of the commit logs in a given format, where '<format>' can be one of 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>' and 'tformat:<string>'.  When '<format>' is none of the above, and has '%placeholder' in it, it acts as if '--pretty=tformat:<format>' were given."
-msgstr ""
-"Faça uma impressão bonita do conteúdo do registro log do commit em "
-"determinado formato, onde '<formato>' pode ser `oneline`, `short`, `medium`, "
-"`full`, `fuller`, `reference`, `email`, `raw`, `format:<texto>` e "
-"`tformat:<texto>`.  Quando '<formato>' não for nenhum dos itens acima e "
-"possua um `%placeholder`, ele age como se a opção `--pretty=tformat:"
-"<formato>' tenha sido utilizado."
+msgstr "Faça uma impressão bonita do conteúdo do registro log do commit em determinado formato, onde '<formato>' pode ser `oneline`, `short`, `medium`, `full`, `fuller`, `reference`, `email`, `raw`, `format:<texto>` e `tformat:<texto>`.  Quando '<formato>' não for nenhum dos itens acima e possua um `%placeholder`, ele age como se a opção `--pretty=tformat:<formato>' tenha sido utilizado."
 
 #. type: Plain text
 #: en/pretty-options.txt:13
 #, priority:260
 msgid "See the \"PRETTY FORMATS\" section for some additional details for each format.  When '=<format>' part is omitted, it defaults to 'medium'."
-msgstr ""
-"Consulte a seção \"FORMATOS BONITOS\" para obter detalhes adicionais para "
-"cada formato.  Quando a parte do '=<formato>' é omitido a predefinição "
-"retorna para 'medium'."
+msgstr "Consulte a seção \"FORMATOS BONITOS\" para obter detalhes adicionais para cada formato.  Quando a parte do '=<formato>' é omitido a predefinição retorna para 'medium'."
 
 #. type: Plain text
 #: en/pretty-options.txt:16
@@ -73195,11 +62849,7 @@ msgstr "--abbrev-commit"
 #: en/pretty-options.txt:22
 #, priority:260
 msgid "Instead of showing the full 40-byte hexadecimal commit object name, show only a partial prefix.  Non default number of digits can be specified with \"--abbrev=<n>\" (which also modifies diff output, if it is displayed)."
-msgstr ""
-"Em vez de exibir todos os 40 bytes hexadecimais do nome do objeto commit, "
-"exiba apenas um prefixo parcial.  A quantidade dos dígitos não predefinidos "
-"podem ser definidos com a opção \"--abbrev=<n>\" (que também altera o diff "
-"gerado, caso seja exibido)."
+msgstr "Em vez de exibir todos os 40 bytes hexadecimais do nome do objeto commit, exiba apenas um prefixo parcial.  A quantidade dos dígitos não predefinidos podem ser definidos com a opção \"--abbrev=<n>\" (que também altera o diff gerado, caso seja exibido)."
 
 #. type: Plain text
 #: en/pretty-options.txt:25
@@ -73217,10 +62867,7 @@ msgstr "--no-abbrev-commit"
 #: en/pretty-options.txt:30
 #, priority:260
 msgid "Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-commit` and those options which imply it such as \"--oneline\". It also overrides the `log.abbrevCommit` variable."
-msgstr ""
-"Exibe o nome do objeto commit completo com 40 bytes hexadecimais. Isso nega "
-"o a opção `--abbrev-commit` e as opções que o implicam, como `--oneline`. "
-"Ele também substitui a variável `log.abbrevCommit`."
+msgstr "Exibe o nome do objeto commit completo com 40 bytes hexadecimais. Isso nega o a opção `--abbrev-commit` e as opções que o implicam, como `--oneline`. Ele também substitui a variável `log.abbrevCommit`."
 
 #. type: Plain text
 #: en/pretty-options.txt:34
@@ -73232,15 +62879,7 @@ msgstr "Este é um atalho para \"--pretty=oneline --abbrev-commit\" ser utilizad
 #: en/pretty-options.txt:44
 #, priority:260
 msgid "The commit objects record the encoding used for the log message in their encoding header; this option can be used to tell the command to re-code the commit log message in the encoding preferred by the user.  For non plumbing commands this defaults to UTF-8. Note that if an object claims to be encoded in `X` and we are outputting in `X`, we will output the object verbatim; this means that invalid sequences in the original commit may be copied to the output."
-msgstr ""
-"Os objetos commit registram a codificação utilizada para a mensagem do "
-"registro log em seu cabeçalho de codificação; esta opção pode ser usada para "
-"informar ao comando para novamente codificar a mensagem do registro log do "
-"commit na codificação preferida pelo usuário.  Para os comandos não "
-"redirecionáveis, a predefinição retorna para UTF-8. Observe que caso um "
-"objeto afirma ser codificado com `X` e estamos gerando em` X`, o objeto será "
-"gerado de forma literal; isso significa que as sequências inválidas no "
-"commit original podem ser copiadas para a saída."
+msgstr "Os objetos commit registram a codificação utilizada para a mensagem do registro log em seu cabeçalho de codificação; esta opção pode ser usada para informar ao comando para novamente codificar a mensagem do registro log do commit na codificação preferida pelo usuário.  Para os comandos não redirecionáveis, a predefinição retorna para UTF-8. Observe que caso um objeto afirma ser codificado com `X` e estamos gerando em` X`, o objeto será gerado de forma literal; isso significa que as sequências inválidas no commit original podem ser copiadas para a saída."
 
 #. type: Labeled list
 #: en/pretty-options.txt:45
@@ -73264,12 +62903,7 @@ msgstr "--no-expand-tabs"
 #: en/pretty-options.txt:54
 #, priority:260
 msgid "Perform a tab expansion (replace each tab with enough spaces to fill to the next display column that is multiple of '<n>')  in the log message before showing it in the output.  `--expand-tabs` is a short-hand for `--expand-tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which disables tab expansion."
-msgstr ""
-"Execute uma expansão de guia (substitua cada guia por espaços suficientes "
-"para preencher a próxima coluna da exibição que é o múltiplo de '<n>') na "
-"mensagem do registro log antes de exibi-la na saída.  A opção `--expand-tabs`"
-" é uma abreviação da opção `--expand-tabs=8`,  a opção `--no-expand-tabs` é "
-"uma abreviação da opção `--expand-tabs=0`, que desativa a expansão da guia."
+msgstr "Execute uma expansão de guia (substitua cada guia por espaços suficientes para preencher a próxima coluna da exibição que é o múltiplo de '<n>') na mensagem do registro log antes de exibi-la na saída.  A opção `--expand-tabs` é uma abreviação da opção `--expand-tabs=8`,  a opção `--no-expand-tabs` é uma abreviação da opção `--expand-tabs=0`, que desativa a expansão da guia."
 
 #. type: Plain text
 #: en/pretty-options.txt:58
@@ -73281,53 +62915,31 @@ msgstr "A predefinição é que as guias sejam expandidas em belos formatos que
 #: en/pretty-options.txt:66
 #, priority:260
 msgid "Show the notes (see linkgit:git-notes[1]) that annotate the commit, when showing the commit log message.  This is the default for `git log`, `git show` and `git whatchanged` commands when there is no `--pretty`, `--format`, or `--oneline` option given on the command line."
-msgstr ""
-"Exiba as anotações (consulte linkgit:git-notes[1]) que acompanham o commit "
-"durante a exibição da mensagem do registro log do commit.  Este é a "
-"predefinição para os comandos `git log`, `git show` e `git whatchanged` "
-"quando não haja nenhuma opção `--pretty`, `--format` ou `--oneline` "
-"utilizada na linha de comando."
+msgstr "Exiba as anotações (consulte linkgit:git-notes[1]) que acompanham o commit durante a exibição da mensagem do registro log do commit.  Este é a predefinição para os comandos `git log`, `git show` e `git whatchanged` quando não haja nenhuma opção `--pretty`, `--format` ou `--oneline` utilizada na linha de comando."
 
 #. type: Plain text
 #: en/pretty-options.txt:70
 #, priority:260
 msgid "By default, the notes shown are from the notes refs listed in the `core.notesRef` and `notes.displayRef` variables (or corresponding environment overrides). See linkgit:git-config[1] for more details."
-msgstr ""
-"É predefinido que as anotações exibidas são das anotações refs listadas nas "
-"variáveis `core.notesRef` e `notes.displayRef` (ou substituições "
-"correspondentes do ambiente). Para mais detalhes consulte linkgit:git-"
-"config[1]."
+msgstr "É predefinido que as anotações exibidas são das anotações refs listadas nas variáveis `core.notesRef` e `notes.displayRef` (ou substituições correspondentes do ambiente). Para mais detalhes consulte linkgit:git-config[1]."
 
 #. type: Plain text
 #: en/pretty-options.txt:75
 #, priority:260
 msgid "With an optional '<ref>' argument, use the ref to find the notes to display.  The ref can specify the full refname when it begins with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` is prefixed to form a full name of the ref."
-msgstr ""
-"Com um argumento opcional '<ref>', usa a \"ref\" para encontrar as notas que "
-"serão exibidas.  A \"ref\" pode definir o nome completo da \"ref\" quando "
-"começar com `refs/notes/`; quando começa com `notes/`, `refs/` e caso "
-"contrário `refs/notes/` é prefixado para formar um nome completo da \"ref\"."
+msgstr "Com um argumento opcional '<ref>', usa a \"ref\" para encontrar as notas que serão exibidas.  A \"ref\" pode definir o nome completo da \"ref\" quando começar com `refs/notes/`; quando começa com `notes/`, `refs/` e caso contrário `refs/notes/` é prefixado para formar um nome completo da \"ref\"."
 
 #. type: Plain text
 #: en/pretty-options.txt:80
 #, priority:260
 msgid "Multiple --notes options can be combined to control which notes are being displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" and from the default notes ref(s)."
-msgstr ""
-"Várias opções `--notes` podem ser combinadas para controlar quais as notas "
-"estão sendo exibidas. Exemplos: `--notes=foo` mostrará apenas as notas "
-"vindas de \"refs/notes/foo\"; `--notes=foo --notes` mostrará as notas vindas "
-"de \"refs/notes/foo\" e das notas ref(s) predefinidas."
+msgstr "Várias opções `--notes` podem ser combinadas para controlar quais as notas estão sendo exibidas. Exemplos: `--notes=foo` mostrará apenas as notas vindas de \"refs/notes/foo\"; `--notes=foo --notes` mostrará as notas vindas de \"refs/notes/foo\" e das notas ref(s) predefinidas."
 
 #. type: Plain text
 #: en/pretty-options.txt:87
 #, priority:260
 msgid "Do not show notes. This negates the above `--notes` option, by resetting the list of notes refs from which notes are shown.  Options are parsed in the order given on the command line, so e.g.  \"--notes --notes=foo --no-notes --notes=bar\" will only show notes from \"refs/notes/bar\"."
-msgstr ""
-"Não exiba as anotações. Isso nega a opção `--notes` acima, redefinindo a "
-"lista das anotações das 'refs' a partir de onde as notas são exibidas.  As "
-"opções são analisadas na ordem informada na linha de comando, portanto, \"--"
-"notes --notes=foo --no-notes --notes=bar\" exibirá apenas as anotações das "
-"\"refs/notes/bar\" por exemplo."
+msgstr "Não exiba as anotações. Isso nega a opção `--notes` acima, redefinindo a lista das anotações das 'refs' a partir de onde as notas são exibidas.  As opções são analisadas na ordem informada na linha de comando, portanto, \"--notes --notes=foo --no-notes --notes=bar\" exibirá apenas as anotações das \"refs/notes/bar\" por exemplo."
 
 #. type: Labeled list
 #: en/pretty-options.txt:88
@@ -73345,9 +62957,7 @@ msgstr "--[no-]standard-notes"
 #: en/pretty-options.txt:92
 #, priority:260
 msgid "These options are deprecated. Use the above --notes/--no-notes options instead."
-msgstr ""
-"Essas opções estão obsoletas. Em vez disso, utilize as opções --notes/--no-"
-"notes acima."
+msgstr "Essas opções estão obsoletas. Em vez disso, utilize as opções --notes/--no-notes acima."
 
 #. type: Labeled list
 #: en/pretty-options.txt:94
@@ -73365,10 +62975,7 @@ msgstr "Verifique a validade de um objeto commit assinado, passando a assinatura
 #: en/pull-fetch-param.txt:6
 #, priority:220
 msgid "The \"remote\" repository that is the source of a fetch or pull operation.  This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
-msgstr ""
-"The \"remote\" repository that is the source of a fetch or pull operation.  "
-"Este parâmetro pode ser uma URL (consulte a seção <<URLS, GIT URLS>> abaixo) "
-"ou o nome de um ramo remoto (consulte a seção <<REMOTES, REMOTES>> abaixo)."
+msgstr "The \"remote\" repository that is the source of a fetch or pull operation.  Este parâmetro pode ser uma URL (consulte a seção <<URLS, GIT URLS>> abaixo) ou o nome de um ramo remoto (consulte a seção <<REMOTES, REMOTES>> abaixo)."
 
 #. type: Labeled list
 #: en/pull-fetch-param.txt:8
@@ -73380,9 +62987,7 @@ msgstr "<grupo>"
 #: en/pull-fetch-param.txt:12
 #, priority:220
 msgid "A name referring to a list of repositories as the value of remotes.<group> in the configuration file.  (See linkgit:git-config[1])."
-msgstr ""
-"Um nome referente para a lista de repositórios como o valor no arquivo da "
-"configuração `remotes.<grupo>`.  (Consulte linkgit:git-config[1])."
+msgstr "Um nome referente para a lista de repositórios como o valor no arquivo da configuração `remotes.<grupo>`.  (Consulte linkgit:git-config[1])."
 
 #. type: Labeled list
 #: en/pull-fetch-param.txt:14
@@ -73394,19 +62999,13 @@ msgstr "<refspec>"
 #: en/pull-fetch-param.txt:18
 #, priority:220
 msgid "Specifies which refs to fetch and which local refs to update.  When no <refspec>s appear on the command line, the refs to fetch are read from `remote.<repository>.fetch` variables instead"
-msgstr ""
-"Determina quais as refs capturar e quais as refs locais atualizar.  Quando "
-"nenhum `<refspec>` aparece na linha de comando, em vez disso, os refs que "
-"serão capturados são lidos a partir das variáveis `remote.<repositório>."
-"fetch`"
+msgstr "Determina quais as refs capturar e quais as refs locais atualizar.  Quando nenhum `<refspec>` aparece na linha de comando, em vez disso, os refs que serão capturados são lidos a partir das variáveis `remote.<repositório>.fetch`"
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:20
 #, no-wrap, priority:220
 msgid "\t(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).\n"
-msgstr ""
-"\t(consulte <<CRTB,CONFIGURAÇÕES DOS RAMOS MONITORADOS REMOTAMENTE>> below)."
-"\n"
+msgstr "\t(consulte <<CRTB,CONFIGURAÇÕES DOS RAMOS MONITORADOS REMOTAMENTE>> below).\n"
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:24
@@ -73422,120 +63021,61 @@ msgstr ""
 #: en/pull-fetch-param.txt:32
 #, priority:220
 msgid "The format of a <refspec> parameter is an optional plus `+`, followed by the source <src>, followed by a colon `:`, followed by the destination ref <dst>.  The colon can be omitted when <dst> is empty.  <src> is typically a ref, but it can also be a fully spelled hex object name."
-msgstr ""
-"O formato de um parâmetro `<refspec>` é um opcional mais `+`, seguido pela "
-"fonte `<src>`, seguido por dois pontos `:`, seguido pelo destino \"ref\" "
-"`<dst>`.  Os dois pontos podem ser omitidos quando o destino `<dst>` estiver "
-"vazio.  A fonte `<src>` normalmente é uma referência, mas também pode ser um "
-"nome de objeto escrito totalmente em hexadecimal."
+msgstr "O formato de um parâmetro `<refspec>` é um opcional mais `+`, seguido pela fonte `<src>`, seguido por dois pontos `:`, seguido pelo destino \"ref\" `<dst>`.  Os dois pontos podem ser omitidos quando o destino `<dst>` estiver vazio.  A fonte `<src>` normalmente é uma referência, mas também pode ser um nome de objeto escrito totalmente em hexadecimal."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:35
 #, priority:220
 msgid "`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests fetching everything up to the given tag."
-msgstr ""
-"A `tag` significa o mesmo que `refs/tags/<tag>:refs/tags/<tag>`; ele "
-"solicita a buscaa de tudo até a tag informada."
+msgstr "A `tag` significa o mesmo que `refs/tags/<tag>:refs/tags/<tag>`; ele solicita a buscaa de tudo até a tag informada."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:39
 #, priority:220
 msgid "The remote ref that matches <src> is fetched, and if <dst> is not an empty string, an attempt is made to update the local ref that matches it."
-msgstr ""
-"A \"ref\" remota que coincida com <src> é buscada e se <dst> não seja uma "
-"sequência vazia, é feita uma tentativa de atualizar a referência local que "
-"coincida com ela."
+msgstr "A \"ref\" remota que coincida com <src> é buscada e se <dst> não seja uma sequência vazia, é feita uma tentativa de atualizar a referência local que coincida com ela."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:46
 #, ignore-ellipsis, priority:220
 msgid "Whether that update is allowed without `--force` depends on the ref namespace it's being fetched to, the type of object being fetched, and whether the update is considered to be a fast-forward. Generally, the same rules apply for fetching as when pushing, see the `<refspec>...` section of linkgit:git-push[1] for what those are. Exceptions to those rules particular to 'git fetch' are noted below."
-msgstr ""
-"Caso a atualização seja permitida sem a opção `--force` depende do espaço de "
-"nomes da ref onde está sendo buscada, do tipo do objeto que está sendo "
-"buscado e se a atualização é considerada um avanço rápido. Geralmente, as "
-"mesmas regras se aplicam à busca e ao impulsionar, consulte a seção "
-"`<refspec>...` do linkgit:git-push[1] para saber o que são. As exceções para "
-"estas regras específicas para o comando 'git fetch' são anotadas abaixo."
+msgstr "Caso a atualização seja permitida sem a opção `--force` depende do espaço de nomes da ref onde está sendo buscada, do tipo do objeto que está sendo buscado e se a atualização é considerada um avanço rápido. Geralmente, as mesmas regras se aplicam à busca e ao impulsionar, consulte a seção `<refspec>...` do linkgit:git-push[1] para saber o que são. As exceções para estas regras específicas para o comando 'git fetch' são anotadas abaixo."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:54
 #, priority:220
 msgid "Until Git version 2.20, and unlike when pushing with linkgit:git-push[1], any updates to `refs/tags/*` would be accepted without `+` in the refspec (or `--force`). When fetching, we promiscuously considered all tag updates from a remote to be forced fetches.  Since Git version 2.20, fetching to update `refs/tags/*` works the same way as when pushing. I.e. any updates will be rejected without `+` in the refspec (or `--force`)."
-msgstr ""
-"Até a versão 2.20 do Git, e diferentemente do envio com linkgit:git-push[1], "
-"qualquer atualização para `refs/tags/*` seria aceita sem o sinal `+` no "
-"refspec (ou `--force`). Ao buscar, consideramos promiscuamente todas as "
-"atualizações das tags de um ramo remoto como buscas impostas.  Desde a "
-"versão 2.20 Git, buscar a atualização `refs/tags/*` funciona da mesma "
-"maneira que quando fazer um impulsionamento. Ou seja, todas as atualizações "
-"serão rejeitadas sem o sinal `+` no refspec (ou `--force`)."
+msgstr "Até a versão 2.20 do Git, e diferentemente do envio com linkgit:git-push[1], qualquer atualização para `refs/tags/*` seria aceita sem o sinal `+` no refspec (ou `--force`). Ao buscar, consideramos promiscuamente todas as atualizações das tags de um ramo remoto como buscas impostas.  Desde a versão 2.20 Git, buscar a atualização `refs/tags/*` funciona da mesma maneira que quando fazer um impulsionamento. Ou seja, todas as atualizações serão rejeitadas sem o sinal `+` no refspec (ou `--force`)."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:60
 #, priority:220
 msgid "Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), whether that's swapping e.g. a tree object for a blob, or a commit for another commit that's doesn't have the previous commit as an ancestor etc."
-msgstr ""
-"Ao contrário quando impulsionamos com o linkgit:git-push[1], qualquer "
-"atualização fora do `refs/{tags,heads}/*` será aceito sem o sinal `+` no "
-"refspec (ou `--force`), seja trocando, por exemplo, um objeto de árvore para "
-"uma bolha ou um commit para outro commit que não tenha o commit anterior "
-"como ancestral, etc."
+msgstr "Ao contrário quando impulsionamos com o linkgit:git-push[1], qualquer atualização fora do `refs/{tags,heads}/*` será aceito sem o sinal `+` no refspec (ou `--force`), seja trocando, por exemplo, um objeto de árvore para uma bolha ou um commit para outro commit que não tenha o commit anterior como ancestral, etc."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:64
 #, priority:220
 msgid "Unlike when pushing with linkgit:git-push[1], there is no configuration which'll amend these rules, and nothing like a `pre-fetch` hook analogous to the `pre-receive` hook."
-msgstr ""
-"Ao contrário quando impulsionamos com o linkgit:git-push[1], não existe uma "
-"configuração que corrija estas regras, e nada como um gancho `pre-fetch` "
-"análogo ao gancho `pre-receive`."
+msgstr "Ao contrário quando impulsionamos com o linkgit:git-push[1], não existe uma configuração que corrija estas regras, e nada como um gancho `pre-fetch` análogo ao gancho `pre-receive`."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:71
 #, priority:220
 msgid "As with pushing with linkgit:git-push[1], all of the rules described above about what's not allowed as an update can be overridden by adding an the optional leading `+` to a refspec (or using `--force` command line option). The only exception to this is that no amount of forcing will make the `refs/heads/*` namespace accept a non-commit object."
-msgstr ""
-"Assim como impulsionar com linkgit:git-push[1], todas as regras descritas "
-"acima sobre o que não é permitido como uma atualização pode ser sobrescrito "
-"ao adicionar um caractere opcional no \"refspec\" começando com `+` (ou "
-"utilizando a opção `--force` na linha de comando). A única exceção a isso é "
-"que nenhuma quantidade de imposição fará com que o espaço de nomes `refs/"
-"heads/*` aceite um objeto que não seja um commit."
+msgstr "Assim como impulsionar com linkgit:git-push[1], todas as regras descritas acima sobre o que não é permitido como uma atualização pode ser sobrescrito ao adicionar um caractere opcional no \"refspec\" começando com `+` (ou utilizando a opção `--force` na linha de comando). A única exceção a isso é que nenhuma quantidade de imposição fará com que o espaço de nomes `refs/heads/*` aceite um objeto que não seja um commit."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:83
 #, priority:220
 msgid "When the remote branch you want to fetch is known to be rewound and rebased regularly, it is expected that its new tip will not be descendant of its previous tip (as stored in your remote-tracking branch the last time you fetched).  You would want to use the `+` sign to indicate non-fast-forward updates will be needed for such branches.  There is no way to determine or declare that a branch will be made available in a repository with this behavior; the pulling user simply must know this is the expected usage pattern for a branch."
-msgstr ""
-"Quando se sabe que o ramo remoto que você quer buscar é retrocedida e "
-"reconstruída regularmente, espera-se que o novo topo não seja descendente do "
-"topo anterior (conforme foi armazenada no ramo monitorado remotamente da "
-"última vez que você fez a busca).  Você vai querer usar o sinal `+` para "
-"indicar que serão necessárias atualizações não rápidas para estas "
-"ramificações.  Não há como determinar ou declarar que uma ramificação será "
-"disponibilizada em um repositório com este comportamento; o usuário que está "
-"capturando simplesmente deve saber que esse é o padrão de uso esperado para "
-"um ramo."
+msgstr "Quando se sabe que o ramo remoto que você quer buscar é retrocedida e reconstruída regularmente, espera-se que o novo topo não seja descendente do topo anterior (conforme foi armazenada no ramo monitorado remotamente da última vez que você fez a busca).  Você vai querer usar o sinal `+` para indicar que serão necessárias atualizações não rápidas para estas ramificações.  Não há como determinar ou declarar que uma ramificação será disponibilizada em um repositório com este comportamento; o usuário que está capturando simplesmente deve saber que esse é o padrão de uso esperado para um ramo."
 
 #. type: Plain text
 #: en/pull-fetch-param.txt:103
 #, priority:220
 msgid "There is a difference between listing multiple <refspec> directly on 'git pull' command line and having multiple `remote.<repository>.fetch` entries in your configuration for a <repository> and running a 'git pull' command without any explicit <refspec> parameters.  <refspec>s listed explicitly on the command line are always merged into the current branch after fetching.  In other words, if you list more than one remote ref, 'git pull' will create an Octopus merge.  On the other hand, if you do not list any explicit <refspec> parameter on the command line, 'git pull' will fetch all the <refspec>s it finds in the `remote.<repository>.fetch` configuration and merge only the first <refspec> found into the current branch.  This is because making an Octopus from remote refs is rarely done, while keeping track of multiple remote heads in one-go by fetching more than one is often useful."
-msgstr ""
-"Há uma diferença entre listar múltiplos <refspec> diretamente na linha de "
-"comando com 'git pull' e ter várias entradas `remote.<repositório>.fetch` na "
-"sua configuração para um <repositório> e executar um comando com 'git pull' "
-"sem qualquer parâmetros explícitos <refspec>.  Os <refspec>s listados "
-"explicitamente na linha de comando são sempre mesclado no ramo atual após a "
-"busca.  Em outras palavras, caso você liste mais de uma \"ref\" remota, o "
-"comando 'git pull' criará uma mesclagem \"Octopus\" (Polvo).  Por outro "
-"lado, caso você não liste nenhum parâmetro <refspec> de forma explícita na "
-"linha de comando, o comando 'git pull' buscará tudo o que encontrar na "
-"configuração `remote.<repositório>.fetch` e mesclará apenas o primeiro que "
-"for encontrado no ramo atual.  Isso ocorre porque raramente é feito a "
-"criação de um \"polvo\" a partir das refs remotas, enquanto monitora os "
-"vários cabeçalhos remotos de uma só, isso geralmente é bastante útil."
+msgstr "Há uma diferença entre listar múltiplos <refspec> diretamente na linha de comando com 'git pull' e ter várias entradas `remote.<repositório>.fetch` na sua configuração para um <repositório> e executar um comando com 'git pull' sem qualquer parâmetros explícitos <refspec>.  Os <refspec>s listados explicitamente na linha de comando são sempre mesclado no ramo atual após a busca.  Em outras palavras, caso você liste mais de uma \"ref\" remota, o comando 'git pull' criará uma mesclagem \"Octopus\" (Polvo).  Por outro lado, caso você não liste nenhum parâmetro <refspec> de forma explícita na linha de comando, o comando 'git pull' buscará tudo o que encontrar na configuração `remote.<repositório>.fetch` e mesclará apenas o primeiro que for encontrado no ramo atual.  Isso ocorre porque raramente é feito a criação de um \"polvo\" a partir das refs remotas, enquanto monitora os vários cabeçalhos remotos de uma só, isso geralmente é bastante útil."
 
 #. type: Title -
 #: en/revisions.txt:2
@@ -73547,12 +63087,7 @@ msgstr "DEFININDO AS REVISÕES"
 #: en/revisions.txt:9
 #, priority:100
 msgid "A revision parameter '<rev>' typically, but not necessarily, names a commit object.  It uses what is called an 'extended SHA-1' syntax.  Here are various ways to spell object names.  The ones listed near the end of this list name trees and blobs contained in a commit."
-msgstr ""
-"Um parâmetro de revisão '<rev>' normalmente, mas não necessariamente, dá "
-"nome a um objeto commit.  Utiliza o que é chamado de uma sintaxe 'extended "
-"SHA-1'.  Aqui estão as várias maneiras de soletrar os nomes dos objetos.  Os "
-"listados próximos do final desta lista informam árvores e gotas existentes "
-"em um commit."
+msgstr "Um parâmetro de revisão '<rev>' normalmente, mas não necessariamente, dá nome a um objeto commit.  Utiliza o que é chamado de uma sintaxe 'extended SHA-1'.  Aqui estão as várias maneiras de soletrar os nomes dos objetos.  Os listados próximos do final desta lista informam árvores e gotas existentes em um commit."
 
 #. type: Plain text
 #: en/revisions.txt:13
@@ -73570,12 +63105,7 @@ msgstr "'<sha1>', exemplo. 'dae86e1950b1277e545cee180551750029cfe735', 'dae86e'"
 #: en/revisions.txt:20
 #, priority:100
 msgid "The full SHA-1 object name (40-byte hexadecimal string), or a leading substring that is unique within the repository.  E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there is no other object in your repository whose object name starts with dae86e."
-msgstr ""
-"O nome completo do objeto SHA-1 (a sequência hexadecimal com 40-bytes) ou "
-"uma carreira de caracteres que é exclusiva e única no repositório.  Por "
-"exemplo, dae86e1950b1277e545cee180551750029cfe735 e dae86e informam o mesmo "
-"objeto commit caso não haja um outro objeto em seu repositório cujo nome "
-"comece com daee."
+msgstr "O nome completo do objeto SHA-1 (a sequência hexadecimal com 40-bytes) ou uma carreira de caracteres que é exclusiva e única no repositório.  Por exemplo, dae86e1950b1277e545cee180551750029cfe735 e dae86e informam o mesmo objeto commit caso não haja um outro objeto em seu repositório cujo nome comece com daee."
 
 #. type: Labeled list
 #: en/revisions.txt:21
@@ -73641,26 +63171,13 @@ msgstr "caso contrário, utilize 'refs/remotes/<refname>/HEAD' caso exista."
 #: en/revisions.txt:59
 #, priority:100
 msgid "`HEAD` names the commit on which you based the changes in the working tree.  `FETCH_HEAD` records the branch which you fetched from a remote repository with your last `git fetch` invocation.  `ORIG_HEAD` is created by commands that move your `HEAD` in a drastic way, to record the position of the `HEAD` before their operation, so that you can easily change the tip of the branch back to the state before you ran them.  `MERGE_HEAD` records the commit(s) which you are merging into your branch when you run `git merge`.  `CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you run `git cherry-pick`."
-msgstr ""
-"`HEAD` informa o commit no qual você teve como base as alterações na árvore "
-"de trabalho.  `FETCH_HEAD` registra em qual ramo você buscou no repositório "
-"remoto com a sua última invocação `git fetch`.  `ORIG_HEAD` é criado por "
-"comandos que movem seu` HEAD` de uma maneira drástica, para registrar a "
-"posição do `HEAD` antes da sua operação, para que você possa facilmente "
-"mudar a ponta do ramo de volta ao estado anterior a sua execução.  "
-"`MERGE_HEAD` registra os commits que você está mesclando no seu ramo quando "
-"você executa o comando `git merge`.  `CHERRY_PICK_HEAD` registra o commit "
-"que você está escolhendo quando executa o comando `git cherry-pick`."
+msgstr "`HEAD` informa o commit no qual você teve como base as alterações na árvore de trabalho.  `FETCH_HEAD` registra em qual ramo você buscou no repositório remoto com a sua última invocação `git fetch`.  `ORIG_HEAD` é criado por comandos que movem seu` HEAD` de uma maneira drástica, para registrar a posição do `HEAD` antes da sua operação, para que você possa facilmente mudar a ponta do ramo de volta ao estado anterior a sua execução.  `MERGE_HEAD` registra os commits que você está mesclando no seu ramo quando você executa o comando `git merge`.  `CHERRY_PICK_HEAD` registra o commit que você está escolhendo quando executa o comando `git cherry-pick`."
 
 #. type: Plain text
 #: en/revisions.txt:64
 #, priority:100
 msgid "Note that any of the 'refs/*' cases above may come either from the `$GIT_DIR/refs` directory or from the `$GIT_DIR/packed-refs` file.  While the ref name encoding is unspecified, UTF-8 is preferred as some output processing may assume ref names in UTF-8."
-msgstr ""
-"Observe que em qualquer um dos casos o 'refs/*' acima pode vir do diretório "
-"`$GIT_DIR/refs` ou do arquivo`$GIT_DIR/packed-refs`.  Embora a codificação "
-"do nome de referência não seja especificado, o UTF-8 é o predefinido pois "
-"algum processamento de saída pode assumir nomes `ref` em UTF-8."
+msgstr "Observe que em qualquer um dos casos o 'refs/*' acima pode vir do diretório `$GIT_DIR/refs` ou do arquivo`$GIT_DIR/packed-refs`.  Embora a codificação do nome de referência não seja especificado, o UTF-8 é o predefinido pois algum processamento de saída pode assumir nomes `ref` em UTF-8."
 
 #. type: Labeled list
 #: en/revisions.txt:65
@@ -73678,24 +63195,13 @@ msgstr "O '@' sozinho é um atalho para `HEAD`."
 #: en/revisions.txt:68
 #, no-wrap, priority:100
 msgid "'[<refname>]@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
-msgstr ""
-"'[<refname>]@{<data>}', exemplo. 'master@\\{yesterday\\}', 'HEAD@{5 minutos "
-"atrás}'"
+msgstr "'[<refname>]@{<data>}', exemplo. 'master@\\{yesterday\\}', 'HEAD@{5 minutos atrás}'"
 
 #. type: Plain text
 #: en/revisions.txt:79
 #, priority:100
 msgid "A ref followed by the suffix '@' with a date specification enclosed in a brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior point in time.  This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note that this looks up the state of your *local* ref at a given time; e.g., what was in your local 'master' branch last week. If you want to look at commits made during certain times, see `--since` and `--until`."
-msgstr ""
-"Uma \"ref\" seguida por um sufixo '@' com uma especificação ordinal incluída "
-"em um par de chaves (exemplo. '\\{ontem\\}', '{1 mês 2 semanas 3 dias 1 hora "
-"1 segundo atrás}' ou '{1979-02-26 18:30:00}') determina o valor da \"ref\" "
-"em um momento anterior.  Esse sufixo pode ser utilizado imediatamente após "
-"um nome \"ref\" e a \"ref\" deve ter um registro log que já exista ('$"
-"GIT_DIR/logs/<ref>'). Observe que em um determinado momento a condição geral "
-"da sua \"ref\" *local* será consultada ; o que estava no seu ramo 'master' "
-"na semana passada por exemplo. Caso queira ver quais os commits foram feitos "
-"durante determinados períodos de tempo, consulte `--since` e `--until`."
+msgstr "Uma \"ref\" seguida por um sufixo '@' com uma especificação ordinal incluída em um par de chaves (exemplo. '\\{ontem\\}', '{1 mês 2 semanas 3 dias 1 hora 1 segundo atrás}' ou '{1979-02-26 18:30:00}') determina o valor da \"ref\" em um momento anterior.  Esse sufixo pode ser utilizado imediatamente após um nome \"ref\" e a \"ref\" deve ter um registro log que já exista ('$GIT_DIR/logs/<ref>'). Observe que em um determinado momento a condição geral da sua \"ref\" *local* será consultada ; o que estava no seu ramo 'master' na semana passada por exemplo. Caso queira ver quais os commits foram feitos durante determinados períodos de tempo, consulte `--since` e `--until`."
 
 #. type: Labeled list
 #: en/revisions.txt:80
@@ -73707,14 +63213,7 @@ msgstr "'<refname>@{<n>}', e.g. 'master@\\{1\\}'"
 #: en/revisions.txt:88
 #, priority:100
 msgid "A ref followed by the suffix '@' with an ordinal specification enclosed in a brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of that ref.  For example 'master@\\{1\\}' is the immediate prior value of 'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This suffix may only be used immediately following a ref name and the ref must have an existing log ('$GIT_DIR/logs/<refname>')."
-msgstr ""
-"Uma \"ref\" seguida pelo sufixo '@' com uma especificação ordinal incluída "
-"em um par de chaves (exemplo, '\\{1\\}', '\\{15\\}') especifica o enésimo "
-"valor anterior desta \"ref\".  Por exemplo, 'master@\\{1\\}' é o valor "
-"anterior imediato de 'master', enquanto 'master@\\{5\\}' é o quinto valor "
-"anterior do 'master'. Este sufixo poderá ser utilizado imediatamente após um "
-"nome \"ref\" e o mesmo deve ter um registro log já existente em ('$GIT_DIR/"
-"logs/<refname>')."
+msgstr "Uma \"ref\" seguida pelo sufixo '@' com uma especificação ordinal incluída em um par de chaves (exemplo, '\\{1\\}', '\\{15\\}') especifica o enésimo valor anterior desta \"ref\".  Por exemplo, 'master@\\{1\\}' é o valor anterior imediato de 'master', enquanto 'master@\\{5\\}' é o quinto valor anterior do 'master'. Este sufixo poderá ser utilizado imediatamente após um nome \"ref\" e o mesmo deve ter um registro log já existente em ('$GIT_DIR/logs/<refname>')."
 
 #. type: Labeled list
 #: en/revisions.txt:89
@@ -73744,28 +63243,19 @@ msgstr "O construtor '@{-<n>}' significa que <n> do ramo/commit foi verificado a
 #: en/revisions.txt:98
 #, no-wrap, priority:100
 msgid "'[<branchname>]@\\{upstream\\}', e.g. 'master@\\{upstream\\}', '@\\{u\\}'"
-msgstr ""
-"'[<nome-do-ramo>]@\\{upstream\\}', exemplo, 'master@\\{upstream\\}', '@\\{u\\"
-"}'"
+msgstr "'[<nome-do-ramo>]@\\{upstream\\}', exemplo, 'master@\\{upstream\\}', '@\\{u\\}'"
 
 #. type: Plain text
 #: en/revisions.txt:105
 #, priority:100
 msgid "The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u\\}')  refers to the branch that the branch specified by branchname is set to build on top of (configured with `branch.<name>.remote` and `branch.<name>.merge`).  A missing branchname defaults to the current one. These suffixes are also accepted when spelled in uppercase, and they mean the same thing no matter the case."
-msgstr ""
-"O sufixo '@ {upstream}' para o nome de uma ramificação (o formato abreviado "
-"'<nome-do-ramo>@\\{u\\}') refere-se ao ramo onde o ramo informado pelo "
-"\"branchname\" esteja definido para construir em cima do `branch.<nome>."
-"remote` e `branch.<nome>.merge`).  Em uma ramificação desaparecida a "
-"predefinição retorna para a atual. Estes sufixos também são aceitos quando "
-"digitados em maiúsculas e significam a mesma coisa, não importa o caso."
+msgstr "O sufixo '@ {upstream}' para o nome de uma ramificação (o formato abreviado '<nome-do-ramo>@\\{u\\}') refere-se ao ramo onde o ramo informado pelo \"branchname\" esteja definido para construir em cima do `branch.<nome>.remote` e `branch.<nome>.merge`).  Em uma ramificação desaparecida a predefinição retorna para a atual. Estes sufixos também são aceitos quando digitados em maiúsculas e significam a mesma coisa, não importa o caso."
 
 #. type: Labeled list
 #: en/revisions.txt:106
 #, no-wrap, priority:100
 msgid "'[<branchname>]@\\{push\\}', e.g. 'master@\\{push\\}', '@\\{push\\}'"
-msgstr ""
-"'[<nome-do-ramo>]@\\{push\\}', exemplo, 'master@\\{push\\}', '@\\{push\\}'"
+msgstr "'[<nome-do-ramo>]@\\{push\\}', exemplo, 'master@\\{push\\}', '@\\{push\\}'"
 
 #. type: Plain text
 #: en/revisions.txt:112
@@ -73845,14 +63335,7 @@ msgstr "'<rev>{tilde}[<n>]', exemplo, 'HEAD{tilde}, master{tilde}3'"
 #: en/revisions.txt:151
 #, priority:100
 msgid "A suffix '{tilde}' to a revision parameter means the first parent of that commit object.  A suffix '{tilde}<n>' to a revision parameter means the commit object that is the <n>th generation ancestor of the named commit object, following only the first parents.  I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'.  See below for an illustration of the usage of this form."
-msgstr ""
-"Um sufixo '{tilde}' para um parâmetro de revisão significa o que a primeira "
-"origem deste objeto commit.  Um sufixo '{tilde}<n>' para um parâmetro de "
-"revisão significa que o objeto commit é o <n> do ancestral da geração do "
-"objeto commit informado, seguindo apenas os primeiras origens.  Ou seja, "
-"'<rev>{tilde}3' é equivalente a '<rev>{caret}{caret}{caret}' que é "
-"equivalente a '<rev>{caret}1{caret}1{caret}1'.  Veja abaixo uma ilustração "
-"do uso deste formato."
+msgstr "Um sufixo '{tilde}' para um parâmetro de revisão significa o que a primeira origem deste objeto commit.  Um sufixo '{tilde}<n>' para um parâmetro de revisão significa que o objeto commit é o <n> do ancestral da geração do objeto commit informado, seguindo apenas os primeiras origens.  Ou seja, '<rev>{tilde}3' é equivalente a '<rev>{caret}{caret}{caret}' que é equivalente a '<rev>{caret}1{caret}1{caret}1'.  Veja abaixo uma ilustração do uso deste formato."
 
 #. type: Labeled list
 #: en/revisions.txt:152
@@ -73912,19 +63395,7 @@ msgstr "':/<texto>', exemplo, ':/fix nasty bug'"
 #: en/revisions.txt:198
 #, priority:100
 msgid "A colon, followed by a slash, followed by a text, names a commit whose commit message matches the specified regular expression.  This name returns the youngest matching commit which is reachable from any ref, including HEAD.  The regular expression can match any part of the commit message. To match messages starting with a string, one can use e.g. ':/^foo'. The special sequence ':/!' is reserved for modifiers to what is matched. ':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' character, followed by 'foo'. Any other sequence beginning with ':/!' is reserved for now.  Depending on the given text, the shell's word splitting rules might require additional quoting."
-msgstr ""
-"Da nome a um commit aqueles que forem seguidos por um traço e por um texto, "
-"e a mensagem de commit coincidir à expressão regular especificada.  Esse "
-"nome retorna o commit coincidente mais jovem, acessível a partir de qualquer "
-"referência, incluindo `HEAD`.  A expressão regular pode corresponder a "
-"qualquer parte da mensagem do commit. Para coincidir mensagens que comecem "
-"com uma string, pode-se utilizar ':/^foo' por exemplo. A sequência especial "
-"': /!' está reservada para modificadores que tenham coincidências. ':/!-foo' "
-"executa uma coincidência negativa, enquanto ':/!!foo' coincide com um "
-"caractere literal '!', seguido por 'foo'. No momento, qualquer outra "
-"sequência começando com ':/!' está reservada.  Dependendo do texto "
-"informado, as regras de divisão de palavras do shell podem exigir citações "
-"adicionais."
+msgstr "Da nome a um commit aqueles que forem seguidos por um traço e por um texto, e a mensagem de commit coincidir à expressão regular especificada.  Esse nome retorna o commit coincidente mais jovem, acessível a partir de qualquer referência, incluindo `HEAD`.  A expressão regular pode corresponder a qualquer parte da mensagem do commit. Para coincidir mensagens que comecem com uma string, pode-se utilizar ':/^foo' por exemplo. A sequência especial ': /!' está reservada para modificadores que tenham coincidências. ':/!-foo' executa uma coincidência negativa, enquanto ':/!!foo' coincide com um caractere literal '!', seguido por 'foo'. No momento, qualquer outra sequência começando com ':/!' está reservada.  Dependendo do texto informado, as regras de divisão de palavras do shell podem exigir citações adicionais."
 
 #. type: Labeled list
 #: en/revisions.txt:199
@@ -73936,14 +63407,7 @@ msgstr "'<rev>:<caminho>', exemplo, 'HEAD:README', 'master:./README'"
 #: en/revisions.txt:207
 #, priority:100
 msgid "A suffix ':' followed by a path names the blob or tree at the given path in the tree-ish object named by the part before the colon.  A path starting with './' or '../' is relative to the current working directory.  The given path will be converted to be relative to the working tree's root directory.  This is most useful to address a blob or tree from a commit or tree that has the same tree structure as the working tree."
-msgstr ""
-"Um sufixo ':' seguido de um caminho nomeia a gota ou a árvore no caminho "
-"especificado no objeto  da árvore \"ish\" informado pela parte antes dos "
-"dois pontos.  Um caminho começando com './' ou '../' é relativo ao diretório "
-"de trabalho atual.  O caminho especificado será convertido para ser relativo "
-"ao diretório raiz da árvore de trabalho.  Isso é mais útil para abordar uma "
-"gota ou árvore de um commit ou uma árvore que tenha a mesma estrutura de "
-"árvore que uma árvore de trabalho."
+msgstr "Um sufixo ':' seguido de um caminho nomeia a gota ou a árvore no caminho especificado no objeto  da árvore \"ish\" informado pela parte antes dos dois pontos.  Um caminho começando com './' ou '../' é relativo ao diretório de trabalho atual.  O caminho especificado será convertido para ser relativo ao diretório raiz da árvore de trabalho.  Isso é mais útil para abordar uma gota ou árvore de um commit ou uma árvore que tenha a mesma estrutura de árvore que uma árvore de trabalho."
 
 #. type: Labeled list
 #: en/revisions.txt:208
@@ -73955,14 +63419,7 @@ msgstr "':[<n>:]<caminho>', exemplo, ':0:README', ':README'"
 #: en/revisions.txt:216
 #, priority:100
 msgid "A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path, names a blob object in the index at the given path. A missing stage number (and the colon that follows it) names a stage 0 entry. During a merge, stage 1 is the common ancestor, stage 2 is the target branch's version (typically the current branch), and stage 3 is the version from the branch which is being merged."
-msgstr ""
-"Os dois pontos opcionalmente seguidos por um número de estágio (0 para 3) e "
-"dois pontos, seguidos por um caminho, informam um objeto gota no índice no "
-"caminho especificado. Nomeia uma entrada de estágio quando o número estiver "
-"ausente (assim como dois pontos que o seguem). Durante uma mesclagem, o "
-"estágio 1 é o ancestral comum, o estágio 2 é a versão do ramo de destino ("
-"normalmente o ramo atual) e o estágio 3 é a versão do ramo que está sendo "
-"mesclado."
+msgstr "Os dois pontos opcionalmente seguidos por um número de estágio (0 para 3) e dois pontos, seguidos por um caminho, informam um objeto gota no índice no caminho especificado. Nomeia uma entrada de estágio quando o número estiver ausente (assim como dois pontos que o seguem). Durante uma mesclagem, o estágio 1 é o ancestral comum, o estágio 2 é a versão do ramo de destino (normalmente o ramo atual) e o estágio 3 é a versão do ramo que está sendo mesclado."
 
 #. type: Plain text
 #: en/revisions.txt:220
@@ -74032,10 +63489,7 @@ msgstr "O histórico que atravessa os comandos como o `git log` opera em um dete
 #: en/revisions.txt:256
 #, priority:100
 msgid "For these commands, specifying a single revision, using the notation described in the previous section, means the set of commits `reachable` from the given commit."
-msgstr ""
-"Para estes comandos, defina uma única revisão utilizando a notação descrita "
-"na seção anterior, significa que o conjunto dos commits `acessíveis` a "
-"partir do commit informado."
+msgstr "Para estes comandos, defina uma única revisão utilizando a notação descrita na seção anterior, significa que o conjunto dos commits `acessíveis` a partir do commit informado."
 
 #. type: Plain text
 #: en/revisions.txt:259
@@ -74059,11 +63513,7 @@ msgstr "'{caret}<rev>' (caret) Notação"
 #: en/revisions.txt:269
 #, priority:100
 msgid "To exclude commits reachable from a commit, a prefix '{caret}' notation is used.  E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
-msgstr ""
-"Para excluir os commits acessíveis de um commit, é usada uma notação de "
-"prefixo '{caret}'.  Por exemplo, '{caret}r1 r2' significa os commits "
-"acessíveis de 'r2' porém exclui aqueles acessíveis do 'r1' (como, por "
-"exemplo, 'r1' e os seus ancestrais)."
+msgstr "Para excluir os commits acessíveis de um commit, é usada uma notação de prefixo '{caret}'.  Por exemplo, '{caret}r1 r2' significa os commits acessíveis de 'r2' porém exclui aqueles acessíveis do 'r1' (como, por exemplo, 'r1' e os seus ancestrais)."
 
 #. type: Title ~
 #: en/revisions.txt:271
@@ -74081,13 +63531,7 @@ msgstr "A faixa de notação de intervalo '..' (dois pontos)"
 #: en/revisions.txt:279
 #, priority:100
 msgid "The '{caret}r1 r2' set operation appears so often that there is a shorthand for it.  When you have two commits 'r1' and 'r2' (named according to the syntax explained in SPECIFYING REVISIONS above), you can ask for commits that are reachable from r2 excluding those that are reachable from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'."
-msgstr ""
-"A operação do conjunto '{caret}r1 r2' aparece com tanta frequência que "
-"existe uma abreviação para isso.  Quando você tem dois commits 'r1' e 'r2' ("
-"nomeados de acordo com a sintaxe explicada em ESPECIFICANDO REVISÕES acima), "
-"você pode solicitar os commits que sejam acessíveis atraés do 'r2' excluindo "
-"aqueles que podem ser acessados através do 'r1' pelo '{caret}r1 r2' e podem "
-"ser escritos como 'r1..r2'."
+msgstr "A operação do conjunto '{caret}r1 r2' aparece com tanta frequência que existe uma abreviação para isso.  Quando você tem dois commits 'r1' e 'r2' (nomeados de acordo com a sintaxe explicada em ESPECIFICANDO REVISÕES acima), você pode solicitar os commits que sejam acessíveis atraés do 'r2' excluindo aqueles que podem ser acessados através do 'r1' pelo '{caret}r1 r2' e podem ser escritos como 'r1..r2'."
 
 #. type: Labeled list
 #: en/revisions.txt:280
@@ -74099,24 +63543,13 @@ msgstr "A notação da diferença simétrica '...' (três pontos)"
 #: en/revisions.txt:286
 #, ignore-ellipsis, priority:100
 msgid "A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and 'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'.  It is the set of commits that are reachable from either one of 'r1' (left side) or 'r2' (right side) but not from both."
-msgstr ""
-"Uma notação semelhante 'r1\\...r2' é chamada de uma diferença simétrica de "
-"'r1' e 'r2' sendo definida como 'r1 r2 --not $(git merge-base --all r1 r2)"
-"'.  É o conjunto dos commits que são acessíveis a partir do 'r1' (lado "
-"esquerdo) ou 'r2' (lado direito), porém, não de ambos."
+msgstr "Uma notação semelhante 'r1\\...r2' é chamada de uma diferença simétrica de 'r1' e 'r2' sendo definida como 'r1 r2 --not $(git merge-base --all r1 r2)'.  É o conjunto dos commits que são acessíveis a partir do 'r1' (lado esquerdo) ou 'r2' (lado direito), porém, não de ambos."
 
 #. type: Plain text
 #: en/revisions.txt:293
 #, priority:100
 msgid "In these two shorthand notations, you can omit one end and let it default to HEAD.  For example, 'origin..' is a shorthand for 'origin..HEAD' and asks \"What did I do since I forked from the origin branch?\" Similarly, '..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reachable and unreachable from HEAD."
-msgstr ""
-"Nestas duas notações abreviadas, é possível omitir uma extremidade e deixá-"
-"la como predefinido no `HEAD`.  Como por exemplo, 'origin..' é uma "
-"abreviação de 'origin..HEAD' e pergunta \"O que eu fiz desde que peguei a "
-"bifurcação no ramo de origem?\" Da mesma forma, '..origin' é uma abreviação "
-"de 'HEAD..origin' e pergunta \"O que a origem fez desde que eu as peguei?\" "
-"Observe que '..' significaria 'HEAD..HEAD', que é um intervalo vazio "
-"acessível e inacessível a partir do `HEAD`."
+msgstr "Nestas duas notações abreviadas, é possível omitir uma extremidade e deixá-la como predefinido no `HEAD`.  Como por exemplo, 'origin..' é uma abreviação de 'origin..HEAD' e pergunta \"O que eu fiz desde que peguei a bifurcação no ramo de origem?\" Da mesma forma, '..origin' é uma abreviação de 'HEAD..origin' e pergunta \"O que a origem fez desde que eu as peguei?\" Observe que '..' significaria 'HEAD..HEAD', que é um intervalo vazio acessível e inacessível a partir do `HEAD`."
 
 #. type: Title ~
 #: en/revisions.txt:295
@@ -74128,9 +63561,7 @@ msgstr "Outras <rev>{caret} Notações Abreviadas dos pais"
 #: en/revisions.txt:298
 #, priority:100
 msgid "Three other shorthands exist, particularly useful for merge commits, for naming a set that is formed by a commit and its parent commits."
-msgstr ""
-"Existem três outras abreviações, particularmente úteis para a mesclagem dos "
-"commits, para nomear um conjunto formado por um commit e o seu pai principal."
+msgstr "Existem três outras abreviações, particularmente úteis para a mesclagem dos commits, para nomear um conjunto formado por um commit e o seu pai principal."
 
 #. type: Plain text
 #: en/revisions.txt:300
@@ -74142,31 +63573,19 @@ msgstr "A notação 'r1{caret}@' todos os pais do 'r1'."
 #: en/revisions.txt:303
 #, priority:100
 msgid "The 'r1{caret}!' notation includes commit 'r1' but excludes all of its parents.  By itself, this notation denotes the single commit 'r1'."
-msgstr ""
-"A notação 'r1{caret}!' (cursor) inclui o commit 'r1', mas exclui todos as "
-"suas origens.  Por si só, essa notação denota o único commit 'r1'."
+msgstr "A notação 'r1{caret}!' (cursor) inclui o commit 'r1', mas exclui todos as suas origens.  Por si só, essa notação denota o único commit 'r1'."
 
 #. type: Plain text
 #: en/revisions.txt:310
 #, priority:100
 msgid "The '<rev>{caret}-[<n>]' notation includes '<rev>' but excludes the <n>th parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if not given. This is typically useful for merge commits where you can just pass '<commit>{caret}-' to get all the commits in the branch that was merged in merge commit '<commit>' (including '<commit>' itself)."
-msgstr ""
-"A notação '<rev>{caret}-[<n>]' incluí '<rev>' porém excluí o '<n>ésimo' pai ("
-"ou seja, é uma abreviação para '<rev>{caret}<n>..<rev>'), com '<n>' = 1 caso "
-"não seja informado. Geralmente é útil para a mesclagem dos commits onde é "
-"possível passar '<commit>{caret}-' para obter todos os commits do ramoq que "
-"foi mesclado na mesclagem do commit '<commit>' (incluindo o próprio "
-"'<commit>')."
+msgstr "A notação '<rev>{caret}-[<n>]' incluí '<rev>' porém excluí o '<n>ésimo' pai (ou seja, é uma abreviação para '<rev>{caret}<n>..<rev>'), com '<n>' = 1 caso não seja informado. Geralmente é útil para a mesclagem dos commits onde é possível passar '<commit>{caret}-' para obter todos os commits do ramoq que foi mesclado na mesclagem do commit '<commit>' (incluindo o próprio '<commit>')."
 
 #. type: Plain text
 #: en/revisions.txt:314
 #, priority:100
 msgid "While '<rev>{caret}<n>' was about specifying a single commit parent, these three notations also consider its parents. For example you can say 'HEAD{caret}2{caret}@', however you cannot say 'HEAD{caret}@{caret}2'."
-msgstr ""
-"Embora '<rev>{caret}<n>' fosse sobre a especificação do pai de um único "
-"commit, estas três notações também consideram os seus pais. Como por "
-"exemplo, você pode dizer 'HEAD{caret}2{caret}@', contudo não poderá dizer "
-"'HEAD{caret}@{caret}2'."
+msgstr "Embora '<rev>{caret}<n>' fosse sobre a especificação do pai de um único commit, estas três notações também consideram os seus pais. Como por exemplo, você pode dizer 'HEAD{caret}2{caret}@', contudo não poderá dizer 'HEAD{caret}@{caret}2'."
 
 #. type: Title -
 #: en/revisions.txt:316
@@ -74184,9 +63603,7 @@ msgstr "'<rev>'"
 #: en/revisions.txt:321
 #, priority:100
 msgid "Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
-msgstr ""
-"Inclua os commits que são acessíveis através do <ref> (ou seja, <rev> e seus "
-"ancestrais)."
+msgstr "Inclua os commits que são acessíveis através do <ref> (ou seja, <rev> e seus ancestrais)."
 
 #. type: Labeled list
 #: en/revisions.txt:322
@@ -74198,9 +63615,7 @@ msgstr "'{caret}<rev>'"
 #: en/revisions.txt:325
 #, priority:100
 msgid "Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
-msgstr ""
-"Exclua os commits que estejam acessíveis de `<rev>` (<rev> e seus ancestrais "
-"por exemplo)."
+msgstr "Exclua os commits que estejam acessíveis de `<rev>` (<rev> e seus ancestrais por exemplo)."
 
 #. type: Labeled list
 #: en/revisions.txt:326
@@ -74212,10 +63627,7 @@ msgstr "'<rev1>..<rev2>'"
 #: en/revisions.txt:330
 #, priority:100
 msgid "Include commits that are reachable from <rev2> but exclude those that are reachable from <rev1>.  When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
-msgstr ""
-"Inclua os commits acessíveis a partir do <rev2>, porém exclua aquelas "
-"acessíveis a partir do <rev1>.  Quando <rev1> ou <rev2> for omitido, a "
-"predefinição retorna para `HEAD`."
+msgstr "Inclua os commits acessíveis a partir do <rev2>, porém exclua aquelas acessíveis a partir do <rev1>.  Quando <rev1> ou <rev2> for omitido, a predefinição retorna para `HEAD`."
 
 #. type: Labeled list
 #: en/revisions.txt:331
@@ -74227,10 +63639,7 @@ msgstr "'<rev1>\\...<rev2>'"
 #: en/revisions.txt:335
 #, priority:100
 msgid "Include commits that are reachable from either <rev1> or <rev2> but exclude those that are reachable from both.  When either <rev1> or <rev2> is omitted, it defaults to `HEAD`."
-msgstr ""
-"Incluí os commits que sejam acessíveis seja de <rev1> ou <rev2> porém exclua "
-"aqueles que sejam acessíveis de ambos.  Quando <rev1> ou <rev2> for omitido, "
-"a predefinição retorna para `HEAD`."
+msgstr "Incluí os commits que sejam acessíveis seja de <rev1> ou <rev2> porém exclua aqueles que sejam acessíveis de ambos.  Quando <rev1> ou <rev2> for omitido, a predefinição retorna para `HEAD`."
 
 #. type: Labeled list
 #: en/revisions.txt:336
@@ -74242,10 +63651,7 @@ msgstr "'<rev>{caret}@', e.g. 'HEAD{caret}@'"
 #: en/revisions.txt:340
 #, priority:100
 msgid "A suffix '{caret}' followed by an at sign is the same as listing all parents of '<rev>' (meaning, include anything reachable from its parents, but not the commit itself)."
-msgstr ""
-"Um sufixo '{caret}' seguido por um sinal de arroba é o mesmo que listar "
-"todas as origens de '<rev>' (ou seja, incluir qualquer coisa acessível das "
-"suas origens, mas não o próprio commit)."
+msgstr "Um sufixo '{caret}' seguido por um sinal de arroba é o mesmo que listar todas as origens de '<rev>' (ou seja, incluir qualquer coisa acessível das suas origens, mas não o próprio commit)."
 
 #. type: Labeled list
 #: en/revisions.txt:341
@@ -74257,10 +63663,7 @@ msgstr "'<rev>{caret}!', e.g. 'HEAD{caret}!'"
 #: en/revisions.txt:345
 #, priority:100
 msgid "A suffix '{caret}' followed by an exclamation mark is the same as giving commit '<rev>' and then all its parents prefixed with '{caret}' to exclude them (and their ancestors)."
-msgstr ""
-"Um sufixo '{caret}' seguido de um ponto de exclamação é o mesmo que fazer um "
-"commit '<rev>' e em seguida, todos as suas origens prefixam com '{caret}' "
-"para excluí-los (assim como seus ancestrais)."
+msgstr "Um sufixo '{caret}' seguido de um ponto de exclamação é o mesmo que fazer um commit '<rev>' e em seguida, todos as suas origens prefixam com '{caret}' para excluí-los (assim como seus ancestrais)."
 
 #. type: Labeled list
 #: en/revisions.txt:346
@@ -74272,17 +63675,13 @@ msgstr "'<rev>{caret}-<n>', e.g. 'HEAD{caret}-, HEAD{caret}-2'"
 #: en/revisions.txt:349
 #, priority:100
 msgid "Equivalent to '<rev>{caret}<n>..<rev>', with '<n>' = 1 if not given."
-msgstr ""
-"É o equivalente a '<rev>{caret}<n>..<rev>', with '<n>' = 1 caso nenhum seja "
-"informado."
+msgstr "É o equivalente a '<rev>{caret}<n>..<rev>', with '<n>' = 1 caso nenhum seja informado."
 
 #. type: Plain text
 #: en/revisions.txt:353
 #, priority:100
 msgid "Here are a handful of examples using the Loeliger illustration above, with each step in the notation's expansion and selection carefully spelt out:"
-msgstr ""
-"Aqui estão alguns exemplos utilizando a ilustração Loeliger acima, com cada "
-"etapa da expansão e da seleção da notação cuidadosamente explicitada:"
+msgstr "Aqui estão alguns exemplos utilizando a ilustração Loeliger acima, com cada etapa da expansão e da seleção da notação cuidadosamente explicitada:"
 
 #. type: delimited block .
 #: en/revisions.txt:377
@@ -74350,12 +63749,7 @@ msgstr "Além de especificar uma série de commits que devem ser listados utiliz
 #: en/rev-list-options.txt:12
 #, priority:260
 msgid "Using more options generally further limits the output (e.g.  `--since=<date1>` limits to commits newer than `<date1>`, and using it with `--grep=<pattern>` further limits to commits whose log message has a line that matches `<pattern>`), unless otherwise noted."
-msgstr ""
-"O uso de mais opções geralmente limita ainda mais a saída (por exemplo,  "
-"limites `--since=<date1>` para commits mais recentes que `<data1>`, e usá-lo "
-"com `--grep=<padrão>` limita ainda mais para os commits cuja mensagem de "
-"registro log possua uma linha que coincida com `<padrão>`), a menos que "
-"indicado de outra maneira."
+msgstr "O uso de mais opções geralmente limita ainda mais a saída (por exemplo,  limites `--since=<date1>` para commits mais recentes que `<data1>`, e usá-lo com `--grep=<padrão>` limita ainda mais para os commits cuja mensagem de registro log possua uma linha que coincida com `<padrão>`), a menos que indicado de outra maneira."
 
 #. type: Plain text
 #: en/rev-list-options.txt:15
@@ -74469,12 +63863,7 @@ msgstr "--committer=<padrão>"
 #: en/rev-list-options.txt:45
 #, priority:260
 msgid "Limit the commits output to ones with author/committer header lines that match the specified pattern (regular expression).  With more than one `--author=<pattern>`, commits whose author matches any of the given patterns are chosen (similarly for multiple `--committer=<pattern>`)."
-msgstr ""
-"Limite os commits gerados para aqueles com linhas de cabeçalho do autor e de "
-"quem fez o commit que coincida com determinado padrão (expressão regular).  "
-"Com um ou mais de um `--author=<padrão>`, são selecionados os commits cujo "
-"autor coincida com qualquer um dos padrões informados (é similar para vários "
-"`--committer=<padrão>`)."
+msgstr "Limite os commits gerados para aqueles com linhas de cabeçalho do autor e de quem fez o commit que coincida com determinado padrão (expressão regular).  Com um ou mais de um `--author=<padrão>`, são selecionados os commits cujo autor coincida com qualquer um dos padrões informados (é similar para vários `--committer=<padrão>`)."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:46
@@ -74486,12 +63875,7 @@ msgstr "--grep-reflog=<padrão>"
 #: en/rev-list-options.txt:52
 #, priority:260
 msgid "Limit the commits output to ones with reflog entries that match the specified pattern (regular expression). With more than one `--grep-reflog`, commits whose reflog message matches any of the given patterns are chosen.  It is an error to use this option unless `--walk-reflogs` is in use."
-msgstr ""
-"Limite o commit gerado para aqueles com entradas de reflog que coincidam ao "
-"padrão informado (expressão regular). Com mais de uma opção `--grep-reflog`, "
-"são escolhidos os commits cuja mensagem do reflog coincida com qualquer um "
-"dos padrões informado.  É um erro usar esta opção, a menos que o `--walk-"
-"reflogs` esteja em uso."
+msgstr "Limite o commit gerado para aqueles com entradas de reflog que coincidam ao padrão informado (expressão regular). Com mais de uma opção `--grep-reflog`, são escolhidos os commits cuja mensagem do reflog coincida com qualquer um dos padrões informado.  É um erro usar esta opção, a menos que o `--walk-reflogs` esteja em uso."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:53
@@ -74503,11 +63887,7 @@ msgstr "--grep=<padrão>"
 #: en/rev-list-options.txt:59
 #, priority:260
 msgid "Limit the commits output to ones with log message that matches the specified pattern (regular expression).  With more than one `--grep=<pattern>`, commits whose message matches any of the given patterns are chosen (but see `--all-match`)."
-msgstr ""
-"Limite o commit gerado para aqueles com mensagem do registro log que "
-"coincida ao padrão informado (expressão regular).  Com mais de uma opção "
-"`--grep=<padrão>`, os commits cuja mensagem coincida com qualquer um dos "
-"padrões informados (porém consulte `--all-match`)."
+msgstr "Limite o commit gerado para aqueles com mensagem do registro log que coincida ao padrão informado (expressão regular).  Com mais de uma opção `--grep=<padrão>`, os commits cuja mensagem coincida com qualquer um dos padrões informados (porém consulte `--all-match`)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:63
@@ -74531,9 +63911,7 @@ msgstr "--invert-grep"
 #: en/rev-list-options.txt:72
 #, priority:260
 msgid "Limit the commits output to ones with log message that do not match the pattern specified with `--grep=<pattern>`."
-msgstr ""
-"Limita a saída dos commits para aqueles com uma mensagem do registro log que "
-"não coincida com o padrão utilizado em com o comando `--grep=<padrão>`."
+msgstr "Limita a saída dos commits para aqueles com uma mensagem do registro log que não coincida com o padrão utilizado em com o comando `--grep=<padrão>`."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:74
@@ -74605,9 +63983,7 @@ msgstr "--no-merges"
 #: en/rev-list-options.txt:110
 #, priority:260
 msgid "Do not print commits with more than one parent. This is exactly the same as `--max-parents=1`."
-msgstr ""
-"Não imprima os commits com mais de um pai. É exatamente o mesmo que a opção "
-"`--max-parents=1`."
+msgstr "Não imprima os commits com mais de um pai. É exatamente o mesmo que a opção `--max-parents=1`."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:111
@@ -74637,35 +64013,19 @@ msgstr "--no-max-parents"
 #: en/rev-list-options.txt:119
 #, priority:260
 msgid "Show only commits which have at least (or at most) that many parent commits. In particular, `--max-parents=1` is the same as `--no-merges`, `--min-parents=2` is the same as `--merges`.  `--max-parents=0` gives all root commits and `--min-parents=3` all octopus merges."
-msgstr ""
-"Exibe apenas os commits que tenham pelo menos (ou no máximo) aquela "
-"quantidade de pais dos commits. Em particular, `--max-parents=1` é o mesmo "
-"que `--no-merges`, `--min-parents=2` é o mesmo que `--merges`.  A opção "
-"`--max-parents=0` informa todos os commits raiz e `--min-parents=3` todas as "
-"mesclagens \"polvo\"."
+msgstr "Exibe apenas os commits que tenham pelo menos (ou no máximo) aquela quantidade de pais dos commits. Em particular, `--max-parents=1` é o mesmo que `--no-merges`, `--min-parents=2` é o mesmo que `--merges`.  A opção `--max-parents=0` informa todos os commits raiz e `--min-parents=3` todas as mesclagens \"polvo\"."
 
 #. type: Plain text
 #: en/rev-list-options.txt:123
 #, priority:260
 msgid "`--no-min-parents` and `--no-max-parents` reset these limits (to no limit)  again.  Equivalent forms are `--min-parents=0` (any commit has 0 or more parents) and `--max-parents=-1` (negative numbers denote no upper limit)."
-msgstr ""
-"As opções `--no-min-parents` e `--no-max-parents` redefinem estes limites ("
-"para nenhum limite) novamente.  As formas equivalentes são `--min-parents=0` "
-"(qualquer commit que tenha 0 ou mais pais) e `--max-parents=-1` (os números "
-"negativos indicam nenhum limite acima)."
+msgstr "As opções `--no-min-parents` e `--no-max-parents` redefinem estes limites (para nenhum limite) novamente.  As formas equivalentes são `--min-parents=0` (qualquer commit que tenha 0 ou mais pais) e `--max-parents=-1` (os números negativos indicam nenhum limite acima)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:133
 #, priority:260
 msgid "Follow only the first parent commit upon seeing a merge commit.  This option can give a better overview when viewing the evolution of a particular topic branch, because merges into a topic branch tend to be only about adjusting to updated upstream from time to time, and this option allows you to ignore the individual commits brought in to your history by such a merge. Cannot be combined with --bisect."
-msgstr ""
-"Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit.  "
-"Essa opção pode lhe fornecer uma melhor visão geral durante a visualização "
-"da evolução de um tópico específico no ramo, pois faz a mesclagem em um "
-"tópico no ramo e tende a ser apenas sobre o ajuste das atualizações upstream "
-"de tempos em tempos, esta opção permite ignorar os commits individuais "
-"trazidas para o seu histórico feitas por essa mesclagem. Não pode ser "
-"combinado com `--bisect`."
+msgstr "Siga apenas o primeiro commit da origem ao ver a mesclagem de um commit.  Essa opção pode lhe fornecer uma melhor visão geral durante a visualização da evolução de um tópico específico no ramo, pois faz a mesclagem em um tópico no ramo e tende a ser apenas sobre o ajuste das atualizações upstream de tempos em tempos, esta opção permite ignorar os commits individuais trazidas para o seu histórico feitas por essa mesclagem. Não pode ser combinado com `--bisect`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:137
@@ -74677,9 +64037,7 @@ msgstr "Inverte o significado do prefixo '{cursor}' (ou falta dele)  para todos
 #: en/rev-list-options.txt:141
 #, priority:260
 msgid "Pretend as if all the refs in `refs/`, along with `HEAD`, are listed on the command line as '<commit>'."
-msgstr ""
-"Finja como se todos os refs em `refs/` junto com `HEAD` estejam listados na "
-"linha de comando como '<commit>'."
+msgstr "Finja como se todos os refs em `refs/` junto com `HEAD` estejam listados na linha de comando como '<commit>'."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:142
@@ -74691,11 +64049,7 @@ msgstr "--branches[=<padrão>]"
 #: en/rev-list-options.txt:147
 #, priority:260
 msgid "Pretend as if all the refs in `refs/heads` are listed on the command line as '<commit>'. If '<pattern>' is given, limit branches to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
-msgstr ""
-"Finja como se todas as refs no `refs/heads` estejam listadas na linha de "
-"comando como '<commit>'. Caso '<padrão>' seja utilizado, limite os ramos "
-"para aqueles que coincidam com a \"shell blob\" informada. Caso o padrão não "
-"tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
+msgstr "Finja como se todas as refs no `refs/heads` estejam listadas na linha de comando como '<commit>'. Caso '<padrão>' seja utilizado, limite os ramos para aqueles que coincidam com a \"shell blob\" informada. Caso o padrão não tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:148
@@ -74707,11 +64061,7 @@ msgstr "--tags[=<padrão>]"
 #: en/rev-list-options.txt:153
 #, priority:260
 msgid "Pretend as if all the refs in `refs/tags` are listed on the command line as '<commit>'. If '<pattern>' is given, limit tags to ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
-msgstr ""
-"Finja como se todas as refs no `refs/remotes` estejam listados na linha de "
-"comando como '<commit>'. Caso '<padrão>' seja utilizado, limite os ramos "
-"para aqueles que coincidam com a \"shell blob\" informada. Caso o padrão não "
-"tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
+msgstr "Finja como se todas as refs no `refs/remotes` estejam listados na linha de comando como '<commit>'. Caso '<padrão>' seja utilizado, limite os ramos para aqueles que coincidam com a \"shell blob\" informada. Caso o padrão não tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:154
@@ -74723,12 +64073,7 @@ msgstr "--remotes[=<padrão>]"
 #: en/rev-list-options.txt:159
 #, priority:260
 msgid "Pretend as if all the refs in `refs/remotes` are listed on the command line as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to ones matching given shell glob.  If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
-msgstr ""
-"Finja como se todos as refs no `refs/remotes` estejam listados na linha de "
-"comando como '<commit>'. Caso um '<padrão>' seja utilizado, limite as "
-"ramificações rastreadas remotamente que coincidam com aqueles da \"shel "
-"glob\" informada.  Caso o padrão não tenha '?', '{asterisco}', ou '[', "
-"'/{asterisco}' no final é implícito."
+msgstr "Finja como se todos as refs no `refs/remotes` estejam listados na linha de comando como '<commit>'. Caso um '<padrão>' seja utilizado, limite as ramificações rastreadas remotamente que coincidam com aqueles da \"shel glob\" informada.  Caso o padrão não tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:160
@@ -74740,11 +64085,7 @@ msgstr "--glob=<glob-pattern>"
 #: en/rev-list-options.txt:165
 #, priority:260
 msgid "Pretend as if all the refs matching shell glob '<glob-pattern>' are listed on the command line as '<commit>'. Leading 'refs/', is automatically prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end is implied."
-msgstr ""
-"Finja como se todos as refs coincidentes com \"shell glob\" '<glob-pattern>' "
-"estejam listados na linha de comando como '<commit>'. A 'refs/' principal é "
-"anexada automaticamente caso esteja ausente. Caso o padrão não tenha '?', "
-"'{asterisco}', ou '[', '/{asterisco}' no final é implícito."
+msgstr "Finja como se todos as refs coincidentes com \"shell glob\" '<glob-pattern>' estejam listados na linha de comando como '<commit>'. A 'refs/' principal é anexada automaticamente caso esteja ausente. Caso o padrão não tenha '?', '{asterisco}', ou '[', '/{asterisco}' no final é implícito."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:181
@@ -74774,11 +64115,7 @@ msgstr "Finja como se todos os objetos mencionados como dicas \"ref\" dos reposi
 #: en/rev-list-options.txt:200
 #, priority:260
 msgid "By default, all working trees will be examined by the following options when there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` and `--indexed-objects`.  This option forces them to examine the current working tree only."
-msgstr ""
-"É predefinido que todas as árvores de trabalho serão examinadas através das "
-"seguintes opções quando houver mais de uma (consulte linkgit:git-"
-"worktree[1]): `--all`, `--reflog` e `--indexed-objects`.  Esta opção impõem "
-"o exame seja feito apenas na árvore de trabalho atual."
+msgstr "É predefinido que todas as árvores de trabalho serão examinadas através das seguintes opções quando houver mais de uma (consulte linkgit:git-worktree[1]): `--all`, `--reflog` e `--indexed-objects`.  Esta opção impõem o exame seja feito apenas na árvore de trabalho atual."
 
 #. type: Plain text
 #: en/rev-list-options.txt:204
@@ -74802,21 +64139,13 @@ msgstr "Finja como se uma bisseção ruim \"ref\" `refs/bisect/bad` estivesse li
 #: en/rev-list-options.txt:218
 #, priority:260
 msgid "In addition to the '<commit>' listed on the command line, read them from the standard input. If a `--` separator is seen, stop reading commits and start reading paths to limit the result."
-msgstr ""
-"Além dos '<commits>' listados na linha de comando, leia-os na entrada "
-"padrão. Caso um separador `--` seja visto, pare de ler os commits e comece a "
-"ler os caminhos para limitar o resultado."
+msgstr "Além dos '<commits>' listados na linha de comando, leia-os na entrada padrão. Caso um separador `--` seja visto, pare de ler os commits e comece a ler os caminhos para limitar o resultado."
 
 #. type: Plain text
 #: en/rev-list-options.txt:226
 #, priority:260
 msgid "Don't print anything to standard output.  This form is primarily meant to allow the caller to test the exit status to see if a range of objects is fully connected (or not).  It is faster than redirecting stdout to `/dev/null` as the output does not have to be formatted."
-msgstr ""
-"Não imprima nada na saída padrão.  Este formulário tem como principal "
-"objetivo, permitir que a pessoa que chame, teste a condição da saída para "
-"verificar se um conjunto de objetos está totalmente conectado (ou não).  É "
-"mais rápido que redirecionar o stdout para `/dev/null`, pois a saída não "
-"precisa ser formatada."
+msgstr "Não imprima nada na saída padrão.  Este formulário tem como principal objetivo, permitir que a pessoa que chame, teste a condição da saída para verificar se um conjunto de objetos está totalmente conectado (ou não).  É mais rápido que redirecionar o stdout para `/dev/null`, pois a saída não precisa ser formatada."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:228
@@ -74846,13 +64175,7 @@ msgstr "Omitir qualquer commit que apresente a mesma alteração como em outro c
 #: en/rev-list-options.txt:244
 #, priority:260
 msgid "For example, if you have two branches, `A` and `B`, a usual way to list all commits on only one side of them is with `--left-right` (see the example below in the description of the `--left-right` option). However, it shows the commits that were cherry-picked from the other branch (for example, ``3rd on b'' may be cherry-picked from branch A). With this option, such pairs of commits are excluded from the output."
-msgstr ""
-"Como por exemplo, caso você tenha dois ramos, `A` e `B`, uma maneira comum "
-"de listar todos os commits em apenas um lado deles é com a opção `--left-"
-"right` (veja o exemplo abaixo na descrição da opção `--left-right`). No "
-"entanto, exibe os commits que foram selecionados de forma seletiva no outro "
-"ramo (como por exemplo, ``3º no b'' pode ser a escolha seletiva do ramo `A`)"
-". Com esta opção, estes pares de commits são excluídos da saída."
+msgstr "Como por exemplo, caso você tenha dois ramos, `A` e `B`, uma maneira comum de listar todos os commits em apenas um lado deles é com a opção `--left-right` (veja o exemplo abaixo na descrição da opção `--left-right`). No entanto, exibe os commits que foram selecionados de forma seletiva no outro ramo (como por exemplo, ``3º no b'' pode ser a escolha seletiva do ramo `A`). Com esta opção, estes pares de commits são excluídos da saída."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:245
@@ -74876,11 +64199,7 @@ msgstr "Liste apenas os commits nos respectivos lados de um \"diff\" simétrico,
 #: en/rev-list-options.txt:256
 #, ignore-ellipsis, priority:260
 msgid "For example, `--cherry-pick --right-only A...B` omits those commits from `B` which are in `A` or are patch-equivalent to a commit in `A`. In other words, this lists the `+` commits from `git cherry A B`.  More precisely, `--cherry-pick --right-only --no-merges` gives the exact list."
-msgstr ""
-"Por exemplo, a opção `--cherry-pick --right-only A...B` omite os commits de "
-"`B` que estão em `A` ou são equivalentes ao patch para um commit em `A`. Em "
-"outras palavras, lista os commits com sinal `+` do `git cherry A B`.  Mais "
-"precisamente, `--cherry-pick --right-only --no-merges` informa a lista exata."
+msgstr "Por exemplo, a opção `--cherry-pick --right-only A...B` omite os commits de `B` que estão em `A` ou são equivalentes ao patch para um commit em `A`. Em outras palavras, lista os commits com sinal `+` do `git cherry A B`.  Mais precisamente, `--cherry-pick --right-only --no-merges` informa a lista exata."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:257
@@ -74904,24 +64223,13 @@ msgstr "--walk-reflogs"
 #: en/rev-list-options.txt:271
 #, ignore-ellipsis, priority:260
 msgid "Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones.  When this option is used you cannot specify commits to exclude (that is, '{caret}commit', 'commit1..commit2', and 'commit1\\...commit2' notations cannot be used)."
-msgstr ""
-"Em vez de percorrer a cadeia de ancestralidade do commit, passe pelas "
-"entradas do reflog vindo da mais recente para as mais antigas.  Quando esta "
-"opção é utilizada, você não pode definir os commits para exclusão (ou seja, "
-"as notações '{caret}commit', 'commit1..commit2' e 'commit1\\...commit2' não "
-"podem ser utilizadas)."
+msgstr "Em vez de percorrer a cadeia de ancestralidade do commit, passe pelas entradas do reflog vindo da mais recente para as mais antigas.  Quando esta opção é utilizada, você não pode definir os commits para exclusão (ou seja, as notações '{caret}commit', 'commit1..commit2' e 'commit1\\...commit2' não podem ser utilizadas)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:278
 #, priority:260
 msgid "With `--pretty` format other than `oneline` and `reference` (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog.  The reflog designator in the output may be shown as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the reflog) or as `ref@{timestamp}` (with the timestamp for that entry), depending on a few rules:"
-msgstr ""
-"Com o formato `--pretty` diferente do `oneline` e `reference` (por razões "
-"óbvias), isto faz com que a saída tenha duas linhas extras das informações "
-"extraídas do reflog.  O designador reflog na saída pode ser exibido como "
-"`ref@{Nth}` (onde `Nth` é o índice cronológico reverso no reflog) ou como "
-"`ref@{timestamp}` (com o registro de data e hora para esta entrada), "
-"dependendo de algumas regras:"
+msgstr "Com o formato `--pretty` diferente do `oneline` e `reference` (por razões óbvias), isto faz com que a saída tenha duas linhas extras das informações extraídas do reflog.  O designador reflog na saída pode ser exibido como `ref@{Nth}` (onde `Nth` é o índice cronológico reverso no reflog) ou como `ref@{timestamp}` (com o registro de data e hora para esta entrada), dependendo de algumas regras:"
 
 #. type: Plain text
 #: en/rev-list-options.txt:282
@@ -74951,10 +64259,7 @@ msgstr "Caso contrário, exibe o formato do índice."
 #: en/rev-list-options.txt:296
 #, priority:260
 msgid "Under `--pretty=oneline`, the commit message is prefixed with this information on the same line.  This option cannot be combined with `--reverse`.  See also linkgit:git-reflog[1]."
-msgstr ""
-"Em `pretty=oneline`, a mensagem do commit é prefixada com estas informações "
-"na mesma linha.  Esta opção não pode ser combinada com `--reverse`.  "
-"Consulte também linkgit:git-reflog[1]."
+msgstr "Em `pretty=oneline`, a mensagem do commit é prefixada com estas informações na mesma linha.  Esta opção não pode ser combinada com `--reverse`.  Consulte também linkgit:git-reflog[1]."
 
 #. type: Plain text
 #: en/rev-list-options.txt:298
@@ -74966,9 +64271,7 @@ msgstr "Esta informação não será exibida de forma alguma sob `--pretty = ref
 #: en/rev-list-options.txt:302
 #, priority:260
 msgid "After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge."
-msgstr ""
-"Após uma falha na mesclagem, exiba as refs que estão em atrito com os "
-"arquivos e não existam em todos os `HEADS` que serão mesclados."
+msgstr "Após uma falha na mesclagem, exiba as refs que estão em atrito com os arquivos e não existam em todos os `HEADS` que serão mesclados."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:303
@@ -74980,9 +64283,7 @@ msgstr "--boundary"
 #: en/rev-list-options.txt:306
 #, priority:260
 msgid "Output excluded boundary commits. Boundary commits are prefixed with `-`."
-msgstr ""
-"O limite da exclusão dos commits que forem gerados. Os limites entre os "
-"commits são prefixados com `-`."
+msgstr "O limite da exclusão dos commits que forem gerados. Os limites entre os commits são prefixados com `-`."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:308
@@ -74994,10 +64295,7 @@ msgstr "--use-bitmap-index"
 #: en/rev-list-options.txt:313
 #, priority:260
 msgid "Try to speed up the traversal using the pack bitmap index (if one is available). Note that when traversing with `--objects`, trees and blobs will not have their associated path printed."
-msgstr ""
-"Tente acelerar a passagem usando o índice do pacote bitmap (caso haja um "
-"disponível). Observe que ao percorrer com `--objects`, as árvores e as "
-"bolhas não terão o seu caminho associado impresso."
+msgstr "Tente acelerar a passagem usando o índice do pacote bitmap (caso haja um disponível). Observe que ao percorrer com `--objects`, as árvores e as bolhas não terão o seu caminho associado impresso."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:314
@@ -75009,10 +64307,7 @@ msgstr "--progress=<header>"
 #: en/rev-list-options.txt:317
 #, priority:260
 msgid "Show progress reports on stderr as objects are considered. The `<header>` text will be printed with each progress update."
-msgstr ""
-"Exibe os relatórios de progresso no stderr à medida que os objetos são "
-"considerados. O texto `<header>` será impresso a cada atualização do "
-"progresso."
+msgstr "Exibe os relatórios de progresso no stderr à medida que os objetos são considerados. O texto `<header>` será impresso a cada atualização do progresso."
 
 #. type: Title ~
 #: en/rev-list-options.txt:320
@@ -75024,12 +64319,7 @@ msgstr "Simplificação do histórico"
 #: en/rev-list-options.txt:326
 #, priority:260
 msgid "Sometimes you are only interested in parts of the history, for example the commits modifying a particular <path>. But there are two parts of 'History Simplification', one part is selecting the commits and the other is how to do it, as there are various strategies to simplify the history."
-msgstr ""
-"Às vezes, você está interessado apenas nas partes da história, como por "
-"exemplo, os commit que alteraram um determinado <caminho>. Porém existem "
-"duas partes da 'Simplificação do Histórico', uma parte é a seleção dos "
-"commits e a outra é como fazê-lo, pois existem várias estratégias para "
-"simplificar o histórico."
+msgstr "Às vezes, você está interessado apenas nas partes da história, como por exemplo, os commit que alteraram um determinado <caminho>. Porém existem duas partes da 'Simplificação do Histórico', uma parte é a seleção dos commits e a outra é como fazê-lo, pois existem várias estratégias para simplificar o histórico."
 
 #. type: Plain text
 #: en/rev-list-options.txt:328
@@ -75083,10 +64373,7 @@ msgstr "Modo predefinido"
 #: en/rev-list-options.txt:344
 #, priority:260
 msgid "Simplifies the history to the simplest history explaining the final state of the tree. Simplest because it prunes some side branches if the end result is the same (i.e. merging branches with the same content)"
-msgstr ""
-"Simplifique o histórico para o mais simples, explicando a condição final da "
-"árvore. Mais simples, porque elimina algumas ramificações laterais caso o "
-"resultado final for o mesmo (ou seja, mescle os ramos com o mesmo conteúdo)"
+msgstr "Simplifique o histórico para o mais simples, explicando a condição final da árvore. Mais simples, porque elimina algumas ramificações laterais caso o resultado final for o mesmo (ou seja, mescle os ramos com o mesmo conteúdo)"
 
 #. type: Labeled list
 #: en/rev-list-options.txt:345 en/rev-list-options.txt:675
@@ -75098,11 +64385,7 @@ msgstr "--show-pulls"
 #: en/rev-list-options.txt:350
 #, priority:260
 msgid "Include all commits from the default mode, but also any merge commits that are not TREESAME to the first parent but are TREESAME to a later parent. This mode is helpful for showing the merge commits that \"first introduced\" a change to a branch."
-msgstr ""
-"Inclua todas os commits no modo predefinido, porém também qualquer commits "
-"mesclado que não sejam 'TREESAME' para o primeiro parente, porém sejam "
-"'TREESAME' para um parente posterior. Este modo auxilia na exibição do "
-"commit mesclado que \"introduziu primeiro\" a alteração em um ramo."
+msgstr "Inclua todas os commits no modo predefinido, porém também qualquer commits mesclado que não sejam 'TREESAME' para o primeiro parente, porém sejam 'TREESAME' para um parente posterior. Este modo auxilia na exibição do commit mesclado que \"introduziu primeiro\" a alteração em um ramo."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:351
@@ -75156,12 +64439,7 @@ msgstr "--ancestry-path"
 #: en/rev-list-options.txt:372
 #, priority:260
 msgid "When given a range of commits to display (e.g. 'commit1..commit2' or 'commit2 {caret}commit1'), only display commits that exist directly on the ancestry chain between the 'commit1' and 'commit2', i.e. commits that are both descendants of 'commit1', and ancestors of 'commit2'."
-msgstr ""
-"Quando um intervalo dos commits é exibido (como por exemplo, "
-"'commit1..commit2' ou 'commit2 {caret}commit1'), apenas exibe os commits que "
-"existem diretamente na cadeia de ancestralidade entre o 'commit1' e o "
-"'commit1', ou seja, os commits que são ambos descendentes doe 'commit1' e os "
-"ancestrais do 'commit2'."
+msgstr "Quando um intervalo dos commits é exibido (como por exemplo, 'commit1..commit2' ou 'commit2 {caret}commit1'), apenas exibe os commits que existem diretamente na cadeia de ancestralidade entre o 'commit1' e o 'commit1', ou seja, os commits que são ambos descendentes doe 'commit1' e os ancestrais do 'commit2'."
 
 #. type: Plain text
 #: en/rev-list-options.txt:374
@@ -75173,19 +64451,13 @@ msgstr "Segue explicações com mais detalhes."
 #: en/rev-list-options.txt:378
 #, priority:260
 msgid "Suppose you specified `foo` as the <paths>.  We shall call commits that modify `foo` !TREESAME, and the rest TREESAME.  (In a diff filtered for `foo`, they look different and equal, respectively.)"
-msgstr ""
-"Suponha que você defina `foo` como o <caminho>.  Vamos chamar os commits que "
-"alteraram `foo` '!TREESAME', e o restante 'TREESAME'.  (Em um diff filtrado "
-"pelo `foo`, eles parecem diferentes e iguais, respectivamente.)"
+msgstr "Suponha que você defina `foo` como o <caminho>.  Vamos chamar os commits que alteraram `foo` '!TREESAME', e o restante 'TREESAME'.  (Em um diff filtrado pelo `foo`, eles parecem diferentes e iguais, respectivamente.)"
 
 #. type: Plain text
 #: en/rev-list-options.txt:382
 #, priority:260
 msgid "In the following, we will always refer to the same example history to illustrate the differences between simplification settings.  We assume that you are filtering for a file `foo` in this commit graph:"
-msgstr ""
-"A seguir, sempre nos referiremos ao mesmo exemplo do histórico para ilustrar "
-"as diferenças entre as configurações de simplificação.  Assumimos que esteja "
-"filtrando um arquivo `foo` neste grafo do commit:"
+msgstr "A seguir, sempre nos referiremos ao mesmo exemplo do histórico para ilustrar as diferenças entre as configurações de simplificação.  Assumimos que esteja filtrando um arquivo `foo` neste grafo do commit:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:388
@@ -75207,18 +64479,13 @@ msgstr ""
 #: en/rev-list-options.txt:391
 #, priority:260
 msgid "The horizontal line of history A---Q is taken to be the first parent of each merge.  The commits are:"
-msgstr ""
-"A linha horizontal do histórico 'A---Q' é considerada o primeira origem de "
-"cada mesclagem.  Os commits são:"
+msgstr "A linha horizontal do histórico 'A---Q' é considerada o primeira origem de cada mesclagem.  Os commits são:"
 
 #. type: Plain text
 #: en/rev-list-options.txt:395
 #, priority:260
 msgid "`I` is the initial commit, in which `foo` exists with contents ``asdf'', and a file `quux` exists with contents ``quux''. Initial commits are compared to an empty tree, so `I` is !TREESAME."
-msgstr ""
-"O `I` é o commit inicial onde `foo` existe com o conteúdo ``asdf'' e existe "
-"um arquivo `quux` com o conteúdo` `quux ''. Os commits iniciais são "
-"comparados com uma árvore vazia, então o `I` é !TREESAME."
+msgstr "O `I` é o commit inicial onde `foo` existe com o conteúdo ``asdf'' e existe um arquivo `quux` com o conteúdo` `quux ''. Os commits iniciais são comparados com uma árvore vazia, então o `I` é !TREESAME."
 
 #. type: Plain text
 #: en/rev-list-options.txt:397
@@ -75230,63 +64497,43 @@ msgstr "Em `A`, `foo` contém apenas ``foo''."
 #: en/rev-list-options.txt:400
 #, priority:260
 msgid "`B` contains the same change as `A`.  Its merge `M` is trivial and hence TREESAME to all parents."
-msgstr ""
-"O `B` contém a mesma alteração que `A`.  A mesclagem `M` é trivial e "
-"portanto, 'TREESAME' para todos os pais."
+msgstr "O `B` contém a mesma alteração que `A`.  A mesclagem `M` é trivial e portanto, 'TREESAME' para todos os pais."
 
 #. type: Plain text
 #: en/rev-list-options.txt:403
 #, priority:260
 msgid "`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it is not TREESAME to any parent."
-msgstr ""
-"O `C` não muda `foo`, mas a sua mesclagem `N` o altera para ``foobar'', "
-"portanto não é 'TREESAME' para nenhum dos pais."
+msgstr "O `C` não muda `foo`, mas a sua mesclagem `N` o altera para ``foobar'', portanto não é 'TREESAME' para nenhum dos pais."
 
 #. type: Plain text
 #: en/rev-list-options.txt:406
 #, priority:260
 msgid "`D` sets `foo` to ``baz''. Its merge `O` combines the strings from `N` and `D` to ``foobarbaz''; i.e., it is not TREESAME to any parent."
-msgstr ""
-"`D` define `foo` para ``baz''. Mescla `O` combinado com textos vindos de ` N`"
-" e `D` a ``foobarbaz''; ou seja, não é \"TREESAME\" para nenhuma das origens."
+msgstr "`D` define `foo` para ``baz''. Mescla `O` combinado com textos vindos de ` N` e `D` a ``foobarbaz''; ou seja, não é \"TREESAME\" para nenhuma das origens."
 
 #. type: Plain text
 #: en/rev-list-options.txt:409
 #, priority:260
 msgid "`E` changes `quux` to ``xyzzy'', and its merge `P` combines the strings to ``quux xyzzy''. `P` is TREESAME to `O`, but not to `E`."
-msgstr ""
-"O `E` altera `quux` para ``xyzzy'' e a sua mesclagem `P` combina as "
-"sequências dos caracteres para ``quux xyzzy''. O `P` é 'TREESAME' para `O`, "
-"porém não para `E`."
+msgstr "O `E` altera `quux` para ``xyzzy'' e a sua mesclagem `P` combina as sequências dos caracteres para ``quux xyzzy''. O `P` é 'TREESAME' para `O`, porém não para `E`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:413
 #, priority:260
 msgid "`X` is an independent root commit that added a new file `side`, and `Y` modified it. `Y` is TREESAME to `X`. Its merge `Q` added `side` to `P`, and `Q` is TREESAME to `P`, but not to `Y`."
-msgstr ""
-"O `X` é um commit raiz independente que adicionou um novo arquivo `side`, e "
-"`Y` o alterou. O `Y` é 'TREESAME' para `X`. Mescla `Q` adicionou `side` para "
-"`P`, e `Q` e 'TREESAME' para `P`, mas não para `Y`."
+msgstr "O `X` é um commit raiz independente que adicionou um novo arquivo `side`, e `Y` o alterou. O `Y` é 'TREESAME' para `X`. Mescla `Q` adicionou `side` para `P`, e `Q` e 'TREESAME' para `P`, mas não para `Y`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:418
 #, priority:260
 msgid "`rev-list` walks backwards through history, including or excluding commits based on whether `--full-history` and/or parent rewriting (via `--parents` or `--children`) are used. The following settings are available."
-msgstr ""
-"O `rev list` retrocede no histórico, incluindo ou excluindo os commits com "
-"base no uso do `--full-history` e/ou na reescrita dos pais (através da opção "
-"`--parents` ou `--children`). As seguintes configurações estão disponíveis."
+msgstr "O `rev list` retrocede no histórico, incluindo ou excluindo os commits com base no uso do `--full-history` e/ou na reescrita dos pais (através da opção `--parents` ou `--children`). As seguintes configurações estão disponíveis."
 
 #. type: Plain text
 #: en/rev-list-options.txt:426
 #, priority:260
 msgid "Commits are included if they are not TREESAME to any parent (though this can be changed, see `--sparse` below).  If the commit was a merge, and it was TREESAME to one parent, follow only that parent.  (Even if there are several TREESAME parents, follow only one of them.)  Otherwise, follow all parents."
-msgstr ""
-"Os commits serão incluídas caso não sejam 'TREESAME' para nenhum dos "
-"parentes (embora isso possa ser alterado, consulte a opção `--sparse` abaixo)"
-".  Se o commit foi uma mesclagem e também foi um 'TREESAME' para um parente, "
-"siga apenas este parente.  (Mesmo que haja vários parentes 'TREESAME', siga "
-"apenas um deles.) Caso contrário, siga todos."
+msgstr "Os commits serão incluídas caso não sejam 'TREESAME' para nenhum dos parentes (embora isso possa ser alterado, consulte a opção `--sparse` abaixo).  Se o commit foi uma mesclagem e também foi um 'TREESAME' para um parente, siga apenas este parente.  (Mesmo que haja vários parentes 'TREESAME', siga apenas um deles.) Caso contrário, siga todos."
 
 #. type: Plain text
 #: en/rev-list-options.txt:428
@@ -75310,20 +64557,13 @@ msgstr ""
 #: en/rev-list-options.txt:439
 #, priority:260
 msgid "Note how the rule to only follow the TREESAME parent, if one is available, removed `B` from consideration entirely.  `C` was considered via `N`, but is TREESAME.  Root commits are compared to an empty tree, so `I` is !TREESAME."
-msgstr ""
-"Observe como a regra para seguir apenas a origem TREESAME, caso haja um, "
-"removeu `B` completamente.  `C` foi considerado através do `N`, mas é o "
-"TREESAME.  Os commits raiz são comparadas com uma árvore vazia, então `I` é "
-"!TREESAME."
+msgstr "Observe como a regra para seguir apenas a origem TREESAME, caso haja um, removeu `B` completamente.  `C` foi considerado através do `N`, mas é o TREESAME.  Os commits raiz são comparadas com uma árvore vazia, então `I` é !TREESAME."
 
 #. type: Plain text
 #: en/rev-list-options.txt:443
 #, priority:260
 msgid "Parent/child relations are only visible with `--parents`, but that does not affect the commits selected in default mode, so we have shown the parent lines."
-msgstr ""
-"As relações entre pai/filho são visíveis apenas com `--parents`, porém isso "
-"não afeta os commits selecionados no modo predefinido, portanto, mostramos "
-"as linhas dos pais."
+msgstr "As relações entre pai/filho são visíveis apenas com `--parents`, porém isso não afeta os commits selecionados no modo predefinido, portanto, mostramos as linhas dos pais."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:444
@@ -75335,11 +64575,7 @@ msgstr "`--full-history` sem reescrita anterior"
 #: en/rev-list-options.txt:450
 #, priority:260
 msgid "This mode differs from the default in one point: always follow all parents of a merge, even if it is TREESAME to one of them.  Even if more than one side of the merge has commits that are included, this does not imply that the merge itself is! In the example, we get"
-msgstr ""
-"Este modo difere da predefinição em um ponto: sempre siga todos os pais de "
-"uma mesclagem, mesmo que seja 'TREESAME' para um deles.  Mesmo se mais de um "
-"lado da mesclagem tiver commits que estejam inclusos, isso não implica que a "
-"própria mesclagem seja! No exemplo, nós temos"
+msgstr "Este modo difere da predefinição em um ponto: sempre siga todos os pais de uma mesclagem, mesmo que seja 'TREESAME' para um deles.  Mesmo se mais de um lado da mesclagem tiver commits que estejam inclusos, isso não implica que a própria mesclagem seja! No exemplo, nós temos"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:453
@@ -75351,19 +64587,13 @@ msgstr "\tI  A  B  N  D  O  P  Q\n"
 #: en/rev-list-options.txt:458
 #, priority:260
 msgid "`M` was excluded because it is TREESAME to both parents.  `E`, `C` and `B` were all walked, but only `B` was !TREESAME, so the others do not appear."
-msgstr ""
-"O `M` foi excluído porque é 'TREESAME' para ambos os pais.  `E`, `C` e `B` "
-"foram todos percorridos, porém apenas `B` foi '!TREESAME', para que os "
-"outros não apareçam."
+msgstr "O `M` foi excluído porque é 'TREESAME' para ambos os pais.  `E`, `C` e `B` foram todos percorridos, porém apenas `B` foi '!TREESAME', para que os outros não apareçam."
 
 #. type: Plain text
 #: en/rev-list-options.txt:462
 #, priority:260
 msgid "Note that without parent rewriting, it is not really possible to talk about the parent/child relationships between the commits, so we show them disconnected."
-msgstr ""
-"Observe que, sem reescrever os pais, não é realmente possível falar sobre os "
-"relacionamentos pai/filho entre os commits, portanto, mostramos-lhes "
-"desconectados."
+msgstr "Observe que, sem reescrever os pais, não é realmente possível falar sobre os relacionamentos pai/filho entre os commits, portanto, mostramos-lhes desconectados."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:463
@@ -75375,18 +64605,13 @@ msgstr "`--full-history` com reescrita anterior"
 #: en/rev-list-options.txt:466
 #, priority:260
 msgid "Ordinary commits are only included if they are !TREESAME (though this can be changed, see `--sparse` below)."
-msgstr ""
-"Os commits comuns são incluídos apenas se forem '!TREESAME' (embora é "
-"possível alterar isso, consulte `--sparse` abaixo)."
+msgstr "Os commits comuns são incluídos apenas se forem '!TREESAME' (embora é possível alterar isso, consulte `--sparse` abaixo)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:470
 #, priority:260
 msgid "Merges are always included.  However, their parent list is rewritten: Along each parent, prune away commits that are not included themselves.  This results in"
-msgstr ""
-"As mesclagens estão sempre inclusas.  No entanto, sua lista de origens é "
-"reescrita: em cada origem, remova os commit que não foram inclusos.  Isto "
-"resulta no"
+msgstr "As mesclagens estão sempre inclusas.  No entanto, sua lista de origens é reescrita: em cada origem, remova os commit que não foram inclusos.  Isto resulta no"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:477
@@ -75408,27 +64633,19 @@ msgstr ""
 #: en/rev-list-options.txt:483
 #, priority:260
 msgid "Compare to `--full-history` without rewriting above.  Note that `E` was pruned away because it is TREESAME, but the parent list of P was rewritten to contain `E`'s parent `I`.  The same happened for `C` and `N`, and `X`, `Y` and `Q`."
-msgstr ""
-"Compare com a opção `--full-history` sem reescrever acima.  Observe que `E` "
-"foi removido porque é um 'TREESAME', porém a lista dos parentes `P` foi "
-"reescrita para conter `E` parente do `I`.  O mesmo aconteceu para `C` e `N`, "
-"e `X`, `Y` e `Q`."
+msgstr "Compare com a opção `--full-history` sem reescrever acima.  Observe que `E` foi removido porque é um 'TREESAME', porém a lista dos parentes `P` foi reescrita para conter `E` parente do `I`.  O mesmo aconteceu para `C` e `N`, e `X`, `Y` e `Q`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:486
 #, priority:260
 msgid "In addition to the above settings, you can change whether TREESAME affects inclusion:"
-msgstr ""
-"Além das configurações acima, é possível alterar se o 'TREESAME' afeta a "
-"inclusão:"
+msgstr "Além das configurações acima, é possível alterar se o 'TREESAME' afeta a inclusão:"
 
 #. type: Plain text
 #: en/rev-list-options.txt:490
 #, priority:260
 msgid "Commits that are walked are included if they are not TREESAME to any parent."
-msgstr ""
-"Os commits encaminhados serão incluídos caso não sejam um 'TREESAME' para "
-"nenhum dos parentes."
+msgstr "Os commits encaminhados serão incluídos caso não sejam um 'TREESAME' para nenhum dos parentes."
 
 #. type: Plain text
 #: en/rev-list-options.txt:493
@@ -75440,26 +64657,19 @@ msgstr "Todos os commits que forem passados serão incluidos."
 #: en/rev-list-options.txt:497
 #, priority:260
 msgid "Note that without `--full-history`, this still simplifies merges: if one of the parents is TREESAME, we follow only that one, so the other sides of the merge are never walked."
-msgstr ""
-"Observe que sem o `--full-history', isso ainda simplifica as mesclagens: "
-"caso um dos pais seja 'TREESAME', seguiremos apenas este, para que os outros "
-"lados da mesclagem nunca sejam percorridos."
+msgstr "Observe que sem o `--full-history', isso ainda simplifica as mesclagens: caso um dos pais seja 'TREESAME', seguiremos apenas este, para que os outros lados da mesclagem nunca sejam percorridos."
 
 #. type: Plain text
 #: en/rev-list-options.txt:501
 #, priority:260
 msgid "First, build a history graph in the same way that `--full-history` with parent rewriting does (see above)."
-msgstr ""
-"Primeiro, construa um grafo do histórico da mesma maneira que `--full-"
-"history` com a reescrita dos parentes (veja acima)."
+msgstr "Primeiro, construa um grafo do histórico da mesma maneira que `--full-history` com a reescrita dos parentes (veja acima)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:504
 #, priority:260
 msgid "Then simplify each commit `C` to its replacement `C'` in the final history according to the following rules:"
-msgstr ""
-"Simplifique cada commit `C` para a sua reposição `C'` no histórico final, de "
-"acordo com as seguintes regras:"
+msgstr "Simplifique cada commit `C` para a sua reposição `C'` no histórico final, de acordo com as seguintes regras:"
 
 #. type: Plain text
 #: en/rev-list-options.txt:507
@@ -75471,28 +64681,19 @@ msgstr "Defina `C'` para `C`."
 #: en/rev-list-options.txt:512
 #, priority:260
 msgid "Replace each parent `P` of `C'` with its simplification `P'`.  In the process, drop parents that are ancestors of other parents or that are root commits TREESAME to an empty tree, and remove duplicates, but take care to never drop all parents that we are TREESAME to."
-msgstr ""
-"Substitua cada pai `P` do `C'` por sua simplificação `P'`.  No processo, "
-"solte os pais que são ancestrais dos outros pais ou que os commits raiz "
-"'TREESAME' em uma árvore vazia e remova as duplicatas, porém tome cuidado "
-"para nunca descartar todos os pais já que somos 'TREESAME' também."
+msgstr "Substitua cada pai `P` do `C'` por sua simplificação `P'`.  No processo, solte os pais que são ancestrais dos outros pais ou que os commits raiz 'TREESAME' em uma árvore vazia e remova as duplicatas, porém tome cuidado para nunca descartar todos os pais já que somos 'TREESAME' também."
 
 #. type: Plain text
 #: en/rev-list-options.txt:516
 #, priority:260
 msgid "If after this parent rewriting, `C'` is a root or merge commit (has zero or >1 parents), a boundary commit, or !TREESAME, it remains.  Otherwise, it is replaced with its only parent."
-msgstr ""
-"Se após esta reescrita da origem, o `C'` for um commit raiz ou uma mesclagem "
-"(tem zero ou > origens), um commit limite ou !TREESAME, será mantido.  Caso "
-"contrário, será substituído pela sua única origem."
+msgstr "Se após esta reescrita da origem, o `C'` for um commit raiz ou uma mesclagem (tem zero ou > origens), um commit limite ou !TREESAME, será mantido.  Caso contrário, será substituído pela sua única origem."
 
 #. type: Plain text
 #: en/rev-list-options.txt:520
 #, priority:260
 msgid "The effect of this is best shown by way of comparing to `--full-history` with parent rewriting.  The example turns into:"
-msgstr ""
-"O efeito disso é melhor mostrado através da comparação com a opção `--full-"
-"history` com a reescrita dos pais.  O exemplo se transforma em:"
+msgstr "O efeito disso é melhor mostrado através da comparação com a opção `--full-history` com a reescrita dos pais.  O exemplo se transforma em:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:527
@@ -75520,26 +64721,19 @@ msgstr "Observe que as maiores diferenças entre `N`, `P`, e `Q` sobre `--full-h
 #: en/rev-list-options.txt:534
 #, priority:260
 msgid "`N`'s parent list had `I` removed, because it is an ancestor of the other parent `M`.  Still, `N` remained because it is !TREESAME."
-msgstr ""
-"A lista dos pais de `N` teve `I` removida, porque é um ancestral do outro "
-"pai `M`.  Ainda assim, `N` permaneceu porque é '!TREESAME'."
+msgstr "A lista dos pais de `N` teve `I` removida, porque é um ancestral do outro pai `M`.  Ainda assim, `N` permaneceu porque é '!TREESAME'."
 
 #. type: Plain text
 #: en/rev-list-options.txt:537
 #, priority:260
 msgid "`P`'s parent list similarly had `I` removed.  `P` was then removed completely, because it had one parent and is TREESAME."
-msgstr ""
-"A lista de pais de `P` também removeu o `I`.  O `P` foi então removido "
-"completamente, porque tinha um pai e é 'TREESAME'."
+msgstr "A lista de pais de `P` também removeu o `I`.  O `P` foi então removido completamente, porque tinha um pai e é 'TREESAME'."
 
 #. type: Plain text
 #: en/rev-list-options.txt:541
 #, priority:260
 msgid "`Q`'s parent list had `Y` simplified to `X`. `X` was then removed, because it was a TREESAME root. `Q` was then removed completely, because it had one parent and is TREESAME."
-msgstr ""
-"A lista de pais de `Q` tinha` Y` simplificado para `X`. O `X` foi então "
-"removido, porque era uma raiz 'TREESAME'. O `Q` foi removido completamente, "
-"porque tinha um pai e é 'TREESAME'."
+msgstr "A lista de pais de `Q` tinha` Y` simplificado para `X`. O `X` foi então removido, porque era uma raiz 'TREESAME'. O `Q` foi removido completamente, porque tinha um pai e é 'TREESAME'."
 
 #. type: Plain text
 #: en/rev-list-options.txt:544
@@ -75551,11 +64745,7 @@ msgstr "Há um outra modo de simplificação disponível:"
 #: en/rev-list-options.txt:550
 #, priority:260
 msgid "Limit the displayed commits to those directly on the ancestry chain between the ``from'' and ``to'' commits in the given commit range. I.e. only display commits that are ancestor of the ``to'' commit and descendants of the ``from'' commit."
-msgstr ""
-"Limite os commits exibidos àquelas diretamente na cadeia de ancestralidade "
-"entre os commits ``from'' e ``to'' no intervalo dos commits informados. Ou "
-"seja, exiba apenas os commits que são ancestrais do commit ``to'' ('para') e "
-"os descendentes do commit ``from''."
+msgstr "Limite os commits exibidos àquelas diretamente na cadeia de ancestralidade entre os commits ``from'' e ``to'' no intervalo dos commits informados. Ou seja, exiba apenas os commits que são ancestrais do commit ``to'' ('para') e os descendentes do commit ``from''."
 
 #. type: Plain text
 #: en/rev-list-options.txt:552
@@ -75583,23 +64773,13 @@ msgstr ""
 #: en/rev-list-options.txt:567
 #, priority:260
 msgid "A regular 'D..M' computes the set of commits that are ancestors of `M`, but excludes the ones that are ancestors of `D`. This is useful to see what happened to the history leading to `M` since `D`, in the sense that ``what does `M` have that did not exist in `D`''. The result in this example would be all the commits, except `A` and `B` (and `D` itself, of course)."
-msgstr ""
-"Um 'D..M' regular calcula o conjunto dos commits que são ancestrais do `M`, "
-"mas exclui os que são ancestrais do `D`. Isso é útil para ver o que "
-"aconteceu com a história que levou a `M` desde o `D`, no sentido que ``o que "
-"`M` possui e que não existia em `D`''. O resultado neste exemplo seria todos "
-"os commits, exceto `A` e `B` (e `D`, obviamente)."
+msgstr "Um 'D..M' regular calcula o conjunto dos commits que são ancestrais do `M`, mas exclui os que são ancestrais do `D`. Isso é útil para ver o que aconteceu com a história que levou a `M` desde o `D`, no sentido que ``o que `M` possui e que não existia em `D`''. O resultado neste exemplo seria todos os commits, exceto `A` e `B` (e `D`, obviamente)."
 
 #. type: Plain text
 #: en/rev-list-options.txt:573
 #, priority:260
 msgid "When we want to find out what commits in `M` are contaminated with the bug introduced by `D` and need fixing, however, we might want to view only the subset of 'D..M' that are actually descendants of `D`, i.e.  excluding `C` and `K`. This is exactly what the `--ancestry-path` option does. Applied to the 'D..M' range, it results in:"
-msgstr ""
-"Quando queremos descobrir o qual commit em `M` está contaminado com o bug "
-"introduzido por `D` e precisa ser corrigido, contudo, podemos querer "
-"visualizar apenas o subconjunto 'D..M' que são realmente descendentes do `D`"
-", como por exemplo, excluindo `C` e `K`. É exatamente isso que a opção "
-"`--ancestry-path` faz. Aplicado à faixa 'D..M', resulta em:"
+msgstr "Quando queremos descobrir o qual commit em `M` está contaminado com o bug introduzido por `D` e precisa ser corrigido, contudo, podemos querer visualizar apenas o subconjunto 'D..M' que são realmente descendentes do `D`, como por exemplo, excluindo `C` e `K`. É exatamente isso que a opção `--ancestry-path` faz. Aplicado à faixa 'D..M', resulta em:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:580
@@ -75621,20 +64801,13 @@ msgstr ""
 #: en/rev-list-options.txt:584
 #, priority:260
 msgid "Before discussing another option, `--show-pulls`, we need to create a new example history."
-msgstr ""
-"Antes de discutir outra opção, `--show-pulls`, precisamos criar um novo "
-"histórico de exemplo."
+msgstr "Antes de discutir outra opção, `--show-pulls`, precisamos criar um novo histórico de exemplo."
 
 #. type: Plain text
 #: en/rev-list-options.txt:589
 #, priority:260
 msgid "A common problem users face when looking at simplified history is that a commit they know changed a file somehow does not appear in the file's simplified history. Let's demonstrate a new example and show how options such as `--full-history` and `--simplify-merges` works in that case:"
-msgstr ""
-"Um problema comum que os usuários enfrentam ao examinar o histórico "
-"simplificado é que um commit que eles conhecem alterou um arquivo e que de "
-"alguma maneira não aparece no histórico simplificado do arquivo. Vamos "
-"demonstrar um novo exemplo e exibir como as opções como `--full-history` e "
-"`--simplify-merges` funcionam neste caso:"
+msgstr "Um problema comum que os usuários enfrentam ao examinar o histórico simplificado é que um commit que eles conhecem alterou um arquivo e que de alguma maneira não aparece no histórico simplificado do arquivo. Vamos demonstrar um novo exemplo e exibir como as opções como `--full-history` e `--simplify-merges` funcionam neste caso:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:597
@@ -75658,28 +64831,13 @@ msgstr ""
 #: en/rev-list-options.txt:610
 #, priority:260
 msgid "For this example, suppose `I` created `file.txt` which was modified by `A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`, and `Y` do not change `file.txt`. The merge commit `M` was created by resolving the merge conflict to include both changes from `A` and `B` and hence is not TREESAME to either. The merge commit `R`, however, was created by ignoring the contents of `file.txt` at `M` and taking only the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not `M`. Finally, the natural merge resolution to create `N` is to take the contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.  The merge commits `O` and `P` are TREESAME to their first parents, but not to their second parents, `Z` and `Y` respectively."
-msgstr ""
-"Para este exemplo, suponha que `I` tenha criado o `file.txt` que foi "
-"modificado por `A`, `B` e` X` de maneiras diferentes. O único parente fa o "
-"commit `C`, `Z` e `Y` não alteram o `file.txt`. O commit mesclado `M` foi "
-"criado resolvendo o conflito da mesclagem para incluir as alterações de `A` "
-"e `B`, portanto, também não é um 'TREESAME'. O commit mesclado `R`, no "
-"entanto, foi criado ignorando o conteúdo do `file.txt` no `M` e levando "
-"apenas o conteúdo de `file.txt` no `X`. Portanto, `R` é o 'TREESAME' para `X`"
-", mas não para `M`. Finalmente, a resolução de mesclagem natural para criar "
-"`N` é levar o conteúdo do `file.txt` para `R`, de modo onde `N` seja um "
-"'TREESAME' para `R`, mas não para `C`.  O commit mesclado `O` e `P` são "
-"'TREESAME' para seus primeiros parentes, mas não para seus os parentes "
-"secundários, `Z` e `Y` respectivamente."
+msgstr "Para este exemplo, suponha que `I` tenha criado o `file.txt` que foi modificado por `A`, `B` e` X` de maneiras diferentes. O único parente fa o commit `C`, `Z` e `Y` não alteram o `file.txt`. O commit mesclado `M` foi criado resolvendo o conflito da mesclagem para incluir as alterações de `A` e `B`, portanto, também não é um 'TREESAME'. O commit mesclado `R`, no entanto, foi criado ignorando o conteúdo do `file.txt` no `M` e levando apenas o conteúdo de `file.txt` no `X`. Portanto, `R` é o 'TREESAME' para `X`, mas não para `M`. Finalmente, a resolução de mesclagem natural para criar `N` é levar o conteúdo do `file.txt` para `R`, de modo onde `N` seja um 'TREESAME' para `R`, mas não para `C`.  O commit mesclado `O` e `P` são 'TREESAME' para seus primeiros parentes, mas não para seus os parentes secundários, `Z` e `Y` respectivamente."
 
 #. type: Plain text
 #: en/rev-list-options.txt:614
 #, priority:260
 msgid "When using the default mode, `N` and `R` both have a TREESAME parent, so those edges are walked and the others are ignored. The resulting history graph is:"
-msgstr ""
-"Ao utilizar os modos predefinidos, ambos os `N` e `R` tem um pai TREESAME, "
-"então aquelas bordas são percorridas e outras são ignoradas. E o grafo "
-"resultante no histórico é:"
+msgstr "Ao utilizar os modos predefinidos, ambos os `N` e `R` tem um pai TREESAME, então aquelas bordas são percorridas e outras são ignoradas. E o grafo resultante no histórico é:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:617
@@ -75691,10 +64849,7 @@ msgstr "\tI---X\n"
 #: en/rev-list-options.txt:622
 #, priority:260
 msgid "When using `--full-history`, Git walks every edge. This will discover the commits `A` and `B` and the merge `M`, but also will reveal the merge commits `O` and `P`. With parent rewriting, the resulting graph is:"
-msgstr ""
-"Ao utilizar a opção `--full-history`, O Git percorre cada canto. Descobre se "
-"os commits `A`, `B` e o mesclado `M`, porém também revela se o commit "
-"mesclado `O` e `P`. Com a reescrita do pai, o resultado do grafo é:"
+msgstr "Ao utilizar a opção `--full-history`, O Git percorre cada canto. Descobre se os commits `A`, `B` e o mesclado `M`, porém também revela se o commit mesclado `O` e `P`. Com a reescrita do pai, o resultado do grafo é:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:630
@@ -75718,26 +64873,13 @@ msgstr ""
 #: en/rev-list-options.txt:638
 #, priority:260
 msgid "Here, the merge commits `O` and `P` contribute extra noise, as they did not actually contribute a change to `file.txt`. They only merged a topic that was based on an older version of `file.txt`. This is a common issue in repositories using a workflow where many contributors work in parallel and merge their topic branches along a single trunk: manu unrelated merges appear in the `--full-history` results."
-msgstr ""
-"Aqui, a mesclagem do commit `O` e `P` contribuem com um ruído extra, pois na "
-"verdade não contribuíram com uma alteração no `file.txt`. Eles mesclaram "
-"apenas um 'topic' com base numa versão mais antiga do `file.txt`. Este é um "
-"problema comum em repositórios que utilizam um fluxo de trabalho onde que "
-"muitos colaboradores trabalham em paralelo e mesclam as suas ramificações "
-"dos tópicos em um único \"trunk\": as mesclagens não relacionadas ao manu "
-"aparecem nos resultados do comando `--full-history`."
+msgstr "Aqui, a mesclagem do commit `O` e `P` contribuem com um ruído extra, pois na verdade não contribuíram com uma alteração no `file.txt`. Eles mesclaram apenas um 'topic' com base numa versão mais antiga do `file.txt`. Este é um problema comum em repositórios que utilizam um fluxo de trabalho onde que muitos colaboradores trabalham em paralelo e mesclam as suas ramificações dos tópicos em um único \"trunk\": as mesclagens não relacionadas ao manu aparecem nos resultados do comando `--full-history`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:645
 #, priority:260
 msgid "When using the `--simplify-merges` option, the commits `O` and `P` disappear from the results. This is because the rewritten second parents of `O` and `P` are reachable from their first parents. Those edges are removed and then the commits look like single-parent commits that are TREESAME to their parent. This also happens to the commit `N`, resulting in a history view as follows:"
-msgstr ""
-"Ao utilizar a opção `--simplify-merges`, os commits `O` e `P` desaparecem "
-"dos resultados. Pois as reescritas do segundo pai de `O` e `P` são "
-"acessíveis a partir dos seus primeiros pais. Estes cantos são removidos e "
-"então os commits se parecem com commits com pai singular só que são TREESAME "
-"em relação aos seus pais. Isso também acontece ao commit `N`, resultando no "
-"histórico a seguir:"
+msgstr "Ao utilizar a opção `--simplify-merges`, os commits `O` e `P` desaparecem dos resultados. Pois as reescritas do segundo pai de `O` e `P` são acessíveis a partir dos seus primeiros pais. Estes cantos são removidos e então os commits se parecem com commits com pai singular só que são TREESAME em relação aos seus pais. Isso também acontece ao commit `N`, resultando no histórico a seguir:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:653
@@ -75761,56 +64903,31 @@ msgstr ""
 #: en/rev-list-options.txt:660
 #, priority:260
 msgid "In this view, we see all of the important single-parent changes from `A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the not-so-carefully-resolved merge `R`. This is usually enough information to determine why the commits `A` and `B` \"disappeared\" from history in the default view. However, there are a few issues with this approach."
-msgstr ""
-"Nesta visão, vemos todas as alterações importantes da única origem vindas de "
-"`A`, `B` e `X`. Também vemos a mesclagem cuidadosamente resolvida de `M` e a "
-"mesclagem nem tão bem resolvida do `R`. Geralmente são informações "
-"suficientes para determinar por que os commit `A` e `B` \"desapareceram\" do "
-"histórico na visualização predefinida. No entanto, existem alguns problemas "
-"com esta abordagem."
+msgstr "Nesta visão, vemos todas as alterações importantes da única origem vindas de `A`, `B` e `X`. Também vemos a mesclagem cuidadosamente resolvida de `M` e a mesclagem nem tão bem resolvida do `R`. Geralmente são informações suficientes para determinar por que os commit `A` e `B` \"desapareceram\" do histórico na visualização predefinida. No entanto, existem alguns problemas com esta abordagem."
 
 #. type: Plain text
 #: en/rev-list-options.txt:665
 #, priority:260
 msgid "The first issue is performance. Unlike any previous option, the `--simplify-merges` option requires walking the entire commit history before returning a single result. This can make the option difficult to use for very large repositories."
-msgstr ""
-"O primeiro problema é o desempenho. Diferente das opções anteriores, a opção "
-"`--simplify-merges` precisa percorrer todo o histórico do commit antes de "
-"retornar um único resultado. Isso pode fazer com que a opção seja difícil de "
-"usar em repositórios muito grandes."
+msgstr "O primeiro problema é o desempenho. Diferente das opções anteriores, a opção `--simplify-merges` precisa percorrer todo o histórico do commit antes de retornar um único resultado. Isso pode fazer com que a opção seja difícil de usar em repositórios muito grandes."
 
 #. type: Plain text
 #: en/rev-list-options.txt:674
 #, priority:260
 msgid "The second issue is one of auditing. When many contributors are working on the same repository, it is important which merge commits introduced a change into an important branch. The problematic merge `R` above is not likely to be the merge commit that was used to merge into an important branch. Instead, the merge `N` was used to merge `R` and `X` into the important branch. This commit may have information about why the change `X` came to override the changes from `A` and `B` in its commit message."
-msgstr ""
-"O segundo problema é a auditoria. Quando muitos colaboradores estão "
-"trabalhando no mesmo repositório, é importante saber qual mesclagem do "
-"commit introduziu uma importante alteração no ramo. A mesclagem problemática "
-"`R` acima não parece ser o commit mesclado que foi utilizado na mesclagem de "
-"um ramo importante. Em vez disso, a mesclagem `N` foi utilizada para mesclar "
-"`R` e `X` em um importante ramo. Este commit por ter informação sobre o por "
-"que do `X` chegou a substituir as alterações do `A` e `B` em suas mensagens "
-"do commit."
+msgstr "O segundo problema é a auditoria. Quando muitos colaboradores estão trabalhando no mesmo repositório, é importante saber qual mesclagem do commit introduziu uma importante alteração no ramo. A mesclagem problemática `R` acima não parece ser o commit mesclado que foi utilizado na mesclagem de um ramo importante. Em vez disso, a mesclagem `N` foi utilizada para mesclar `R` e `X` em um importante ramo. Este commit por ter informação sobre o por que do `X` chegou a substituir as alterações do `A` e `B` em suas mensagens do commit."
 
 #. type: Plain text
 #: en/rev-list-options.txt:679
 #, priority:260
 msgid "In addition to the commits shown in the default history, show each merge commit that is not TREESAME to its first parent but is TREESAME to a later parent."
-msgstr ""
-"Além dos commits exibidos no histórico predefinido, exiba cada mesclagem do "
-"commit que não seja 'TREESAME' para o primeiro parente, porém que seja "
-"'TREESAME' para um parente posterior."
+msgstr "Além dos commits exibidos no histórico predefinido, exiba cada mesclagem do commit que não seja 'TREESAME' para o primeiro parente, porém que seja 'TREESAME' para um parente posterior."
 
 #. type: Plain text
 #: en/rev-list-options.txt:684
 #, priority:260
 msgid "When a merge commit is included by `--show-pulls`, the merge is treated as if it \"pulled\" the change from another branch. When using `--show-pulls` on this example (and no other options) the resulting graph is:"
-msgstr ""
-"Quando a mesclagem de um commit é incluso pela opção `--show-pulls`, a "
-"mesclagem é tratada como tivesse \"capturado\" as alterações de um outro "
-"ramo. Ao usar a opção `--show-pulls` nest exemplo (e em nenhuma outra opção) "
-"o grafo resultante é:"
+msgstr "Quando a mesclagem de um commit é incluso pela opção `--show-pulls`, a mesclagem é tratada como tivesse \"capturado\" as alterações de um outro ramo. Ao usar a opção `--show-pulls` nest exemplo (e em nenhuma outra opção) o grafo resultante é:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:687
@@ -75822,18 +64939,13 @@ msgstr "\tI---X---R---N\n"
 #: en/rev-list-options.txt:693
 #, priority:260
 msgid "Here, the merge commits `R` and `N` are included because they pulled the commits `X` and `R` into the base branch, respectively. These merges are the reason the commits `A` and `B` do not appear in the default history."
-msgstr ""
-"Aqui, a mesclagem do commit `R` e `N` são incluídos porque obtiveram os "
-"commits `X` e `R` para o ramo base, respectivamente. Essas mesclagens são a "
-"razão pela qual os commits `A` e `B` não aparecem no histórico predefinido."
+msgstr "Aqui, a mesclagem do commit `R` e `N` são incluídos porque obtiveram os commits `X` e `R` para o ramo base, respectivamente. Essas mesclagens são a razão pela qual os commits `A` e `B` não aparecem no histórico predefinido."
 
 #. type: Plain text
 #: en/rev-list-options.txt:696
 #, priority:260
 msgid "When `--show-pulls` is paired with `--simplify-merges`, the graph includes all of the necessary information:"
-msgstr ""
-"Quando a opção `--show-pulls` for usado em conjunto com `--simplify-merges`, "
-"o grafo incluí todas as informações necessárias:"
+msgstr "Quando a opção `--show-pulls` for usado em conjunto com `--simplify-merges`, o grafo incluí todas as informações necessárias:"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:704
@@ -75857,24 +64969,13 @@ msgstr ""
 #: en/rev-list-options.txt:710
 #, priority:260
 msgid "Notice that since `M` is reachable from `R`, the edge from `N` to `M` was simplified away. However, `N` still appears in the history as an important commit because it \"pulled\" the change `R` into the main branch."
-msgstr ""
-"Repare que desde que `M` seja acessível de `R`, o canto de `N` para `M` foi "
-"simplificado. No entanto, o `N` ainda aparece no histórico como um commit "
-"importante porque ele \"obteve\" as alterações vindas de `R` para o ramo "
-"principal."
+msgstr "Repare que desde que `M` seja acessível de `R`, o canto de `N` para `M` foi simplificado. No entanto, o `N` ainda aparece no histórico como um commit importante porque ele \"obteve\" as alterações vindas de `R` para o ramo principal."
 
 #. type: Plain text
 #: en/rev-list-options.txt:718
 #, priority:260
 msgid "The `--simplify-by-decoration` option allows you to view only the big picture of the topology of the history, by omitting commits that are not referenced by tags.  Commits are marked as !TREESAME (in other words, kept after history simplification rules described above) if (1) they are referenced by tags, or (2) they change the contents of the paths given on the command line.  All other commits are marked as TREESAME (subject to be simplified away)."
-msgstr ""
-"A opção `--simplify-by-decoration` permite exibir apenas o quadro geral da "
-"topologia do histórico, omitindo os commits que não sejam referenciadas "
-"pelas tags.  Os commits são marcadas como '!TREESAME' (em outras palavras, "
-"mantidas após as regras da simplificação do histórico descritas acima) caso "
-"(1) sejam referenciadas pelas tags ou (2) alteram o conteúdo dos caminhos "
-"usados na linha de comando.  Todos os outros commits são marcados como "
-"'TREESAME' (assunto que será simplificado)."
+msgstr "A opção `--simplify-by-decoration` permite exibir apenas o quadro geral da topologia do histórico, omitindo os commits que não sejam referenciadas pelas tags.  Os commits são marcadas como '!TREESAME' (em outras palavras, mantidas após as regras da simplificação do histórico descritas acima) caso (1) sejam referenciadas pelas tags ou (2) alteram o conteúdo dos caminhos usados na linha de comando.  Todos os outros commits são marcados como 'TREESAME' (assunto que será simplificado)."
 
 #. type: Title ~
 #: en/rev-list-options.txt:722
@@ -75886,13 +64987,7 @@ msgstr "Auxiliares da Bisseção"
 #: en/rev-list-options.txt:731
 #, priority:260
 msgid "Limit output to the one commit object which is roughly halfway between included and excluded commits. Note that the bad bisection ref `refs/bisect/bad` is added to the included commits (if it exists) and the good bisection refs `refs/bisect/good-*` are added to the excluded commits (if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
-msgstr ""
-"Limite a geração do objeto para um único commit, que fica aproximadamente a "
-"meio caminho entre os commits incluídos e excluídos. Observe que a bisseção "
-"da \"ref\" ruim `refs/bisect/bad` é adicionada aos commits incluídos (caso "
-"existam) e a bisseção das boas refs `refs/bisect/good-*` é adicionada aos "
-"commits excluídos (caso existam). Assim, supondo que não haja nenhuma refs "
-"em `refs/bisect/`, se"
+msgstr "Limite a geração do objeto para um único commit, que fica aproximadamente a meio caminho entre os commits incluídos e excluídos. Observe que a bisseção da \"ref\" ruim `refs/bisect/bad` é adicionada aos commits incluídos (caso existam) e a bisseção das boas refs `refs/bisect/good-*` é adicionada aos commits excluídos (caso existam). Assim, supondo que não haja nenhuma refs em `refs/bisect/`, se"
 
 #. type: delimited block -
 #: en/rev-list-options.txt:734
@@ -75920,11 +65015,7 @@ msgstr ""
 #: en/rev-list-options.txt:747
 #, priority:260
 msgid "would be of roughly the same length.  Finding the change which introduces a regression is thus reduced to a binary search: repeatedly generate and test new 'midpoint's until the commit chain is of length one. Cannot be combined with --first-parent."
-msgstr ""
-"teria aproximadamente o mesmo comprimento.  Encontrando a alteração que "
-"introduz uma regressão é assim reduzida a uma pesquisa binária: gere e teste "
-"repetidamente novos 'pontos intermediários' até que a cadeia dos commits "
-"tenha o comprimento de um. Não pode ser combinado com `--first-parent`."
+msgstr "teria aproximadamente o mesmo comprimento.  Encontrando a alteração que introduz uma regressão é assim reduzida a uma pesquisa binária: gere e teste repetidamente novos 'pontos intermediários' até que a cadeia dos commits tenha o comprimento de um. Não pode ser combinado com `--first-parent`."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:748
@@ -75936,16 +65027,7 @@ msgstr "--bisect-vars"
 #: en/rev-list-options.txt:759
 #, priority:260
 msgid "This calculates the same as `--bisect`, except that refs in `refs/bisect/` are not used, and except that this outputs text ready to be eval'ed by the shell. These lines will assign the name of the midpoint revision to the variable `bisect_rev`, and the expected number of commits to be tested after `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be tested if `bisect_rev` turns out to be good to `bisect_good`, the expected number of commits to be tested if `bisect_rev` turns out to be bad to `bisect_bad`, and the number of commits we are bisecting right now to `bisect_all`."
-msgstr ""
-"Calcula o mesmo que `--bisect`, exceto que as refs no `refs/bisect/` não são "
-"usados e a menos que isso gere um texto pronto para ser avaliado pelo shell. "
-"Essas linhas atribuirão o nome da revisão do ponto intermediário à variável "
-"`bisect_rev`, e a quantidade esperada dos commits que serão testados depois "
-"que `bisect_rev` for testado como `bisect_nr`, a quantidade esperada dos "
-"commits que serão testados caso `bisect_rev` acabe sendo bom para "
-"`bisect_good`, a quantidade esperada dos commits que serão testados caso "
-"`bisect_rev` acabe sendo ruim para `bisect_bad`, a quantidade esperada dos "
-"commits que agora estamos fazendo o bisseção para `bisect_all`."
+msgstr "Calcula o mesmo que `--bisect`, exceto que as refs no `refs/bisect/` não são usados e a menos que isso gere um texto pronto para ser avaliado pelo shell. Essas linhas atribuirão o nome da revisão do ponto intermediário à variável `bisect_rev`, e a quantidade esperada dos commits que serão testados depois que `bisect_rev` for testado como `bisect_nr`, a quantidade esperada dos commits que serão testados caso `bisect_rev` acabe sendo bom para `bisect_good`, a quantidade esperada dos commits que serão testados caso `bisect_rev` acabe sendo ruim para `bisect_bad`, a quantidade esperada dos commits que agora estamos fazendo o bisseção para `bisect_all`."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:760
@@ -75957,11 +65039,7 @@ msgstr "--bisect-all"
 #: en/rev-list-options.txt:766
 #, priority:260
 msgid "This outputs all the commit objects between the included and excluded commits, ordered by their distance to the included and excluded commits. Refs in `refs/bisect/` are not used. The farthest from them is displayed first. (This is the only one displayed by `--bisect`.)"
-msgstr ""
-"Gera todos os objetos commit entre os commits incluídos e excluídos, "
-"ordenadas pela distância entre os commits incluídos e excluídos. As "
-"referências em `refs/bisect/` não são usadas. O mais distante deles é "
-"exibido primeiro. (Este é o único exibido através do `--bisect`.)"
+msgstr "Gera todos os objetos commit entre os commits incluídos e excluídos, ordenadas pela distância entre os commits incluídos e excluídos. As referências em `refs/bisect/` não são usadas. O mais distante deles é exibido primeiro. (Este é o único exibido através do `--bisect`.)"
 
 #. type: Plain text
 #: en/rev-list-options.txt:770
@@ -76045,9 +65123,7 @@ msgstr "Com `--topo-order`, eles demonstrariam 8 6 5 3 7 4 2 1 (ou 8 7 4 2 6 5 3
 #: en/rev-list-options.txt:819
 #, priority:260
 msgid "Output the commits chosen to be shown (see Commit Limiting section above) in reverse order. Cannot be combined with `--walk-reflogs`."
-msgstr ""
-"Envie os commits escolhidos para serem exibidos (consulte a seção Limite do "
-"Commit acima) na ordem inversa. Não pode ser combinado com `--walk-reflogs`."
+msgstr "Envie os commits escolhidos para serem exibidos (consulte a seção Limite do Commit acima) na ordem inversa. Não pode ser combinado com `--walk-reflogs`."
 
 #. type: Title ~
 #: en/rev-list-options.txt:823
@@ -76071,11 +65147,7 @@ msgstr "--objects"
 #: en/rev-list-options.txt:833
 #, priority:260
 msgid "Print the object IDs of any object referenced by the listed commits.  `--objects foo ^bar` thus means ``send me all object IDs which I need to download if I have the commit object _bar_ but not _foo_''."
-msgstr ""
-"Imprima as IDs do objeto de qualquer objeto referenciado pelos commits "
-"listados.  Os `--objects foo ^bar` significa, portanto, ``me envie todas as "
-"IDs dos objetos que eu preciso baixar caso eu tenha o objeto commit _bar_ "
-"mas não _foo_''."
+msgstr "Imprima as IDs do objeto de qualquer objeto referenciado pelos commits listados.  Os `--objects foo ^bar` significa, portanto, ``me envie todas as IDs dos objetos que eu preciso baixar caso eu tenha o objeto commit _bar_ mas não _foo_''."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:834
@@ -76087,9 +65159,7 @@ msgstr "--in-commit-order"
 #: en/rev-list-options.txt:838
 #, priority:260
 msgid "Print tree and blob ids in order of the commits. The tree and blob ids are printed after they are first referenced by a commit."
-msgstr ""
-"Imprima as IDs da árvore e da bolha na ordem dos commit. As IDs da árvore e "
-"da bolha são impressas após serem referenciados pelo commit."
+msgstr "Imprima as IDs da árvore e da bolha na ordem dos commit. As IDs da árvore e da bolha são impressas após serem referenciados pelo commit."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:839
@@ -76101,12 +65171,7 @@ msgstr "--objects-edge"
 #: en/rev-list-options.txt:845
 #, priority:260
 msgid "Similar to `--objects`, but also print the IDs of excluded commits prefixed with a ``-'' character.  This is used by linkgit:git-pack-objects[1] to build a ``thin'' pack, which records objects in deltified form based on objects contained in these excluded commits to reduce network traffic."
-msgstr ""
-"Semelhante a opção `--objects`, porém também imprime as IDs dos commits que "
-"foram excluídos e prefixados com um caractere ``-''.  Isso é usado pelo "
-"linkgit:git-pack-objects[1] para criar um pacote ``thin'', que registra os "
-"objetos em um formato \"deltificado\" com base nos objetos existentes nestes "
-"commits excluídos para reduzir o tráfego da rede."
+msgstr "Semelhante a opção `--objects`, porém também imprime as IDs dos commits que foram excluídos e prefixados com um caractere ``-''.  Isso é usado pelo linkgit:git-pack-objects[1] para criar um pacote ``thin'', que registra os objetos em um formato \"deltificado\" com base nos objetos existentes nestes commits excluídos para reduzir o tráfego da rede."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:846
@@ -76118,10 +65183,7 @@ msgstr "--objects-edge-aggressive"
 #: en/rev-list-options.txt:850
 #, priority:260
 msgid "Similar to `--objects-edge`, but it tries harder to find excluded commits at the cost of increased time.  This is used instead of `--objects-edge` to build ``thin'' packs for shallow repositories."
-msgstr ""
-"Semelhante a opção `--objects-edge`, porém se esforça mais para localizar os "
-"commits excluídos com o custo do tempo aumentado.  É usado em vez da opão  "
-"`--objects-edge` para criar os pacotes ``thin'' para os repositórios rasos."
+msgstr "Semelhante a opção `--objects-edge`, porém se esforça mais para localizar os commits excluídos com o custo do tempo aumentado.  É usado em vez da opão  `--objects-edge` para criar os pacotes ``thin'' para os repositórios rasos."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:851
@@ -76133,18 +65195,13 @@ msgstr "--indexed-objects"
 #: en/rev-list-options.txt:855
 #, priority:260
 msgid "Pretend as if all trees and blobs used by the index are listed on the command line.  Note that you probably want to use `--objects`, too."
-msgstr ""
-"Finja como se todas as árvores e as bolhas usadas pelo índice estivessem "
-"listados na linha de comando.  Observe que você provavelmente queira "
-"utilizar a opção `--objects` também."
+msgstr "Finja como se todas as árvores e as bolhas usadas pelo índice estivessem listados na linha de comando.  Observe que você provavelmente queira utilizar a opção `--objects` também."
 
 #. type: Plain text
 #: en/rev-list-options.txt:859
 #, priority:260
 msgid "Only useful with `--objects`; print the object IDs that are not in packs."
-msgstr ""
-"Útil apenas com a opção `--objects`; imprima as IDs do objeto que não "
-"estejam nos pacotes."
+msgstr "Útil apenas com a opção `--objects`; imprima as IDs do objeto que não estejam nos pacotes."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:860
@@ -76168,20 +65225,13 @@ msgstr "--no-object-names"
 #: en/rev-list-options.txt:869
 #, priority:260
 msgid "Only useful with `--objects`; does not print the names of the object IDs that are found. This inverts `--object-names`. This flag allows the output to be more easily parsed by commands such as linkgit:git-cat-file[1]."
-msgstr ""
-"Útil apenas com a opção `--objects`; não imprima os nomes das IDs dos "
-"objetos que forem encontrados. Isto inverte a opção `--object-names`. Esta "
-"opção permite que a saída seja analisada mais facilmente por comandos como "
-"linkgit:git-cat-file[1]."
+msgstr "Útil apenas com a opção `--objects`; não imprima os nomes das IDs dos objetos que forem encontrados. Isto inverte a opção `--object-names`. Esta opção permite que a saída seja analisada mais facilmente por comandos como linkgit:git-cat-file[1]."
 
 #. type: Plain text
 #: en/rev-list-options.txt:874
 #, priority:260
 msgid "Only useful with one of the `--objects*`; omits objects (usually blobs) from the list of printed objects.  The '<filter-spec>' may be one of the following:"
-msgstr ""
-"Útil apenas com um dos objetos `--objects*`; omite os objetos (geralmente "
-"bolhas) da lista dos objetos impressos.  O '<filter-spec>' pode ser um dos "
-"seguintes:"
+msgstr "Útil apenas com um dos objetos `--objects*`; omite os objetos (geralmente bolhas) da lista dos objetos impressos.  O '<filter-spec>' pode ser um dos seguintes:"
 
 #. type: Plain text
 #: en/rev-list-options.txt:876
@@ -76193,78 +65243,43 @@ msgstr "O formulário '--filter=blob:none' omite todos as \"gotas\"."
 #: en/rev-list-options.txt:881
 #, priority:260
 msgid "The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or units.  n may be zero.  The suffixes k, m, and g can be used to name units in KiB, MiB, or GiB.  For example, 'blob:limit=1k' is the same as 'blob:limit=1024'."
-msgstr ""
-"O formulário '--filter=blob:limit=<n>[kmg]' omite as bolhas que forem "
-"maiores que 'n' bytes ou unidades.  O 'n' pode ser zero.  Os sufixos 'k', "
-"'m' e 'g' podem ser utilizados para nomear as unidades em 'KiB', 'MiB' ou "
-"'GiB'.  Como, por exemplo, ''blob:limit=1k'' é o mesmo que 'blob:limit=1024'."
+msgstr "O formulário '--filter=blob:limit=<n>[kmg]' omite as bolhas que forem maiores que 'n' bytes ou unidades.  O 'n' pode ser zero.  Os sufixos 'k', 'm' e 'g' podem ser utilizados para nomear as unidades em 'KiB', 'MiB' ou 'GiB'.  Como, por exemplo, ''blob:limit=1k'' é o mesmo que 'blob:limit=1024'."
 
 #. type: Plain text
 #: en/rev-list-options.txt:886
 #, priority:260
 msgid "The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout specification contained in the blob (or blob-expression) '<blob-ish>' to omit blobs that would not be not required for a sparse checkout on the requested refs."
-msgstr ""
-"O formulário '--filter=sparse:oid=<blob-ish>' usa uma especificação de "
-"verificação esparsa contida na bolha (ou expressão bolha) '<blob-ish>' para "
-"omitir as bolhas que não seriam necessárias em uma verificação esparsa nas "
-"referências solicitadas."
+msgstr "O formulário '--filter=sparse:oid=<blob-ish>' usa uma especificação de verificação esparsa contida na bolha (ou expressão bolha) '<blob-ish>' para omitir as bolhas que não seriam necessárias em uma verificação esparsa nas referências solicitadas."
 
 #. type: Plain text
 #: en/rev-list-options.txt:896
 #, priority:260
 msgid "The form '--filter=tree:<depth>' omits all blobs and trees whose depth from the root tree is >= <depth> (minimum depth if an object is located at multiple depths in the commits traversed). <depth>=0 will not include any trees or blobs unless included explicitly in the command-line (or standard input when --stdin is used). <depth>=1 will include only the tree and blobs which are referenced directly by a commit reachable from <commit> or an explicitly-given object. <depth>=2 is like <depth>=1 while also including trees and blobs one more level removed from an explicitly-given commit or tree."
-msgstr ""
-"O formulário '--filter=tree:<profundidade>' omite todas as bolhas e as "
-"árvores cuja profundidade da árvore raiz seja >= <profundidade> (a "
-"profundidade mínima caso um objeto estiver localizado em várias "
-"profundidades nos commits que forem percorridos). A <profundidade>=0 não "
-"incluirá nenhuma árvore ou bolhas, a menos que seja incluso de forma "
-"explícita na linha de comando (ou na entrada padrão quando stdin seja usado) "
-"A <profundidade>=1 incluirá apenas a árvore e as bolhas que são "
-"referenciados diretamente por um commit acessível de um objeto informado de "
-"forma explícita. A <profundidade>=2 é semelhante a <profundidade>=1 enquanto "
-"também inclui as árvores e as bolhas, mais um nível removido de um commit ou "
-"da árvore informada de forma explicita."
+msgstr "O formulário '--filter=tree:<profundidade>' omite todas as bolhas e as árvores cuja profundidade da árvore raiz seja >= <profundidade> (a profundidade mínima caso um objeto estiver localizado em várias profundidades nos commits que forem percorridos). A <profundidade>=0 não incluirá nenhuma árvore ou bolhas, a menos que seja incluso de forma explícita na linha de comando (ou na entrada padrão quando stdin seja usado) A <profundidade>=1 incluirá apenas a árvore e as bolhas que são referenciados diretamente por um commit acessível de um objeto informado de forma explícita. A <profundidade>=2 é semelhante a <profundidade>=1 enquanto também inclui as árvores e as bolhas, mais um nível removido de um commit ou da árvore informada de forma explicita."
 
 #. type: Plain text
 #: en/rev-list-options.txt:900
 #, priority:260
 msgid "Note that the form '--filter=sparse:path=<path>' that wants to read from an arbitrary path on the filesystem has been dropped for security reasons."
-msgstr ""
-"Observe que o formulário '--filter=sparse:path=<caminho>' deseja ler de um "
-"caminho arbitrário no sistema de arquivos que foi descartado por motivos de "
-"segurança."
+msgstr "Observe que o formulário '--filter=sparse:path=<caminho>' deseja ler de um caminho arbitrário no sistema de arquivos que foi descartado por motivos de segurança."
 
 #. type: Plain text
 #: en/rev-list-options.txt:903
 #, priority:260
 msgid "Multiple '--filter=' flags can be specified to combine filters. Only objects which are accepted by every filter are included."
-msgstr ""
-"Várias opções `--filter=` podem ser utilizados para fazer a combinação dos "
-"filtros. Somente os objetos que são aceitos por todos os filtros serão "
-"incluídos."
+msgstr "Várias opções `--filter=` podem ser utilizados para fazer a combinação dos filtros. Somente os objetos que são aceitos por todos os filtros serão incluídos."
 
 #. type: Plain text
 #: en/rev-list-options.txt:912
 #, ignore-ellipsis, priority:260
 msgid "The form '--filter=combine:<filter1>+<filter2>+...<filterN>' can also be used to combined several filters, but this is harder than just repeating the '--filter' flag and is usually not necessary. Filters are joined by '{plus}' and individual filters are %-encoded (i.e. URL-encoded).  Besides the '{plus}' and '%' characters, the following characters are reserved and also must be encoded: `~!@#$^&*()[]{}\\;\",<>?`+&#39;&#96;+ as well as all characters with ASCII code &lt;= `0x20`, which includes space and newline."
-msgstr ""
-"O formulário '--filter=combine:<filter1>+<filter2>+...<filterN>' também pode "
-"ser usado para combinar vários filtros, mas isso é mais difícil do que "
-"apenas repetir o comando '--filter' e geralmente não é necessário. Os "
-"filtros são unidos pelo '{plus}' e os filtros individuais são %-codificados ("
-"ou seja, URL-codificada).  Além dos caracteres '{plus}' e '%' os seguintes "
-"caracteres são reservados e também devem ser codificados: `~!@#$^&*()[]{}\\;"
-"\",<>?`+&#39;&#96;+ assim como todos os caracteres com código ASCII &lt;= "
-"`0x20`, que inclui espaço e nova linha."
+msgstr "O formulário '--filter=combine:<filter1>+<filter2>+...<filterN>' também pode ser usado para combinar vários filtros, mas isso é mais difícil do que apenas repetir o comando '--filter' e geralmente não é necessário. Os filtros são unidos pelo '{plus}' e os filtros individuais são %-codificados (ou seja, URL-codificada).  Além dos caracteres '{plus}' e '%' os seguintes caracteres são reservados e também devem ser codificados: `~!@#$^&*()[]{}\\;\",<>?`+&#39;&#96;+ assim como todos os caracteres com código ASCII &lt;= `0x20`, que inclui espaço e nova linha."
 
 #. type: Plain text
 #: en/rev-list-options.txt:916
 #, priority:260
 msgid "Other arbitrary characters can also be encoded. For instance, 'combine:tree:3+blob:none' and 'combine:tree%3A3+blob%3Anone' are equivalent."
-msgstr ""
-"Outros caracteres arbitrários também podem ser codificados. Por exemplo, "
-"'combine:tree:3+blob:none' e 'combine:tree%3A3+blob%3Anone' são equivalentes."
+msgstr "Outros caracteres arbitrários também podem ser codificados. Por exemplo, 'combine:tree:3+blob:none' e 'combine:tree%3A3+blob%3Anone' são equivalentes."
 
 #. type: Plain text
 #: en/rev-list-options.txt:919
@@ -76282,9 +65297,7 @@ msgstr "--filter-print-omitted"
 #: en/rev-list-options.txt:923
 #, priority:260
 msgid "Only useful with `--filter=`; prints a list of the objects omitted by the filter.  Object IDs are prefixed with a ``~'' character."
-msgstr ""
-"Útil apenas com a opção `--filter=`; imprime uma lista dos objetos omitidos "
-"pelo filtro.  As IDs dos objeto são prefixadas com um caractere ``~''."
+msgstr "Útil apenas com a opção `--filter=`; imprime uma lista dos objetos omitidos pelo filtro.  As IDs dos objeto são prefixadas com um caractere ``~''."
 
 #. type: Plain text
 #: en/rev-list-options.txt:930
@@ -76368,14 +65381,7 @@ msgstr "--date=<formato>"
 #: en/rev-list-options.txt:985
 #, priority:260
 msgid "Only takes effect for dates shown in human-readable format, such as when using `--pretty`. `log.date` config variable sets a default value for the log command's `--date` option. By default, dates are shown in the original time zone (either committer's or author's). If `-local` is appended to the format (e.g., `iso-local`), the user's local time zone is used instead."
-msgstr ""
-"Somente entra em vigor para as datas demonstradas no formato legível para as "
-"pessoas como utilizada na opção `--pretty`. A variável de configuração `log."
-"date` define um valor predefinido para a opção `--date` do comando do "
-"registro log. É predefinido que os horários sejam exibidas no fuso horário "
-"original (do autor do commit ou do autor). Caso `-local` seja anexado ao "
-"formato (por exemplo,`iso-local`), o fuso horário local do usuário será "
-"utilizado."
+msgstr "Somente entra em vigor para as datas demonstradas no formato legível para as pessoas como utilizada na opção `--pretty`. A variável de configuração `log.date` define um valor predefinido para a opção `--date` do comando do registro log. É predefinido que os horários sejam exibidas no fuso horário original (do autor do commit ou do autor). Caso `-local` seja anexado ao formato (por exemplo,`iso-local`), o fuso horário local do usuário será utilizado."
 
 #. type: Plain text
 #: en/rev-list-options.txt:990
@@ -76417,17 +65423,13 @@ msgstr "sem dois pontos entre horas e minutos do fuso horário"
 #: en/rev-list-options.txt:1002
 #, priority:260
 msgid "`--date=iso-strict` (or `--date=iso8601-strict`) shows timestamps in strict ISO 8601 format."
-msgstr ""
-"a opção `--date=iso-strict` (ou `--date=iso8601-strict`) exibe o registro de "
-"data e hora com formato ISO 8601 restrito."
+msgstr "a opção `--date=iso-strict` (ou `--date=iso8601-strict`) exibe o registro de data e hora com formato ISO 8601 restrito."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1005
 #, priority:260
 msgid "`--date=rfc` (or `--date=rfc2822`) shows timestamps in RFC 2822 format, often found in email messages."
-msgstr ""
-"a opção `--date=rfc` (ou `--date=rfc2822`) exibe o registro de data e hora "
-"no formato RFC 2822, geralmente encontrado nas mensagens de e-mail."
+msgstr "a opção `--date=rfc` (ou `--date=rfc2822`) exibe o registro de data e hora no formato RFC 2822, geralmente encontrado nas mensagens de e-mail."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1007
@@ -76439,47 +65441,25 @@ msgstr "`--date=short` exibe apenas a data em formato `AAAA-MM-DD` porém não a
 #: en/rev-list-options.txt:1016
 #, priority:260
 msgid "`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 UTC), followed by a space, and then the timezone as an offset from UTC (a `+` or `-` with four digits; the first two are hours, and the second two are minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z\")`).  Note that the `-local` option does not affect the seconds-since-epoch value (which is always measured in UTC), but does switch the accompanying timezone value."
-msgstr ""
-"A opção `--date=raw` mostra a data como segundos desde a época (1970-01-01 "
-"00:00:00 UTC), seguido por um espaço e em seguida, o fuso horário como uma "
-"compensação do UTC (um `+` ou `-` com quatro dígitos; os dois primeiros são "
-"horas, e os dois seguintes são minutos). Ou seja, como se o registro de data "
-"e hora fosse formatado com `strftime(\"%s %z\")`).  Observe que a opção "
-"`-local` não afeta os segundos desde o valor da época (que é sempre medido "
-"em UTC), porém altera o valor do fuso horário que o acompanha."
+msgstr "A opção `--date=raw` mostra a data como segundos desde a época (1970-01-01 00:00:00 UTC), seguido por um espaço e em seguida, o fuso horário como uma compensação do UTC (um `+` ou `-` com quatro dígitos; os dois primeiros são horas, e os dois seguintes são minutos). Ou seja, como se o registro de data e hora fosse formatado com `strftime(\"%s %z\")`).  Observe que a opção `-local` não afeta os segundos desde o valor da época (que é sempre medido em UTC), porém altera o valor do fuso horário que o acompanha."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1023
 #, priority:260
 msgid "`--date=human` shows the timezone if the timezone does not match the current time-zone, and doesn't print the whole date if that matches (ie skip printing year for dates that are \"this year\", but also skip the whole date itself if it's in the last few days and we can just say what weekday it was).  For older dates the hour and minute is also omitted."
-msgstr ""
-"A opção `--date=human` exibe o fuso horário como se o fuso horário não "
-"coincidisse com o fuso horário atual e não imprime a data inteira, caso "
-"coincida (como por exemplo, ignore o ano da impressão para datas que são "
-"\"este ano\", mas também ignore a data inteira caso seja nos últimos dias e "
-"dizendo apenas qual o dia da semana era).  Para datas mais antigas, a hora e "
-"os minutos também são omitidos."
+msgstr "A opção `--date=human` exibe o fuso horário como se o fuso horário não coincidisse com o fuso horário atual e não imprime a data inteira, caso coincida (como por exemplo, ignore o ano da impressão para datas que são \"este ano\", mas também ignore a data inteira caso seja nos últimos dias e dizendo apenas qual o dia da semana era).  Para datas mais antigas, a hora e os minutos também são omitidos."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1027
 #, priority:260
 msgid "`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970).  As with `--raw`, this is always in UTC and therefore `-local` has no effect."
-msgstr ""
-"A opção `date=unix` exibe a data como um carimbo de data/hora da época do "
-"Unix (segundos desde 1970).  Assim como a opção `--raw`, isso sempre está no "
-"UTC e portanto, o `-local` não tem nenhum efeito."
+msgstr "A opção `date=unix` exibe a data como um carimbo de data/hora da época do Unix (segundos desde 1970).  Assim como a opção `--raw`, isso sempre está no UTC e portanto, o `-local` não tem nenhum efeito."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1034
 #, ignore-ellipsis, priority:260
 msgid "`--date=format:...` feeds the format `...` to your system `strftime`, except for %z and %Z, which are handled internally.  Use `--date=format:%c` to show the date in your system locale's preferred format.  See the `strftime` manual for a complete list of format placeholders. When using `-local`, the correct syntax is `--date=format-local:...`."
-msgstr ""
-"A opção `--date=format:...` alimenta o formato `...` par ao seu sistema "
-"`strftime`, menos para o %z e %Z, que são tratados internamente.  Use a "
-"opção `--date=format:%c` para exibir a data no formato preferido do código "
-"do idioma do sistema.  Consulte o manual do `strftime` para obter uma lista "
-"completa dos \"placeholders\". Ao utilizar o `-local`, a sintaxe correta é "
-"`--date=format-local:...`."
+msgstr "A opção `--date=format:...` alimenta o formato `...` par ao seu sistema `strftime`, menos para o %z e %Z, que são tratados internamente.  Use a opção `--date=format:%c` para exibir a data no formato preferido do código do idioma do sistema.  Consulte o manual do `strftime` para obter uma lista completa dos \"placeholders\". Ao utilizar o `-local`, a sintaxe correta é `--date=format-local:...`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1037
@@ -76515,9 +65495,7 @@ msgstr "Exiba o conteúdo dos commits em formato bruto; cada registro é separad
 #: en/rev-list-options.txt:1051
 #, ignore-ellipsis, priority:260
 msgid "Print also the parents of the commit (in the form \"commit parent...\").  Also enables parent rewriting, see 'History Simplification' above."
-msgstr ""
-"Imprima também os pais do commit (no formato \"commit parent...\").  Também "
-"permite reescrever os pais, consulte 'Simplificação do Histórico' acima."
+msgstr "Imprima também os pais do commit (no formato \"commit parent...\").  Também permite reescrever os pais, consulte 'Simplificação do Histórico' acima."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:1052
@@ -76529,9 +65507,7 @@ msgstr "--children"
 #: en/rev-list-options.txt:1055
 #, ignore-ellipsis, priority:260
 msgid "Print also the children of the commit (in the form \"commit child...\").  Also enables parent rewriting, see 'History Simplification' above."
-msgstr ""
-"Imprima também os filhos do commit (no formato \"commit child...\").  Também "
-"permite reescrever os pais, consulte 'Simplificação do Histórico' acima."
+msgstr "Imprima também os filhos do commit (no formato \"commit child...\").  Também permite reescrever os pais, consulte 'Simplificação do Histórico' acima."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:1057
@@ -76555,10 +65531,7 @@ msgstr "--left-right"
 #: en/rev-list-options.txt:1066
 #, priority:260
 msgid "Mark which side of a symmetric difference a commit is reachable from.  Commits from the left side are prefixed with `<` and those from the right with `>`.  If combined with `--boundary`, those commits are prefixed with `-`."
-msgstr ""
-"Marque de que lado da diferença simétrica de onde um commit seja acessível.  "
-"As confirmações do lado esquerdo são prefixadas com `<` e as da direita com "
-"`>`.  Caso combinemos com `--boundary`, estes commits são prefixados com `-`."
+msgstr "Marque de que lado da diferença simétrica de onde um commit seja acessível.  As confirmações do lado esquerdo são prefixadas com `<` e as da direita com `>`.  Caso combinemos com `--boundary`, estes commits são prefixados com `-`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1068
@@ -76622,26 +65595,19 @@ msgstr "--graph"
 #: en/rev-list-options.txt:1096
 #, priority:260
 msgid "Draw a text-based graphical representation of the commit history on the left hand side of the output.  This may cause extra lines to be printed in between commits, in order for the graph history to be drawn properly.  Cannot be combined with `--no-walk`."
-msgstr ""
-"Desenhe uma representação gráfica com base no texto do histórico de "
-"consolidação no lado esquerdo da saída.  Pode fazer com que as linhas extras "
-"sejam impressas entre os commits, para que o histórico do grafo seja "
-"desenhado de forma correta.  Não pode ser combinado com `--no-walk`."
+msgstr "Desenhe uma representação gráfica com base no texto do histórico de consolidação no lado esquerdo da saída.  Pode fazer com que as linhas extras sejam impressas entre os commits, para que o histórico do grafo seja desenhado de forma correta.  Não pode ser combinado com `--no-walk`."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1098
 #, priority:260
 msgid "This enables parent rewriting, see 'History Simplification' above."
-msgstr ""
-"Permite a reescrita dos pais, consulte 'Simplificação do Histórico' acima."
+msgstr "Permite a reescrita dos pais, consulte 'Simplificação do Histórico' acima."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1101
 #, priority:260
 msgid "This implies the `--topo-order` option by default, but the `--date-order` option may also be specified."
-msgstr ""
-"É predefinido que seja implícito o uso da opção `--topo-order`, porém a "
-"opção `--date-order` também possa ser utilizada."
+msgstr "É predefinido que seja implícito o uso da opção `--topo-order`, porém a opção `--date-order` também possa ser utilizada."
 
 #. type: Labeled list
 #: en/rev-list-options.txt:1102
@@ -76653,24 +65619,13 @@ msgstr "--show-linear-break[=<barreira>]"
 #: en/rev-list-options.txt:1108
 #, priority:260
 msgid "When --graph is not used, all history branches are flattened which can make it hard to see that the two consecutive commits do not belong to a linear branch. This option puts a barrier in between them in that case. If `<barrier>` is specified, it is the string that will be shown instead of the default one."
-msgstr ""
-"Quando a opção `--graph` não é utilizado, todas as ramificações do histórico "
-"são achatadas, o que dificulta a visualização onde dois commits consecutivos "
-"não pertençam em um ramo linear. Neste caso, esta opção coloca uma barreira "
-"entre eles. Caso `<barreira>` seja utilizado, é a string que será exibida em "
-"vez do que estiver predefinido."
+msgstr "Quando a opção `--graph` não é utilizado, todas as ramificações do histórico são achatadas, o que dificulta a visualização onde dois commits consecutivos não pertençam em um ramo linear. Neste caso, esta opção coloca uma barreira entre eles. Caso `<barreira>` seja utilizado, é a string que será exibida em vez do que estiver predefinido."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1118
 #, priority:260
 msgid "Print a number stating how many commits would have been listed, and suppress all other output.  When used together with `--left-right`, instead print the counts for left and right commits, separated by a tab. When used together with `--cherry-mark`, omit patch equivalent commits from these counts and print the count for equivalent commits separated by a tab."
-msgstr ""
-"Imprima um número informando quantos commits teriam sido listados e suprima "
-"todas as outras saídas.  Quando usado em conjunto com a opção `--left-right`"
-", imprima as contagens dos commits esquerdo e direito, separados por uma "
-"aba. Quando usado junto com a opção `--cherry-mark`, omita os commits "
-"equivalentes dos patches destas contagens e imprima a contagem para os "
-"commits equivalentes separados por uma aba."
+msgstr "Imprima um número informando quantos commits teriam sido listados e suprima todas as outras saídas.  Quando usado em conjunto com a opção `--left-right`, imprima as contagens dos commits esquerdo e direito, separados por uma aba. Quando usado junto com a opção `--cherry-mark`, omita os commits equivalentes dos patches destas contagens e imprima a contagem para os commits equivalentes separados por uma aba."
 
 #. type: Title ~
 #: en/rev-list-options.txt:1124
@@ -76682,11 +65637,7 @@ msgstr "Formatando o \"Diff\""
 #: en/rev-list-options.txt:1129
 #, priority:260
 msgid "Listed below are options that control the formatting of diff output.  Some of them are specific to linkgit:git-rev-list[1], however other diff options may be given. See linkgit:git-diff-files[1] for more options."
-msgstr ""
-"Abaixo estão listadas as opções que controlam a formatação da saída diff.  "
-"Alguns deles são específicos para linkgit:git-rev-list[1], porém outras "
-"opções diff podem ser informadas. Para mais opções, consulte linkgit:git-"
-"diff-files[1]."
+msgstr "Abaixo estão listadas as opções que controlam a formatação da saída diff.  Alguns deles são específicos para linkgit:git-rev-list[1], porém outras opções diff podem ser informadas. Para mais opções, consulte linkgit:git-diff-files[1]."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1136
@@ -76698,23 +65649,13 @@ msgstr "Com esta opção, a saída \"diff\" para um commit de mesclagem exibe as
 #: en/rev-list-options.txt:1142
 #, priority:260
 msgid "This flag implies the `-c` option and further compresses the patch output by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification."
-msgstr ""
-"Ao usar esta opção fica implícito o uso da opção `-c` e comprime ainda mais "
-"a saída do patch, omitindo os blocos menos importantes, cujo conteúdo nos "
-"pais possua apenas duas variantes e o resultado da mesclagem escolhe um "
-"deles sem modificação."
+msgstr "Ao usar esta opção fica implícito o uso da opção `-c` e comprime ainda mais a saída do patch, omitindo os blocos menos importantes, cujo conteúdo nos pais possua apenas duas variantes e o resultado da mesclagem escolhe um deles sem modificação."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1157
 #, priority:260
 msgid "This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry and diff is generated. An exception is that only diff against the first parent is shown when `--first-parent` option is given; in that case, the output represents the changes the merge brought _into_ the then-current branch."
-msgstr ""
-"Esta opção faz com que os commits mesclados exibam o diff completo como os "
-"commits comuns; para cada pai mesclado, uma entrada a parte no registro log "
-"e os diffs são gerados. Uma exceção é que apenas quanto ao diff em relação "
-"ao primeiro pai que é exibido quando a opção `--first-parent` é utilizada; "
-"neste caso, a saída representa as alterações que a mesclagem trouxe para o "
-"ramo atual."
+msgstr "Esta opção faz com que os commits mesclados exibam o diff completo como os commits comuns; para cada pai mesclado, uma entrada a parte no registro log e os diffs são gerados. Uma exceção é que apenas quanto ao diff em relação ao primeiro pai que é exibido quando a opção `--first-parent` é utilizada; neste caso, a saída representa as alterações que a mesclagem trouxe para o ramo atual."
 
 #. type: Plain text
 #: en/rev-list-options.txt:1160
@@ -76726,17 +65667,13 @@ msgstr "Exibe os \"diffs\" recursivos."
 #: en/rev-list-options.txt:1163
 #, priority:260
 msgid "Show the tree objects in the diff output. This implies `-r`."
-msgstr ""
-"Exibe os objetos árvore no diff que foi gerado. Implica no uso da opção `-r`."
+msgstr "Exibe os objetos árvore no diff que foi gerado. Implica no uso da opção `-r`."
 
 #. type: Plain text
 #: en/sequencer.txt:5
 #, priority:100
 msgid "Continue the operation in progress using the information in `.git/sequencer`.  Can be used to continue after resolving conflicts in a failed cherry-pick or revert."
-msgstr ""
-"Continue a operação em andamento utilizando as informações existentes em `."
-"git/sequencer`.  Pode ser utilizado para continuar após a resolução dos "
-"conflitos em uma falha na seleção ou reversão da escolha seletiva."
+msgstr "Continue a operação em andamento utilizando as informações existentes em `.git/sequencer`.  Pode ser utilizado para continuar após a resolução dos conflitos em uma falha na seleção ou reversão da escolha seletiva."
 
 #. type: Plain text
 #: en/sequencer.txt:9
@@ -76748,10 +65685,7 @@ msgstr "Ignore o commit atual e continue com o restante da sequência."
 #: en/sequencer.txt:14
 #, priority:100
 msgid "Forget about the current operation in progress.  Can be used to clear the sequencer state after a failed cherry-pick or revert."
-msgstr ""
-"Esqueça a operação atual em andamento.  Pode ser utilizado para limpar a "
-"condição do sequenciador após uma falha na seleção ou reversão de uma "
-"escolha seletiva."
+msgstr "Esqueça a operação atual em andamento.  Pode ser utilizado para limpar a condição do sequenciador após uma falha na seleção ou reversão de uma escolha seletiva."
 
 #. type: Plain text
 #: en/sequencer.txt:16
@@ -76763,15 +65697,7 @@ msgstr "Cancele a operação e retorne a condição pré-sequência."
 #: en/transfer-data-leaks.txt:11
 #, priority:220
 msgid "The fetch and push protocols are not designed to prevent one side from stealing data from the other repository that was not intended to be shared. If you have private data that you need to protect from a malicious peer, your best option is to store it in another repository. This applies to both clients and servers. In particular, namespaces on a server are not effective for read access control; you should only grant read access to a namespace to clients that you would trust with read access to the entire repository."
-msgstr ""
-"Os protocolos de busca e envio não foram projetados para impedir que um lado "
-"roube os dados do outro repositório que não deveriam ser compartilhado. Caso "
-"tenha dados particulares que precisam ser protegidos de um par malicioso, a "
-"sua melhor opção é armazená-los em um outro repositório. Isso se aplica aos "
-"clientes e aos servidores. Em particular, os espaço de nomes em um servidor "
-"não são eficazes para o controle de acesso de leitura; você só deve conceder "
-"acesso de leitura a um espaço de nomes para os clientes que você confiaria o "
-"acesso de leitura para todo o repositório."
+msgstr "Os protocolos de busca e envio não foram projetados para impedir que um lado roube os dados do outro repositório que não deveriam ser compartilhado. Caso tenha dados particulares que precisam ser protegidos de um par malicioso, a sua melhor opção é armazená-los em um outro repositório. Isso se aplica aos clientes e aos servidores. Em particular, os espaço de nomes em um servidor não são eficazes para o controle de acesso de leitura; você só deve conceder acesso de leitura a um espaço de nomes para os clientes que você confiaria o acesso de leitura para todo o repositório."
 
 #. type: Plain text
 #: en/transfer-data-leaks.txt:13
@@ -76783,29 +65709,13 @@ msgstr "Os vetores de ataque informados são os seguintes:"
 #: en/transfer-data-leaks.txt:26
 #, priority:220
 msgid "The victim sends \"have\" lines advertising the IDs of objects it has that are not explicitly intended to be shared but can be used to optimize the transfer if the peer also has them. The attacker chooses an object ID X to steal and sends a ref to X, but isn't required to send the content of X because the victim already has it. Now the victim believes that the attacker has X, and it sends the content of X back to the attacker later. (This attack is most straightforward for a client to perform on a server, by creating a ref to X in the namespace the client has access to and then fetching it. The most likely way for a server to perform it on a client is to \"merge\" X into a public branch and hope that the user does additional work on this branch and pushes it back to the server without noticing the merge.)"
-msgstr ""
-"A vítima envia as linhas \"have\" anunciando as IDs dos objetos que possui, "
-"que não são explicitamente planejados para serem compartilhados, porém podem "
-"ser usados para otimizar a transferência caso o par também os tenha. O "
-"atacante escolhe um ID do objeto 'X' para roubar e envia uma \"ref\" para "
-"'X', porém não é necessário enviar o conteúdo do 'X' porque a vítima já o "
-"possui. Agora a vítima acredita que o atacante tem o 'X' e depois envia seu "
-"conteúdo de volta ao atacante. (Esse ataque é mais simples para um cliente "
-"executar em um servidor, criando uma \"ref\" para 'X' no espaço de nomes "
-"onde o cliente tem acesso e em seguida, buscando-o. A maneira mais provável "
-"de um servidor executá-lo em um cliente é \"mesclar\" 'X' em um ramo público "
-"e esperar que o usuário faça um trabalho adicional neste ramo, enviá-lo de "
-"volta ao servidor sem perceber a mesclagem.)"
+msgstr "A vítima envia as linhas \"have\" anunciando as IDs dos objetos que possui, que não são explicitamente planejados para serem compartilhados, porém podem ser usados para otimizar a transferência caso o par também os tenha. O atacante escolhe um ID do objeto 'X' para roubar e envia uma \"ref\" para 'X', porém não é necessário enviar o conteúdo do 'X' porque a vítima já o possui. Agora a vítima acredita que o atacante tem o 'X' e depois envia seu conteúdo de volta ao atacante. (Esse ataque é mais simples para um cliente executar em um servidor, criando uma \"ref\" para 'X' no espaço de nomes onde o cliente tem acesso e em seguida, buscando-o. A maneira mais provável de um servidor executá-lo em um cliente é \"mesclar\" 'X' em um ramo público e esperar que o usuário faça um trabalho adicional neste ramo, enviá-lo de volta ao servidor sem perceber a mesclagem.)"
 
 #. type: Plain text
 #: en/transfer-data-leaks.txt:30
 #, priority:220
 msgid "As in #1, the attacker chooses an object ID X to steal. The victim sends an object Y that the attacker already has, and the attacker falsely claims to have X and not Y, so the victim sends Y as a delta against X.  The delta reveals regions of X that are similar to Y to the attacker."
-msgstr ""
-"Como no item 1, o atacante escolhe um ID do objeto 'X' para roubar. A vítima "
-"envia um objeto 'Y' que o atacante já possui e o atacante afirma falsamente "
-"ter 'X' e não 'Y'; portanto, a vítima envia 'Y' como um delta contra 'X'. O "
-"delta revela as regiões de 'X' que são semelhantes para 'Y' ao atacante."
+msgstr "Como no item 1, o atacante escolhe um ID do objeto 'X' para roubar. A vítima envia um objeto 'Y' que o atacante já possui e o atacante afirma falsamente ter 'X' e não 'Y'; portanto, a vítima envia 'Y' como um delta contra 'X'. O delta revela as regiões de 'X' que são semelhantes para 'Y' ao atacante."
 
 #. type: Title -
 #: en/urls-remotes.txt:4
@@ -76817,9 +65727,7 @@ msgstr "REMOTOS[[REMOTOS]]"
 #: en/urls-remotes.txt:8
 #, priority:220
 msgid "The name of one of the following can be used instead of a URL as `<repository>` argument:"
-msgstr ""
-"O nome de um dos seguintes pode ser usado em vez de uma URL como argumento "
-"do `<repositório>`:"
+msgstr "O nome de um dos seguintes pode ser usado em vez de uma URL como argumento do `<repositório>`:"
 
 #. type: Plain text
 #: en/urls-remotes.txt:10
@@ -76843,9 +65751,7 @@ msgstr "um arquivo no diretório `$GIT_DIR/branches`."
 #: en/urls-remotes.txt:15
 #, priority:220
 msgid "All of these also allow you to omit the refspec from the command line because they each contain a refspec which git will use by default."
-msgstr ""
-"Tudo isso também permite seja omitido o refspec da linha de comando, pois "
-"cada um contém um refspec que o git utilizará de maneira predefinida."
+msgstr "Tudo isso também permite seja omitido o refspec da linha de comando, pois cada um contém um refspec que o git utilizará de maneira predefinida."
 
 #. type: Title ~
 #: en/urls-remotes.txt:17
@@ -76857,13 +65763,7 @@ msgstr "Ramo remoto nomeado no arquivo de configuração"
 #: en/urls-remotes.txt:26
 #, priority:220
 msgid "You can choose to provide the name of a remote which you had previously configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a manual edit to the `$GIT_DIR/config` file.  The URL of this remote will be used to access the repository.  The refspec of this remote will be used by default when you do not provide a refspec on the command line.  The entry in the config file would appear like this:"
-msgstr ""
-"Você pode optar por informar o nome de um ramo remoto que você configurou "
-"anteriormente usando linkgit:git-remote[1], linkgit:git-config[1] ou até "
-"mesmo uma edição manual no arquivo `$GIT_DIR/config`.  A URL deste ramo "
-"remoto será usado para acessar o repositório.  É predefinido que o \"refspec"
-"\" deste ramo remoto será usado quando você não informar um refspec na linha "
-"de comando.  A entrada no arquivo de configuração ficaria assim:"
+msgstr "Você pode optar por informar o nome de um ramo remoto que você configurou anteriormente usando linkgit:git-remote[1], linkgit:git-config[1] ou até mesmo uma edição manual no arquivo `$GIT_DIR/config`.  A URL deste ramo remoto será usado para acessar o repositório.  É predefinido que o \"refspec\" deste ramo remoto será usado quando você não informar um refspec na linha de comando.  A entrada no arquivo de configuração ficaria assim:"
 
 #. type: delimited block -
 #: en/urls-remotes.txt:33
@@ -76885,9 +65785,7 @@ msgstr ""
 #: en/urls-remotes.txt:37
 #, priority:220
 msgid "The `<pushurl>` is used for pushes only. It is optional and defaults to `<url>`."
-msgstr ""
-"O `<pushurl>` é utilizado apenas para os impulsionamentos. Além de opcional "
-"a sua predefinição retorna para `<url>`."
+msgstr "O `<pushurl>` é utilizado apenas para os impulsionamentos. Além de opcional a sua predefinição retorna para `<url>`."
 
 #. type: Title ~
 #: en/urls-remotes.txt:39
@@ -76899,12 +65797,7 @@ msgstr "Arquivo nomeado no `$GIT_DIR/remotes`"
 #: en/urls-remotes.txt:47
 #, priority:220
 msgid "You can choose to provide the name of a file in `$GIT_DIR/remotes`.  The URL in this file will be used to access the repository.  The refspec in this file will be used as default when you do not provide a refspec on the command line.  This file should have the following format:"
-msgstr ""
-"Você pode optar por fornecer o nome de um arquivo em `$GIT_DIR/remotes`.  A "
-"URL neste arquivo será utilizada para acessar o repositório.  O \"refspec\" "
-"neste arquivo será utilizado como uma predefinição quando você não informar "
-"um \"refspec\" na linha de comando.  Este arquivo deve ter o seguinte "
-"formato:"
+msgstr "Você pode optar por fornecer o nome de um arquivo em `$GIT_DIR/remotes`.  A URL neste arquivo será utilizada para acessar o repositório.  O \"refspec\" neste arquivo será utilizado como uma predefinição quando você não informar um \"refspec\" na linha de comando.  Este arquivo deve ter o seguinte formato:"
 
 #. type: delimited block -
 #: en/urls-remotes.txt:52
@@ -76922,10 +65815,7 @@ msgstr ""
 #: en/urls-remotes.txt:59
 #, priority:220
 msgid "`Push:` lines are used by 'git push' and `Pull:` lines are used by 'git pull' and 'git fetch'.  Multiple `Push:` and `Pull:` lines may be specified for additional branch mappings."
-msgstr ""
-"`Push:` as linhas são usadas pelo comando 'git push' e `Pull:` as linhas são "
-"usadas pelo comando 'git pull' e 'git fetch'.  Várias linhas `Push:` e "
-"`Pull:` podem ser utilizadas para mapeamentos adicionais das ramificações."
+msgstr "`Push:` as linhas são usadas pelo comando 'git push' e `Pull:` as linhas são usadas pelo comando 'git pull' e 'git fetch'.  Várias linhas `Push:` e `Pull:` podem ser utilizadas para mapeamentos adicionais das ramificações."
 
 #. type: Title ~
 #: en/urls-remotes.txt:61
@@ -76937,10 +65827,7 @@ msgstr "Arquivo informado em `GIT_DIR/branches`"
 #: en/urls-remotes.txt:67
 #, priority:220
 msgid "You can choose to provide the name of a file in `$GIT_DIR/branches`.  The URL in this file will be used to access the repository.  This file should have the following format:"
-msgstr ""
-"Você pode decidir entre informar o nome de um arquivo no `$GIT_DIR/branches`"
-".  A URL neste arquivo será utilizada para acessar o repositório.  Este "
-"arquivo deve ter o seguinte formato:"
+msgstr "Você pode decidir entre informar o nome de um arquivo no `$GIT_DIR/branches`.  A URL neste arquivo será utilizada para acessar o repositório.  Este arquivo deve ter o seguinte formato:"
 
 #. type: delimited block -
 #: en/urls-remotes.txt:71
@@ -76958,11 +65845,7 @@ msgstr "A `<url>` é necessária; `#<head>` é opcional."
 #: en/urls-remotes.txt:79
 #, priority:220
 msgid "Depending on the operation, git will use one of the following refspecs, if you don't provide one on the command line.  `<branch>` is the name of this file in `$GIT_DIR/branches` and `<head>` defaults to `master`."
-msgstr ""
-"Dependendo da operação, o git usará um dos seguintes refspecs, caso nenhum "
-"seja utilizado na linha de comando.  O `<ramo>` (ramo) é o nome deste "
-"arquivo no `$GIT_DIR/branches` e `<head>` retorna a predefinição para "
-"`master`."
+msgstr "Dependendo da operação, o git usará um dos seguintes refspecs, caso nenhum seja utilizado na linha de comando.  O `<ramo>` (ramo) é o nome deste arquivo no `$GIT_DIR/branches` e `<head>` retorna a predefinição para `master`."
 
 #. type: Plain text
 #: en/urls-remotes.txt:81
@@ -77106,10 +65989,7 @@ msgstr "\\file:///caminho/para/o/repositório.git/"
 #: en/urls.txt:49
 #, priority:300
 msgid "These two syntaxes are mostly equivalent, except when cloning, when the former implies --local option. See linkgit:git-clone[1] for details."
-msgstr ""
-"Estas duas sintaxes são basicamente equivalentes, exceto durante a clonagem, "
-"quando a primeira implica no uso da opção `--local`. Para mais detalhes, "
-"consulte linkgit:git-clone[1]."
+msgstr "Estas duas sintaxes são basicamente equivalentes, exceto durante a clonagem, quando a primeira implica no uso da opção `--local`. Para mais detalhes, consulte linkgit:git-clone[1]."
 
 #. type: Plain text
 #: en/urls.txt:54
@@ -77121,9 +66001,7 @@ msgstr "Essas duas sintaxes são basicamente equivalentes, exceto que a primeira
 #: en/urls.txt:58
 #, priority:300
 msgid "'git clone', 'git fetch' and 'git pull', but not 'git push', will also accept a suitable bundle file. See linkgit:git-bundle[1]."
-msgstr ""
-"O 'git clone', 'git fetch' e 'git pull', mas não o 'git push', também "
-"aceitarão um arquivo do pacote adequado. Consulte linkgit:git-bundle[1]."
+msgstr "O 'git clone', 'git fetch' e 'git pull', mas não o 'git push', também aceitarão um arquivo do pacote adequado. Consulte linkgit:git-bundle[1]."
 
 #. type: Plain text
 #: en/urls.txt:63
@@ -77141,11 +66019,7 @@ msgstr "<transporte>::<endereço>"
 #: en/urls.txt:69
 #, priority:300
 msgid "where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being invoked. See linkgit:gitremote-helpers[7] for details."
-msgstr ""
-"onde <endereço> pode ser um caminho, um servidor e um caminho ou uma "
-"sequência arbitrária semelhante a uma URL reconhecida por um auxiliar remoto "
-"em específico que está sendo chamado. Para mais detalhes, consulte linkgit"
-":gitremote-helpers[7]."
+msgstr "onde <endereço> pode ser um caminho, um servidor e um caminho ou uma sequência arbitrária semelhante a uma URL reconhecida por um auxiliar remoto em específico que está sendo chamado. Para mais detalhes, consulte linkgit:gitremote-helpers[7]."
 
 #. type: Plain text
 #: en/urls.txt:74
@@ -77235,14 +66109,7 @@ msgstr "Resumo"
 #: en/git-bisect-lk2009.txt:17
 #, priority:100
 msgid "\"git bisect\" enables software users and developers to easily find the commit that introduced a regression. We show why it is important to have good tools to fight regressions. We describe how \"git bisect\" works from the outside and the algorithms it uses inside. Then we explain how to take advantage of \"git bisect\" to improve current practices. And we discuss how \"git bisect\" could improve in the future."
-msgstr ""
-"O comando \"git bisect\" permite que os usuários e os desenvolvedores de "
-"software encontrem facilmente o commit que introduziu uma regressão. "
-"Mostramos por que é importante ter boas ferramentas para combater as "
-"regressões. Nós descrevemos como o comando \"git bisect\" funciona de fora e "
-"os algoritmos que ele utiliza por dentro. Em seguida, explicamos como tirar "
-"proveito do comando \"git bisect\" para melhorar as práticas atuais. E "
-"discutimos como o \"git bisect\" pode melhorar no futuro."
+msgstr "O comando \"git bisect\" permite que os usuários e os desenvolvedores de software encontrem facilmente o commit que introduziu uma regressão. Mostramos por que é importante ter boas ferramentas para combater as regressões. Nós descrevemos como o comando \"git bisect\" funciona de fora e os algoritmos que ele utiliza por dentro. Em seguida, explicamos como tirar proveito do comando \"git bisect\" para melhorar as práticas atuais. E discutimos como o \"git bisect\" pode melhorar no futuro."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:20
@@ -77254,56 +66121,31 @@ msgstr "Introdução ao \"git bisect'"
 #: en/git-bisect-lk2009.txt:24
 #, priority:100
 msgid "Git is a Distributed Version Control system (DVCS) created by Linus Torvalds and maintained by Junio Hamano."
-msgstr ""
-"O Git é um sistema de controle de versão distribuído (DVCS) criado por Linus "
-"Torvalds e mantido por Junio Hamano."
+msgstr "O Git é um sistema de controle de versão distribuído (DVCS) criado por Linus Torvalds e mantido por Junio Hamano."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:30
 #, priority:100
 msgid "In Git like in many other Version Control Systems (VCS), the different states of the data that is managed by the system are called commits. And, as VCS are mostly used to manage software source code, sometimes \"interesting\" changes of behavior in the software are introduced in some commits."
-msgstr ""
-"No Git como em muitos outros sistemas de controle de versão (VCS), as "
-"diferentes condições dos dados gerenciados pelo sistema são chamados de "
-"commits. E como o VCS é utilizado principalmente para gerenciar o código-"
-"fonte do software, algumas alterações \"interessantes\" do comportamento no "
-"software são introduzidas em alguns commits."
+msgstr "No Git como em muitos outros sistemas de controle de versão (VCS), as diferentes condições dos dados gerenciados pelo sistema são chamados de commits. E como o VCS é utilizado principalmente para gerenciar o código-fonte do software, algumas alterações \"interessantes\" do comportamento no software são introduzidas em alguns commits."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:37
 #, priority:100
 msgid "In fact people are specially interested in commits that introduce a \"bad\" behavior, called a bug or a regression. They are interested in these commits because a commit (hopefully) contains a very small set of source code changes. And it's much easier to understand and properly fix a problem when you only need to check a very small set of changes, than when you don't know where look in the first place."
-msgstr ""
-"De fato, as pessoas estão especialmente interessadas em confirmações que "
-"introduzem um comportamento \"ruim\", chamado de bug ou regressão. Eles "
-"estão interessados nestes commits porque um commit (espero) contém um "
-"conjunto muito pequeno de alterações no código-fonte. E é muito mais fácil "
-"entender e corrigir adequadamente um problema quando você só precisa "
-"verificar um conjunto muito pequeno de alterações do que quando não sabe "
-"onde procurar."
+msgstr "De fato, as pessoas estão especialmente interessadas em confirmações que introduzem um comportamento \"ruim\", chamado de bug ou regressão. Eles estão interessados nestes commits porque um commit (espero) contém um conjunto muito pequeno de alterações no código-fonte. E é muito mais fácil entender e corrigir adequadamente um problema quando você só precisa verificar um conjunto muito pequeno de alterações do que quando não sabe onde procurar."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:45
 #, priority:100
 msgid "So to help people find commits that introduce a \"bad\" behavior, the \"git bisect\" set of commands was invented. And it follows of course that in \"git bisect\" parlance, commits where the \"interesting behavior\" is present are called \"bad\" commits, while other commits are called \"good\" commits. And a commit that introduce the behavior we are interested in is called a \"first bad commit\". Note that there could be more than one \"first bad commit\" in the commit space we are searching."
-msgstr ""
-"Portanto, para ajudar as pessoas a encontrar os commits que introduzam um "
-"comportamento \"ruim\", o conjunto dos comandos \"git bisect\" foi "
-"inventado. E segue-se, é claro, que na linguagem do comando \"git bisect\", "
-"os commits onde o \"comportamento interessante\" estão presente são chamados "
-"de \"commits ruins\", enquanto os outros commits são chamados de commits "
-"\"bons\". E um commit que introduz o comportamento que estamos interessados "
-"é chamado de \"primeiro commit ruim\". Observe que pode haver mais de um "
-"\"primeiro commit ruim\" no espaço do commit que estamos pesquisando."
+msgstr "Portanto, para ajudar as pessoas a encontrar os commits que introduzam um comportamento \"ruim\", o conjunto dos comandos \"git bisect\" foi inventado. E segue-se, é claro, que na linguagem do comando \"git bisect\", os commits onde o \"comportamento interessante\" estão presente são chamados de \"commits ruins\", enquanto os outros commits são chamados de commits \"bons\". E um commit que introduz o comportamento que estamos interessados é chamado de \"primeiro commit ruim\". Observe que pode haver mais de um \"primeiro commit ruim\" no espaço do commit que estamos pesquisando."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:48
 #, priority:100
 msgid "So \"git bisect\" is designed to help find a \"first bad commit\". And to be as efficient as possible, it tries to perform a binary search."
-msgstr ""
-"Portanto, o comando \"git bisect\" foi projetado para ajudar a encontrar um "
-"\"primeiro commit ruim\". E para ser o mais eficiente possível, ele tenta "
-"executar uma pesquisa binária."
+msgstr "Portanto, o comando \"git bisect\" foi projetado para ajudar a encontrar um \"primeiro commit ruim\". E para ser o mais eficiente possível, ele tenta executar uma pesquisa binária."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:51
@@ -77321,39 +66163,19 @@ msgstr "Regressões: um grande problema"
 #: en/git-bisect-lk2009.txt:58
 #, priority:100
 msgid "Regressions are a big problem in the software industry. But it's difficult to put some real numbers behind that claim."
-msgstr ""
-"As regressões são um grande problema na indústria do software. Mas é difícil "
-"colocar alguns números reais por trás desta afirmação."
+msgstr "As regressões são um grande problema na indústria do software. Mas é difícil colocar alguns números reais por trás desta afirmação."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:61
 #, priority:100
 msgid "There are some numbers about bugs in general, like a NIST study in 2002 <<1>> that said:"
-msgstr ""
-"Existem alguns números sobre os erros em geral, como um estudo do NIST em "
-"2002 <<1>> que dizia:"
+msgstr "Existem alguns números sobre os erros em geral, como um estudo do NIST em 2002 <<1>> que dizia:"
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:78
 #, priority:100
 msgid "Software bugs, or errors, are so prevalent and so detrimental that they cost the U.S. economy an estimated $59.5 billion annually, or about 0.6 percent of the gross domestic product, according to a newly released study commissioned by the Department of Commerce's National Institute of Standards and Technology (NIST). At the national level, over half of the costs are borne by software users and the remainder by software developers/vendors.  The study also found that, although all errors cannot be removed, more than a third of these costs, or an estimated $22.2 billion, could be eliminated by an improved testing infrastructure that enables earlier and more effective identification and removal of software defects. These are the savings associated with finding an increased percentage (but not 100 percent) of errors closer to the development stages in which they are introduced. Currently, over half of all errors are not found until \"downstream\" in the development process or during post-sale software use."
-msgstr ""
-"Bugs ou erros de software são tão prevalentes e tão prejudiciais que custam "
-"à economia dos Estados Unidos um valor estimado em US$59.5 bilhões "
-"anualmente, ou cerca de 0.6 por cento do produto interno bruto, de acordo "
-"com um estudo recém-lançado, encomendado pelo Instituto Nacional de Padrões "
-"e Tecnologia do Departamento de Comércio (NIST). No nível nacional, mais da "
-"metade dos custos são drenados pelos usuários de software e o restante pelos "
-"desenvolvedores/fornecedores de software.  O estudo também descobriu que, "
-"embora todos os erros não possam ser removidos, mais de um terço destes "
-"custos, ou um valor estimado em US$22.2 bilhões, poderia ser eliminado por "
-"uma infraestrutura de teste mais aprimorada onde permita a identificação e a "
-"remoção antecipada e mais eficaz dos defeitos de software. Estas são as "
-"economias associadas à descoberta de uma porcentagem aumentada (mas não 100 "
-"por cento) dos erros mais próximos dos estágios de desenvolvimento onde são "
-"introduzidos. Atualmente, mais da metade de todos os erros não são "
-"encontrados até serem baixados no processo de desenvolvimento ou durante o "
-"uso do software pós-venda."
+msgstr "Bugs ou erros de software são tão prevalentes e tão prejudiciais que custam à economia dos Estados Unidos um valor estimado em US$59.5 bilhões anualmente, ou cerca de 0.6 por cento do produto interno bruto, de acordo com um estudo recém-lançado, encomendado pelo Instituto Nacional de Padrões e Tecnologia do Departamento de Comércio (NIST). No nível nacional, mais da metade dos custos são drenados pelos usuários de software e o restante pelos desenvolvedores/fornecedores de software.  O estudo também descobriu que, embora todos os erros não possam ser removidos, mais de um terço destes custos, ou um valor estimado em US$22.2 bilhões, poderia ser eliminado por uma infraestrutura de teste mais aprimorada onde permita a identificação e a remoção antecipada e mais eficaz dos defeitos de software. Estas são as economias associadas à descoberta de uma porcentagem aumentada (mas não 100 por cento) dos erros mais próximos dos estágios de desenvolvimento onde são introduzidos. Atualmente, mais da metade de todos os erros não são encontrados até serem baixados no processo de desenvolvimento ou durante o uso do software pós-venda."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:81
@@ -77365,11 +66187,7 @@ msgstr "E depois:"
 #: en/git-bisect-lk2009.txt:87
 #, priority:100
 msgid "Software developers already spend approximately 80 percent of development costs on identifying and correcting defects, and yet few products of any type other than software are shipped with such high levels of errors."
-msgstr ""
-"Os desenvolvedores de software já gastam aproximadamente 80 por cento dos "
-"custos de desenvolvimento na identificação e na correção dos defeitos, e "
-"ainda assim poucos produtos de qualquer tipo que não sejam software são "
-"enviados com níveis muito altos de erros."
+msgstr "Os desenvolvedores de software já gastam aproximadamente 80 por cento dos custos de desenvolvimento na identificação e na correção dos defeitos, e ainda assim poucos produtos de qualquer tipo que não sejam software são enviados com níveis muito altos de erros."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:90
@@ -77381,17 +66199,13 @@ msgstr "Eventualmente, a conclusão começou com:"
 #: en/git-bisect-lk2009.txt:94
 #, priority:100
 msgid "The path to higher software quality is significantly improved software testing."
-msgstr ""
-"O caminho para uma maior qualidade de software é um teste significativamente "
-"aprimorado do software."
+msgstr "O caminho para uma maior qualidade de software é um teste significativamente aprimorado do software."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:98
 #, priority:100
 msgid "There are other estimates saying that 80% of the cost related to software is about maintenance <<2>>."
-msgstr ""
-"Existem outras estimativas dizendo que 80% do custo relacionado ao software "
-"é relacionado com a manutenção<<2>>."
+msgstr "Existem outras estimativas dizendo que 80% do custo relacionado ao software é relacionado com a manutenção<<2>>."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:100
@@ -77403,86 +66217,49 @@ msgstr "Porém, de acordo com a Wikipedia <<3>>:"
 #: en/git-bisect-lk2009.txt:108
 #, priority:100
 msgid "A common perception of maintenance is that it is merely fixing bugs. However, studies and surveys over the years have indicated that the majority, over 80%, of the maintenance effort is used for non-corrective actions (Pigosky 1997). This perception is perpetuated by users submitting problem reports that in reality are functionality enhancements to the system."
-msgstr ""
-"Uma percepção comum da manutenção é que ela está apenas consertando bugs. No "
-"entanto, estudos e pesquisas ao longo dos anos indicaram que a maioria, mais "
-"de 80%, do esforço de manutenção é usada para ações não corretivas (Pigosky, "
-"1997). Essa percepção é perpetuada através dos usuários que enviam "
-"relatórios de problemas que, na realidade, são aprimoramentos da "
-"funcionalidade no sistema."
+msgstr "Uma percepção comum da manutenção é que ela está apenas consertando bugs. No entanto, estudos e pesquisas ao longo dos anos indicaram que a maioria, mais de 80%, do esforço de manutenção é usada para ações não corretivas (Pigosky, 1997). Essa percepção é perpetuada através dos usuários que enviam relatórios de problemas que, na realidade, são aprimoramentos da funcionalidade no sistema."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:113
 #, priority:100
 msgid "But we can guess that improving on existing software is very costly because you have to watch out for regressions. At least this would make the above studies consistent among themselves."
-msgstr ""
-"Porém podemos adivinhar que o aprimoramento do software existente é muito "
-"caro porque é preciso estar atento às regressões. Pelo menos isso tornaria "
-"os estudos acima consistentes entre si."
+msgstr "Porém podemos adivinhar que o aprimoramento do software existente é muito caro porque é preciso estar atento às regressões. Pelo menos isso tornaria os estudos acima consistentes entre si."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:121
 #, priority:100
 msgid "Of course some kind of software is developed, then used during some time without being improved on much, and then finally thrown away. In this case, of course, regressions may not be a big problem. But on the other hand, there is a lot of big software that is continually developed and maintained during years or even tens of years by a lot of people. And as there are often many people who depend (sometimes critically) on such software, regressions are a really big problem."
-msgstr ""
-"É claro que algum tipo de software é desenvolvido, usado durante algum tempo "
-"sem ser muito aprimorado e finalmente, jogado fora. Nesse caso, é claro, as "
-"regressões podem não ser um grande problema. Por outro lado, há muitos "
-"softwares grandes que são continuamente desenvolvidos e mantidos durante "
-"anos ou mesmo dezenas de anos por muitas pessoas. E como muitas vezes "
-"existem muitas pessoas que dependem (às vezes de maneira crítica) deste "
-"software, as regressões são realmente um grande problema."
+msgstr "É claro que algum tipo de software é desenvolvido, usado durante algum tempo sem ser muito aprimorado e finalmente, jogado fora. Nesse caso, é claro, as regressões podem não ser um grande problema. Por outro lado, há muitos softwares grandes que são continuamente desenvolvidos e mantidos durante anos ou mesmo dezenas de anos por muitas pessoas. E como muitas vezes existem muitas pessoas que dependem (às vezes de maneira crítica) deste software, as regressões são realmente um grande problema."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:128
 #, priority:100
 msgid "One such software is the Linux kernel. And if we look at the Linux kernel, we can see that a lot of time and effort is spent to fight regressions. The release cycle start with a 2 weeks long merge window. Then the first release candidate (rc) version is tagged. And after that about 7 or 8 more rc versions will appear with around one week between each of them, before the final release."
-msgstr ""
-"Um destes softwares é o kernel do Linux. E se olharmos para o kernel Linux, "
-"podemos ver que muito tempo e esforço são gastos para combater as "
-"regressões. O ciclo de lançamento começa com uma janela de mesclagem de duas "
-"semanas. Em seguida, o candidato do primeiro lançamento (rc) é marcado. E "
-"depois disso, cerca de 7 ou 8 versões de candidatos aparecerão com cerca de "
-"uma semana de espaço entre cada uma delas, antes do lançamento final."
+msgstr "Um destes softwares é o kernel do Linux. E se olharmos para o kernel Linux, podemos ver que muito tempo e esforço são gastos para combater as regressões. O ciclo de lançamento começa com uma janela de mesclagem de duas semanas. Em seguida, o candidato do primeiro lançamento (rc) é marcado. E depois disso, cerca de 7 ou 8 versões de candidatos aparecerão com cerca de uma semana de espaço entre cada uma delas, antes do lançamento final."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:134
 #, priority:100
 msgid "The time between the first rc release and the final release is supposed to be used to test rc versions and fight bugs and especially regressions. And this time is more than 80% of the release cycle time. But this is not the end of the fight yet, as of course it continues after the release."
-msgstr ""
-"O tempo entre a primeira versão rc (release candidate = versão de lançamento)"
-" e a versão final deve ser utilizado para testar as versões rc, resolver os "
-"bugs e especialmente as regressões. Mais de 80% deste tempo gira em torno do "
-"ciclo de lançamento. Mas este ainda não é o fim da batalha, pois é óbvio que "
-"ele continua após o seu lançamento."
+msgstr "O tempo entre a primeira versão rc (release candidate = versão de lançamento) e a versão final deve ser utilizado para testar as versões rc, resolver os bugs e especialmente as regressões. Mais de 80% deste tempo gira em torno do ciclo de lançamento. Mas este ainda não é o fim da batalha, pois é óbvio que ele continua após o seu lançamento."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:137
 #, priority:100
 msgid "And then this is what Ingo Molnar (a well known Linux kernel developer) says about his use of git bisect:"
-msgstr ""
-"E é isso que o Ingo Molnar (um informado desenvolvedor de kernel do Linux) "
-"diz sobre o uso do 'git bisect':"
+msgstr "E é isso que o Ingo Molnar (um informado desenvolvedor de kernel do Linux) diz sobre o uso do 'git bisect':"
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:143
 #, priority:100
 msgid "I most actively use it during the merge window (when a lot of trees get merged upstream and when the influx of bugs is the highest) - and yes, there have been cases that i used it multiple times a day. My average is roughly once a day."
-msgstr ""
-"Eu o utilizo de forma mais ativa durante a janela da mesclagem (quando "
-"muitas árvores são mescladas na upstream e quando o influxo de bugs é mais "
-"alto) - e sim, houve casos onde eu o usei várias vezes no dia. Minha média é "
-"de aproximadamente uma vez por dia."
+msgstr "Eu o utilizo de forma mais ativa durante a janela da mesclagem (quando muitas árvores são mescladas na upstream e quando o influxo de bugs é mais alto) - e sim, houve casos onde eu o usei várias vezes no dia. Minha média é de aproximadamente uma vez por dia."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:149
 #, priority:100
 msgid "So regressions are fought all the time by developers, and indeed it is well known that bugs should be fixed as soon as possible, so as soon as they are found. That's why it is interesting to have good tools for this purpose."
-msgstr ""
-"Portanto, as regressões são combatidas o tempo todo pelos desenvolvedores e "
-"de fato, é sabido que os bugs devem ser corrigidos o mais rápido possível, "
-"tão logo sejam encontrados. É por isso que é importante ter boas ferramentas "
-"para este fim."
+msgstr "Portanto, as regressões são combatidas o tempo todo pelos desenvolvedores e de fato, é sabido que os bugs devem ser corrigidos o mais rápido possível, tão logo sejam encontrados. É por isso que é importante ter boas ferramentas para este fim."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:151
@@ -77494,32 +66271,19 @@ msgstr "Outras ferramentas para combater as regressões"
 #: en/git-bisect-lk2009.txt:156
 #, priority:100
 msgid "So what are the tools used to fight regressions? They are nearly the same as those used to fight regular bugs. The only specific tools are test suites and tools similar as \"git bisect\"."
-msgstr ""
-"Então, quais são as ferramentas utilizadas para combater as regressões? Eles "
-"são quase os mesmos daqueles utilizados para combater os bugs tradicionais. "
-"As únicas ferramentas específicas são pacotes de testes e as ferramentas "
-"similares ao \"git bisect\"."
+msgstr "Então, quais são as ferramentas utilizadas para combater as regressões? Eles são quase os mesmos daqueles utilizados para combater os bugs tradicionais. As únicas ferramentas específicas são pacotes de testes e as ferramentas similares ao \"git bisect\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:162
 #, priority:100
 msgid "Test suites are very nice. But when they are used alone, they are supposed to be used so that all the tests are checked after each commit. This means that they are not very efficient, because many tests are run for no interesting result, and they suffer from combinatorial explosion."
-msgstr ""
-"Os conjuntos de teste são muito legais. Mas quando eles são utilizados "
-"sozinhos, eles devem ser usados para que todos os testes sejam verificados "
-"após cada commit. Isto significa que eles não são muito eficientes, porque "
-"muitos testes são realizados sem resultados interessantes e sofrem com "
-"explosões combinatórias."
+msgstr "Os conjuntos de teste são muito legais. Mas quando eles são utilizados sozinhos, eles devem ser usados para que todos os testes sejam verificados após cada commit. Isto significa que eles não são muito eficientes, porque muitos testes são realizados sem resultados interessantes e sofrem com explosões combinatórias."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:167
 #, priority:100
 msgid "In fact the problem is that big software often has many different configuration options and that each test case should pass for each configuration after each commit. So if you have for each release: N configurations, M commits and T test cases, you should perform:"
-msgstr ""
-"De fato, o problema é que um software grande geralmente possui muitas opções "
-"de configuração diferentes e que cada caso de teste deve passar para cada "
-"configuração após cada commit. Portanto, caso tenha para cada release: 'N' "
-"configurações, 'M' commits e 'T' casos de teste, execute:"
+msgstr "De fato, o problema é que um software grande geralmente possui muitas opções de configuração diferentes e que cada caso de teste deve passar para cada configuração após cada commit. Portanto, caso tenha para cada release: 'N' configurações, 'M' commits e 'T' casos de teste, execute:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:170
@@ -77543,13 +66307,7 @@ msgstr "Logo, não será possível testar completamente tudo."
 #: en/git-bisect-lk2009.txt:182
 #, priority:100
 msgid "And if some bugs slip through your test suite, then you can add a test to your test suite. But if you want to use your new improved test suite to find where the bug slipped in, then you will either have to emulate a bisection process or you will perhaps bluntly test each commit backward starting from the \"bad\" commit you have which may be very wasteful."
-msgstr ""
-"E caso alguns erros passarem pelo seu conjunto de testes, você poderá "
-"adicionar um teste ao seu conjunto de testes. Porém caso queira utilizar o "
-"seu novo conjunto aprimorado de testes para descobrir onde o erro ocorreu, "
-"será necessário emular um processo de bisseção ou talvez você teste cada "
-"commit sem rodeios de forma inversa a partir do commit \"ruim\" que você "
-"possa ter, sendo um total desperdício."
+msgstr "E caso alguns erros passarem pelo seu conjunto de testes, você poderá adicionar um teste ao seu conjunto de testes. Porém caso queira utilizar o seu novo conjunto aprimorado de testes para descobrir onde o erro ocorreu, será necessário emular um processo de bisseção ou talvez você teste cada commit sem rodeios de forma inversa a partir do commit \"ruim\" que você possa ter, sendo um total desperdício."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:184
@@ -77567,12 +66325,7 @@ msgstr "Iniciando uma bisseção"
 #: en/git-bisect-lk2009.txt:194
 #, priority:100
 msgid "The first \"git bisect\" subcommand to use is \"git bisect start\" to start the search. Then bounds must be set to limit the commit space. This is done usually by giving one \"bad\" and at least one \"good\" commit. They can be passed in the initial call to \"git bisect start\" like this:"
-msgstr ""
-"O primeiro subcomando \"git bisect\" que será usado é \"git bisect start\" "
-"para iniciar a pesquisa. Em seguida, os limites devem ser definidos para "
-"limitar o espaço dos commits. Isso geralmente é feito com um commit \"ruim\" "
-"e pelo menos um commit \"bom\". Eles podem ser passados na chamada inicial "
-"para o comando \"git bisect start\" assim:"
+msgstr "O primeiro subcomando \"git bisect\" que será usado é \"git bisect start\" para iniciar a pesquisa. Em seguida, os limites devem ser definidos para limitar o espaço dos commits. Isso geralmente é feito com um commit \"ruim\" e pelo menos um commit \"bom\". Eles podem ser passados na chamada inicial para o comando \"git bisect start\" assim:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:197
@@ -77608,17 +66361,13 @@ msgstr "$ git bisect good [COMMIT...]\n"
 #: en/git-bisect-lk2009.txt:213
 #, priority:100
 msgid "where BAD, GOOD and COMMIT are all names that can be resolved to a commit."
-msgstr ""
-"onde `BAD`, `GOOD` e `COMMIT` são todos os nomes que podem ser resolvidos "
-"para um commit."
+msgstr "onde `BAD`, `GOOD` e `COMMIT` são todos os nomes que podem ser resolvidos para um commit."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:216
 #, priority:100
 msgid "Then \"git bisect\" will checkout a commit of its choosing and ask the user to test it, like this:"
-msgstr ""
-"Então, o comando \"git bisect\" fará a averiguação de um commit de sua "
-"escolha e solicitará que o usuário o teste, assim:"
+msgstr "Então, o comando \"git bisect\" fará a averiguação de um commit de sua escolha e solicitará que o usuário o teste, assim:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:221
@@ -77630,20 +66379,13 @@ msgid ""
 msgstr ""
 "$ git bisect start v2.6.27 v2.6.25\n"
 "Bisecting: 10928 revisions left to test after this (roughly 14 steps)\n"
-"[2ec65f8b89ea003c27ff7723525a2ee335a2b393] x86: clean up using max_low_pfn "
-"on 32-bit\n"
+"[2ec65f8b89ea003c27ff7723525a2ee335a2b393] x86: clean up using max_low_pfn on 32-bit\n"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:229
 #, priority:100
 msgid "Note that the example that we will use is really a toy example, we will be looking for the first commit that has a version like \"2.6.26-something\", that is the commit that has a \"SUBLEVEL = 26\" line in the top level Makefile. This is a toy example because there are better ways to find this commit with Git than using \"git bisect\" (for example \"git blame\" or \"git log -S<string>\")."
-msgstr ""
-"Observe que o exemplo que usaremos é realmente um exemplo de brinquedo; "
-"procuraremos o primeiro commit que possui uma versão como \"2.6.26-alguma-"
-"coisa\", ou seja, o commit que possua uma linha \"SUBLEVEL = 26\" no nível "
-"mais alto do Makefile. Este é um exemplo de um brinquedo, porque existem "
-"maneiras melhores para encontrar este commit com o Git em vez de utilizar o "
-"\"git bisect\" (por exemplo, \"git blame\" ou \"git log -S<texto>\")."
+msgstr "Observe que o exemplo que usaremos é realmente um exemplo de brinquedo; procuraremos o primeiro commit que possui uma versão como \"2.6.26-alguma-coisa\", ou seja, o commit que possua uma linha \"SUBLEVEL = 26\" no nível mais alto do Makefile. Este é um exemplo de um brinquedo, porque existem maneiras melhores para encontrar este commit com o Git em vez de utilizar o \"git bisect\" (por exemplo, \"git blame\" ou \"git log -S<texto>\")."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:231
@@ -77655,10 +66397,7 @@ msgstr "Conduzindo uma bisseção manualmente"
 #: en/git-bisect-lk2009.txt:236
 #, priority:100
 msgid "At this point there are basically 2 ways to drive the search. It can be driven manually by the user or it can be driven automatically by a script or a command."
-msgstr ""
-"Neste ponto, existem basicamente duas maneiras de conduzir a pesquisa. Pode "
-"ser acionado manualmente através do usuário ou automaticamente através de um "
-"script ou comando."
+msgstr "Neste ponto, existem basicamente duas maneiras de conduzir a pesquisa. Pode ser acionado manualmente através do usuário ou automaticamente através de um script ou comando."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:241
@@ -77716,9 +66455,7 @@ msgstr ":100644 100644 5cf82581... 4492984e... M      Makefile\n"
 #: en/git-bisect-lk2009.txt:265
 #, priority:100
 msgid "At this point we can see what the commit does, check it out (if it's not already checked out) or tinker with it, for example:"
-msgstr ""
-"Neste ponto, podemos ver o que o commit faz, dar uma olhada (se ainda não "
-"tiver feito a averiguação) ou mexer com ele, por exemplo:"
+msgstr "Neste ponto, podemos ver o que o commit faz, dar uma olhada (se ainda não tiver feito a averiguação) ou mexer com ele, por exemplo:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:271
@@ -77831,19 +66568,16 @@ msgid ""
 msgstr ""
 "$ git bisect start v2.6.27 v2.6.25\n"
 "Bisecting: 10928 revisions left to test after this (roughly 14 steps)\n"
-"[2ec65f8b89ea003c27ff7723525a2ee335a2b393] x86: clean up using max_low_pfn "
-"on 32-bit\n"
+"[2ec65f8b89ea003c27ff7723525a2ee335a2b393] x86: clean up using max_low_pfn on 32-bit\n"
 "$\n"
 "$ git bisect run grep '^SUBLEVEL = 25' Makefile\n"
 "running grep ^SUBLEVEL = 25 Makefile\n"
 "Bisecting: 5480 revisions left to test after this (roughly 13 steps)\n"
-"[66c0b394f08fd89236515c1c84485ea712a157be] KVM: kill file->f_count abuse in "
-"kvm\n"
+"[66c0b394f08fd89236515c1c84485ea712a157be] KVM: kill file->f_count abuse in kvm\n"
 "running grep ^SUBLEVEL = 25 Makefile\n"
 "SUBLEVEL = 25\n"
 "Bisecting: 2740 revisions left to test after this (roughly 12 steps)\n"
-"[671294719628f1671faefd4882764886f8ad08cb] V4L/DVB(7879): Adding cx18 "
-"Support for mxl5005s\n"
+"[671294719628f1671faefd4882764886f8ad08cb] V4L/DVB(7879): Adding cx18 Support for mxl5005s\n"
 "...\n"
 "...\n"
 "running grep ^SUBLEVEL = 25 Makefile\n"
@@ -77869,33 +66603,19 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:345
 #, priority:100
 msgid "In this example, we passed \"grep '^SUBLEVEL = 25' Makefile\" as parameter to \"git bisect run\". This means that at each step, the grep command we passed will be launched. And if it exits with code 0 (that means success) then git bisect will mark the current state as \"good\". If it exits with code 1 (or any code between 1 and 127 included, except the special code 125), then the current state will be marked as \"bad\"."
-msgstr ""
-"Neste exemplo, passamos \"grep '^SUBLEVEL = 25' Makefile\" como parâmetro "
-"para o comando `git bisect run`. Isso significa que, a cada passo, o comando "
-"'grep' que encaminhamos será iniciado. E caso encerre com o código 0 (que "
-"significa sucesso), o comando `git bisect` marcará a condição atual como "
-"\"bom\". Caso encerre com o código 1 (ou qualquer código entre 1 e incluindo "
-"o 127, exceto o código especial 125), a condição atual será marcado como "
-"\"ruim\"."
+msgstr "Neste exemplo, passamos \"grep '^SUBLEVEL = 25' Makefile\" como parâmetro para o comando `git bisect run`. Isso significa que, a cada passo, o comando 'grep' que encaminhamos será iniciado. E caso encerre com o código 0 (que significa sucesso), o comando `git bisect` marcará a condição atual como \"bom\". Caso encerre com o código 1 (ou qualquer código entre 1 e incluindo o 127, exceto o código especial 125), a condição atual será marcado como \"ruim\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:350
 #, priority:100
 msgid "Exit code between 128 and 255 are special to \"git bisect run\". They make it stop immediately the bisection process. This is useful for example if the command passed takes too long to complete, because you can kill it with a signal and it will stop the bisection process."
-msgstr ""
-"O código de saída entre 128 e 255 é especial para o comando \"git bisect "
-"run\". Eles fazem parar imediatamente o processo de bisseção. É útil como "
-"por exemplo, caso o comando encaminhado demorar muito para ser concluído, "
-"por é possível encerrá-lo com um sinal que interromperá o processo de "
-"bisseção."
+msgstr "O código de saída entre 128 e 255 é especial para o comando \"git bisect run\". Eles fazem parar imediatamente o processo de bisseção. É útil como por exemplo, caso o comando encaminhado demorar muito para ser concluído, por é possível encerrá-lo com um sinal que interromperá o processo de bisseção."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:353
 #, priority:100
 msgid "It can also be useful in scripts passed to \"git bisect run\" to \"exit 255\" if some very abnormal situation is detected."
-msgstr ""
-"Também pode ser útil nos scripts encaminhados para o comando \"git bisect "
-"run\" para \"exit 255\" Caso alguma situação muito anormal seja detectada."
+msgstr "Também pode ser útil nos scripts encaminhados para o comando \"git bisect run\" para \"exit 255\" Caso alguma situação muito anormal seja detectada."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:355
@@ -77907,51 +66627,31 @@ msgstr "Evitando os commits que não foram testados"
 #: en/git-bisect-lk2009.txt:362
 #, priority:100
 msgid "Sometimes it happens that the current state cannot be tested, for example if it does not compile because there was a bug preventing it at that time. This is what the special exit code 125 is for. It tells \"git bisect run\" that the current commit should be marked as untestable and that another one should be chosen and checked out."
-msgstr ""
-"Às vezes, acontece que a condição atual não possa ser testada, por exemplo, "
-"caso ele não seja compilado porque houve um erro que o impedia naquele "
-"momento. É para isso que serve o código de encerramento especial 125. Diz ao "
-"comando \"git bisect run\" que o commit atual deve ser marcado como não "
-"testável e que outro deve ser selecionado e averiguado."
+msgstr "Às vezes, acontece que a condição atual não possa ser testada, por exemplo, caso ele não seja compilado porque houve um erro que o impedia naquele momento. É para isso que serve o código de encerramento especial 125. Diz ao comando \"git bisect run\" que o commit atual deve ser marcado como não testável e que outro deve ser selecionado e averiguado."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:366
 #, priority:100
 msgid "If the bisection process is driven manually, you can use \"git bisect skip\" to do the same thing. (In fact the special exit code 125 makes \"git bisect run\" use \"git bisect skip\" in the background.)"
-msgstr ""
-"Caso o processo de bisseção tenha sido conduzido manualmente, será possível "
-"utilizar o comando \"git bisect skip\" para realizar a mesma coisa. (De "
-"fato, o código de saída especial 125 faz o comando \"git bisect run\" "
-"utilizar \"git bisect skip\" em segundo plano.)"
+msgstr "Caso o processo de bisseção tenha sido conduzido manualmente, será possível utilizar o comando \"git bisect skip\" para realizar a mesma coisa. (De fato, o código de saída especial 125 faz o comando \"git bisect run\" utilizar \"git bisect skip\" em segundo plano.)"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:371
 #, priority:100
 msgid "Or if you want more control, you can inspect the current state using for example \"git bisect visualize\". It will launch gitk (or \"git log\" if the `DISPLAY` environment variable is not set) to help you find a better bisection point."
-msgstr ""
-"Ou, caso queira mais controle, poderá inspecionar a condição atual usando, "
-"por exemplo, o comando \"git bisect visualize\". Ele iniciará o gitk (ou o "
-"comando \"git log\" caso a variável de ambiente `DISPLAY` não estiver "
-"configurada) para ajudá-lo a encontrar um melhor ponto de bisseção."
+msgstr "Ou, caso queira mais controle, poderá inspecionar a condição atual usando, por exemplo, o comando \"git bisect visualize\". Ele iniciará o gitk (ou o comando \"git log\" caso a variável de ambiente `DISPLAY` não estiver configurada) para ajudá-lo a encontrar um melhor ponto de bisseção."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:376
 #, priority:100
 msgid "Either way, if you have a string of untestable commits, it might happen that the regression you are looking for has been introduced by one of these untestable commits. In this case it's not possible to tell for sure which commit introduced the regression."
-msgstr ""
-"De qualquer forma, caso você tenha uma sequência de commits não testáveis, "
-"pode acontecer que a regressão que você está procurando tenha sido "
-"introduzido por um destes commits não testáveis. Nesse caso, não é possível "
-"saber com certeza qual o commit introduziu a regressão."
+msgstr "De qualquer forma, caso você tenha uma sequência de commits não testáveis, pode acontecer que a regressão que você está procurando tenha sido introduzido por um destes commits não testáveis. Nesse caso, não é possível saber com certeza qual o commit introduziu a regressão."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:379
 #, priority:100
 msgid "So if you used \"git bisect skip\" (or the run script exited with special code 125) you could get a result like this:"
-msgstr ""
-"Portanto, tenha utilizado o comando \"git bisect skip\" (ou o script de "
-"execução encerrou com o código especial 125), poderá obter um resultado como "
-"este:"
+msgstr "Portanto, tenha utilizado o comando \"git bisect skip\" (ou o script de execução encerrou com o código especial 125), poderá obter um resultado como este:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:388
@@ -77983,9 +66683,7 @@ msgstr "Salvando um registro log e reproduzindo-o"
 #: en/git-bisect-lk2009.txt:395
 #, priority:100
 msgid "If you want to show other people your bisection process, you can get a log using for example:"
-msgstr ""
-"Caso queira exibir para outras pessoas o seu processo de bisseção, é "
-"possível obter um registro log utilizando, por exemplo:"
+msgstr "Caso queira exibir para outras pessoas o seu processo de bisseção, é possível obter um registro log utilizando, por exemplo:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:398
@@ -78021,21 +66719,13 @@ msgstr "Algoritmo da bisseção"
 #: en/git-bisect-lk2009.txt:417
 #, priority:100
 msgid "As the Git commits form a directed acyclic graph (DAG), finding the best bisection commit to test at each step is not so simple. Anyway Linus found and implemented a \"truly stupid\" algorithm, later improved by Junio Hamano, that works quite well."
-msgstr ""
-"Como o commit do Git forma um grafo acíclico direcionado (DAG), encontrar o "
-"melhor commit de bisseção para testar em cada etapa não é tão simples. De "
-"qualquer forma, Linus encontrou e implementou um algoritmo \"de forama "
-"verdadeiramente estúpida\", posteriormente aprimorado por Junio Hamano, que "
-"funciona muito bem."
+msgstr "Como o commit do Git forma um grafo acíclico direcionado (DAG), encontrar o melhor commit de bisseção para testar em cada etapa não é tão simples. De qualquer forma, Linus encontrou e implementou um algoritmo \"de forama verdadeiramente estúpida\", posteriormente aprimorado por Junio Hamano, que funciona muito bem."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:420
 #, priority:100
 msgid "So the algorithm used by \"git bisect\" to find the best bisection commit when there are no skipped commits is the following:"
-msgstr ""
-"Portanto, o algoritmo usado pelo comando \"git bisect\" para encontrar a "
-"melhor bisseção do commit quando não há commits que foram ignorados é o "
-"seguinte:"
+msgstr "Portanto, o algoritmo usado pelo comando \"git bisect\" para encontrar a melhor bisseção do commit quando não há commits que foram ignorados é o seguinte:"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:422
@@ -78047,15 +66737,13 @@ msgstr "mantenha apenas os commits que:"
 #: en/git-bisect-lk2009.txt:424
 #, priority:100
 msgid "are ancestor of the \"bad\" commit (including the \"bad\" commit itself),"
-msgstr ""
-"são ancestrais do commit \"ruim\" (incluindo o próprio commit \"ruim\"),"
+msgstr "são ancestrais do commit \"ruim\" (incluindo o próprio commit \"ruim\"),"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:425
 #, priority:100
 msgid "are not ancestor of a \"good\" commit (excluding the \"good\" commits)."
-msgstr ""
-"não são ancestrais de um commit \"bom\" (excluindo os commits \"bons\")."
+msgstr "não são ancestrais de um commit \"bom\" (excluindo os commits \"bons\")."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:427
@@ -78099,9 +66787,7 @@ msgstr "-> o tempo passa neste sentido ->\n"
 #: en/git-bisect-lk2009.txt:445
 #, priority:100
 msgid "where B is the \"bad\" commit, \"G\" are \"good\" commits and W, X, and Y are other commits, we will get the following graph after this first step:"
-msgstr ""
-"onde 'B' é o commit \"ruim\", o \"G\" são os commits \"bons\" e 'W', 'X' e "
-"'Y' são outros commits, obteremos o seguinte grafo após esta primeira etapa:"
+msgstr "onde 'B' é o commit \"ruim\", o \"G\" são os commits \"bons\" e 'W', 'X' e 'Y' são outros commits, obteremos o seguinte grafo após esta primeira etapa:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:452
@@ -78123,18 +66809,13 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:457
 #, priority:100
 msgid "So only the W and B commits will be kept. Because commits X and Y will have been removed by rules a) and b) respectively, and because commits G are removed by rule b) too."
-msgstr ""
-"Portanto, apenas os commits 'W' e 'B' serão mantidos. Como os commits 'X' e "
-"'Y' serão removidos pelas regras a) e b) respectivamente, e porque os "
-"commits 'G' são removidos pela regra b) também."
+msgstr "Portanto, apenas os commits 'W' e 'B' serão mantidos. Como os commits 'X' e 'Y' serão removidos pelas regras a) e b) respectivamente, e porque os commits 'G' são removidos pela regra b) também."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:460
 #, priority:100
 msgid "Note for Git users, that it is equivalent as keeping only the commit given by:"
-msgstr ""
-"Nota para os usuários do Git, é equivalente a manter apenas o commit "
-"informado por:"
+msgstr "Nota para os usuários do Git, é equivalente a manter apenas o commit informado por:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:463
@@ -78146,10 +66827,7 @@ msgstr "git rev-list BAD --not GOOD1 GOOD2...\n"
 #: en/git-bisect-lk2009.txt:468
 #, priority:100
 msgid "Also note that we don't require the commits that are kept to be descendants of a \"good\" commit. So in the following example, commits W and Z will be kept:"
-msgstr ""
-"Observe também que não exigimos que os commits mantidos sejam descendentes "
-"de um \"bom\" commit. Portanto, no exemplo a seguir, os commits 'W' e 'Z' "
-"serão mantidas:"
+msgstr "Observe também que não exigimos que os commits mantidos sejam descendentes de um \"bom\" commit. Portanto, no exemplo a seguir, os commits 'W' e 'Z' serão mantidas:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:473
@@ -78167,17 +66845,13 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:477
 #, priority:100
 msgid "starting from the \"good\" ends of the graph, associate to each commit the number of ancestors it has plus one"
-msgstr ""
-"a partir das extremidades \"boas\" do grafo, associe para cada commit a "
-"quantidade de ancestrais que possui mais um"
+msgstr "a partir das extremidades \"boas\" do grafo, associe para cada commit a quantidade de ancestrais que possui mais um"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:480
 #, priority:100
 msgid "For example with the following graph where H is the \"bad\" commit and A and D are some parents of some \"good\" commits:"
-msgstr ""
-"Como por exemplo, com o grafo a seguir, onde 'H' é o commit \"ruim\" e 'A' e "
-"o 'D' são alguns parentes de alguns commits \"bons\":"
+msgstr "Como por exemplo, com o grafo a seguir, onde 'H' é o commit \"ruim\" e 'A' e o 'D' são alguns parentes de alguns commits \"bons\":"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:487
@@ -78229,9 +66903,7 @@ msgstr "associado para cada commit: min(X, N - X)"
 #: en/git-bisect-lk2009.txt:504
 #, priority:100
 msgid "where X is the value associated to the commit in step 2) and N is the total number of commits in the graph."
-msgstr ""
-"onde 'X' é o valor associado ao commit na etapa 2) e 'N' é a quantidade "
-"total dos commits no grafo."
+msgstr "onde 'X' é o valor associado ao commit na etapa 2) e 'N' é a quantidade total dos commits no grafo."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:506
@@ -78261,8 +66933,7 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:518
 #, priority:100
 msgid "the best bisection point is the commit with the highest associated number"
-msgstr ""
-"o melhor ponto de bisseção é o commit com o maior número associado a ele"
+msgstr "o melhor ponto de bisseção é o commit com o maior número associado a ele"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:520
@@ -78280,12 +66951,7 @@ msgstr "observe que alguns atalhos são implementados para acelerar o algoritmo"
 #: en/git-bisect-lk2009.txt:528
 #, priority:100
 msgid "As we know N from the beginning, we know that min(X, N - X) can't be greater than N/2. So during steps 2) and 3), if we would associate N/2 to a commit, then we know this is the best bisection point. So in this case we can just stop processing any other commit and return the current commit."
-msgstr ""
-"Como conhecemos o \"N\" desde o início, sabemos que mínimo (X, N - X) não "
-"pode ser maior que N/2. Portanto, durante as etapas 2) e 3), se associarmos "
-"N/2 a um commit, sabemos que este é o melhor ponto de bisseção. Portanto "
-"neste caso, podemos simplesmente parar de processar qualquer outro commit e "
-"retorne para o commit atual."
+msgstr "Como conhecemos o \"N\" desde o início, sabemos que mínimo (X, N - X) não pode ser maior que N/2. Portanto, durante as etapas 2) e 3), se associarmos N/2 a um commit, sabemos que este é o melhor ponto de bisseção. Portanto neste caso, podemos simplesmente parar de processar qualquer outro commit e retorne para o commit atual."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:530
@@ -78297,9 +66963,7 @@ msgstr "Depuração do algoritmo da bisseção"
 #: en/git-bisect-lk2009.txt:534
 #, priority:100
 msgid "For any commit graph, you can see the number associated with each commit using \"git rev-list --bisect-all\"."
-msgstr ""
-"Para qualquer grafo do commit, você pode ver o número associado a cada "
-"commit utilizando o comando \"git rev-list --bisect-all\"."
+msgstr "Para qualquer grafo do commit, você pode ver o número associado a cada commit utilizando o comando \"git rev-list --bisect-all\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:536
@@ -78351,19 +67015,13 @@ msgstr "Discussão sobre o algoritmo da bissecção"
 #: en/git-bisect-lk2009.txt:561
 #, priority:100
 msgid "First let's define \"best bisection point\". We will say that a commit X is a best bisection point or a best bisection commit if knowing its state (\"good\" or \"bad\") gives as much information as possible whether the state of the commit happens to be \"good\" or \"bad\"."
-msgstr ""
-"Primeiro vamos definir \"melhor ponto de bisseção\". Digamos que um commt "
-"'X' é o melhor ponto de bisseção ou um melhor commit de bisseção caso "
-"conheça a sua condição (\"bom\" ou \"ruim\") fornece o máximo de informações "
-"possíveis caso a condição do commit seja \"bom\" ou \"ruim\"."
+msgstr "Primeiro vamos definir \"melhor ponto de bisseção\". Digamos que um commt 'X' é o melhor ponto de bisseção ou um melhor commit de bisseção caso conheça a sua condição (\"bom\" ou \"ruim\") fornece o máximo de informações possíveis caso a condição do commit seja \"bom\" ou \"ruim\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:564
 #, priority:100
 msgid "This means that the best bisection commits are the commits where the following function is maximum:"
-msgstr ""
-"Isto significa que as melhores bisseção dos commits são os commits onde a "
-"seguinte função seja máxima:"
+msgstr "Isto significa que as melhores bisseção dos commits são os commits onde a seguinte função seja máxima:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:567
@@ -78375,24 +67033,13 @@ msgstr "f(X) = min(information_if_good(X), information_if_bad(X))\n"
 #: en/git-bisect-lk2009.txt:571
 #, priority:100
 msgid "where information_if_good(X) is the information we get if X is good and information_if_bad(X) is the information we get if X is bad."
-msgstr ""
-"onde 'information_if_good(X)' é a informação que obtemos caso 'X' seja bom e "
-"'information_if_bad(X)' é a informação que obtemos caso 'X' seja ruim."
+msgstr "onde 'information_if_good(X)' é a informação que obtemos caso 'X' seja bom e 'information_if_bad(X)' é a informação que obtemos caso 'X' seja ruim."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:580
 #, priority:100
 msgid "Now we will suppose that there is only one \"first bad commit\". This means that all its descendants are \"bad\" and all the other commits are \"good\". And we will suppose that all commits have an equal probability of being good or bad, or of being the first bad commit, so knowing the state of c commits gives always the same amount of information wherever these c commits are on the graph and whatever c is. (So we suppose that these commits being for example on a branch or near a good or a bad commit does not give more or less information)."
-msgstr ""
-"Agora vamos supor que exista apenas um \"primeiro commit ruim\". Isto "
-"significa que todos os seus descendentes são \"ruins\" e todos os outros "
-"commits são \"bons\". E iremos supor que todos os commits têm uma "
-"probabilidade igual de serem bons ou ruins, ou de serem o primeiro commit "
-"incorreto, portanto, conhecer a condição do commit 'c' dá sempre a mesma "
-"quantidade de informações onde quer que estes commits 'c' estejam no grafo e "
-"independente do que o 'c' seja. (Portanto, supomos que estes commits, seja "
-"por exemplo, em um ramo ou próximo a um commit bom ou ruim, não forneçam "
-"mais ou menos informações)."
+msgstr "Agora vamos supor que exista apenas um \"primeiro commit ruim\". Isto significa que todos os seus descendentes são \"ruins\" e todos os outros commits são \"bons\". E iremos supor que todos os commits têm uma probabilidade igual de serem bons ou ruins, ou de serem o primeiro commit incorreto, portanto, conhecer a condição do commit 'c' dá sempre a mesma quantidade de informações onde quer que estes commits 'c' estejam no grafo e independente do que o 'c' seja. (Portanto, supomos que estes commits, seja por exemplo, em um ramo ou próximo a um commit bom ou ruim, não forneçam mais ou menos informações)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:582
@@ -78404,10 +67051,7 @@ msgstr "Vamos supor também que tenhamos um grafo limpo como um após o outro"
 #: en/git-bisect-lk2009.txt:585
 #, priority:100
 msgid "in the bisection algorithm above. This means that we can measure the information we get in terms of number of commit we can remove from the graph.."
-msgstr ""
-"no algoritmo de bisseção acima. Isso significa que podemos medir as "
-"informações que obtemos em termos quantidade dos commits que podemos remover "
-"do grafo."
+msgstr "no algoritmo de bisseção acima. Isso significa que podemos medir as informações que obtemos em termos quantidade dos commits que podemos remover do grafo."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:587
@@ -78419,9 +67063,7 @@ msgstr "E vamos receber um commit 'X' no grafo."
 #: en/git-bisect-lk2009.txt:590
 #, priority:100
 msgid "If X is found to be \"good\", then we know that its ancestors are all \"good\", so we want to say that:"
-msgstr ""
-"Caso 'X' seja considerado \"bom\", sabemos que os seus ancestrais são todos "
-"\"bons\", então queremos dizer que:"
+msgstr "Caso 'X' seja considerado \"bom\", sabemos que os seus ancestrais são todos \"bons\", então queremos dizer que:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:593
@@ -78433,17 +67075,13 @@ msgstr "information_if_good(X) = number_of_ancestors(X)  (TRUE)\n"
 #: en/git-bisect-lk2009.txt:597
 #, priority:100
 msgid "And this is true because at step 1) b) we remove the ancestors of the \"good\" commits."
-msgstr ""
-"E isso é verdade porque na etapa 1) b) removemos os ancestrais dos \"bons\" "
-"commits."
+msgstr "E isso é verdade porque na etapa 1) b) removemos os ancestrais dos \"bons\" commits."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:600
 #, priority:100
 msgid "If X is found to be \"bad\", then we know that its descendants are all \"bad\", so we want to say that:"
-msgstr ""
-"Caso 'X' seja considerado \"ruim\", sabemos que todos os seus descendentes "
-"são \"ruins\", então queremos dizer que:"
+msgstr "Caso 'X' seja considerado \"ruim\", sabemos que todos os seus descendentes são \"ruins\", então queremos dizer que:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:603
@@ -78455,23 +67093,13 @@ msgstr "information_if_bad(X) = number_of_descendants(X)  (WRONG)\n"
 #: en/git-bisect-lk2009.txt:612
 #, priority:100
 msgid "But this is wrong because at step 1) a) we keep only the ancestors of the bad commit. So we get more information when a commit is marked as \"bad\", because we also know that the ancestors of the previous \"bad\" commit that are not ancestors of the new \"bad\" commit are not the first bad commit. We don't know if they are good or bad, but we know that they are not the first bad commit because they are not ancestor of the new \"bad\" commit."
-msgstr ""
-"Mas é errado, porque na etapa 1) a) mantemos apenas os ancestrais dos "
-"commits ruins. Então obtemos mais informações quando um commit é marcado "
-"como \"ruim\", porque também sabemos que os ancestrais do commit \"ruim\" "
-"anterior, não são ancestrais do novo commit \"ruim\" que não são o primeiro "
-"commit incorreto. Não sabemos se eles são bons ou ruins, porém sabemos que "
-"eles não são o primeiro commit incorreto porque não são ancestrais do novo "
-"commit \"ruim\"."
+msgstr "Mas é errado, porque na etapa 1) a) mantemos apenas os ancestrais dos commits ruins. Então obtemos mais informações quando um commit é marcado como \"ruim\", porque também sabemos que os ancestrais do commit \"ruim\" anterior, não são ancestrais do novo commit \"ruim\" que não são o primeiro commit incorreto. Não sabemos se eles são bons ou ruins, porém sabemos que eles não são o primeiro commit incorreto porque não são ancestrais do novo commit \"ruim\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:616
 #, priority:100
 msgid "So when a commit is marked as \"bad\" we know we can remove all the commits in the graph except those that are ancestors of the new \"bad\" commit. This means that:"
-msgstr ""
-"Portanto, quando um commit é marcado como \"ruim\", sabemos que podemos "
-"remover todos os commit no grafo, exceto aqueles que são os ancestrais do "
-"novo commit \"ruim\". Isto significa que:"
+msgstr "Portanto, quando um commit é marcado como \"ruim\", sabemos que podemos remover todos os commit no grafo, exceto aqueles que são os ancestrais do novo commit \"ruim\". Isto significa que:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:619
@@ -78489,9 +67117,7 @@ msgstr "onde 'N' é a quantidade de commits no grafo (limpos)."
 #: en/git-bisect-lk2009.txt:625
 #, priority:100
 msgid "So in the end this means that to find the best bisection commits we should maximize the function:"
-msgstr ""
-"Portanto, no final, isso significa que, para encontrar as melhores bisseções "
-"dos commits, devemos maximizar a função:"
+msgstr "Portanto, no final, isso significa que, para encontrar as melhores bisseções dos commits, devemos maximizar a função:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:628
@@ -78503,9 +67129,7 @@ msgstr "f(X) = min(number_of_ancestors(X), N - number_of_ancestors(X))\n"
 #: en/git-bisect-lk2009.txt:632
 #, priority:100
 msgid "And this is nice because at step 2) we compute number_of_ancestors(X)  and so at step 3) we compute f(X)."
-msgstr ""
-"E isso é bom porque na etapa 2) calculamos 'number_of_ancestors(X)' (a "
-"quantidade de ancestrais) e, na etapa 3) calculamos 'f(X)'."
+msgstr "E isso é bom porque na etapa 2) calculamos 'number_of_ancestors(X)' (a quantidade de ancestrais) e, na etapa 3) calculamos 'f(X)'."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:634
@@ -78597,20 +67221,13 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:678
 #, priority:100
 msgid "So we chose G, H, K or L as the best bisection point, which is better than F. Because if for example L is bad, then we will know not only that L, M and N are bad but also that G, H, I and J are not the first bad commit (since we suppose that there is only one first bad commit and it must be an ancestor of L)."
-msgstr ""
-"Então escolhemos 'G', 'H', 'K' ou 'L' como o melhor ponto de bisseção, que é "
-"melhor que 'F'. Porque, por exemplo, o 'L' é ruim, saberemos não apenas que "
-"'L', 'M' e 'N' são ruins, mas também que o 'G', 'H', 'I' e 'J' não são os "
-"primeiros commits ruins (pois supomos que haja apenas um primeiro commit "
-"ruim e ele deve ser um ancestral do 'L')."
+msgstr "Então escolhemos 'G', 'H', 'K' ou 'L' como o melhor ponto de bisseção, que é melhor que 'F'. Porque, por exemplo, o 'L' é ruim, saberemos não apenas que 'L', 'M' e 'N' são ruins, mas também que o 'G', 'H', 'I' e 'J' não são os primeiros commits ruins (pois supomos que haja apenas um primeiro commit ruim e ele deve ser um ancestral do 'L')."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:681
 #, priority:100
 msgid "So the current algorithm seems to be the best possible given what we initially supposed."
-msgstr ""
-"Portanto, o algoritmo atual parece ser o melhor possível, dado o que supomos "
-"inicialmente."
+msgstr "Portanto, o algoritmo atual parece ser o melhor possível, dado o que supomos inicialmente."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:683
@@ -78622,10 +67239,7 @@ msgstr "Algoritmo de salto"
 #: en/git-bisect-lk2009.txt:688
 #, priority:100
 msgid "When some commits have been skipped (using \"git bisect skip\"), then the bisection algorithm is the same for step 1) to 3). But then we use roughly the following steps:"
-msgstr ""
-"Quando alguns commits forem ignoradas (utilizando o comando \"git bisect "
-"skip\"), o algoritmo de bisseção é o mesmo da etapa 1) a 3). Então "
-"utilizamos aproximadamente as seguintes etapas:"
+msgstr "Quando alguns commits forem ignoradas (utilizando o comando \"git bisect skip\"), o algoritmo de bisseção é o mesmo da etapa 1) a 3). Então utilizamos aproximadamente as seguintes etapas:"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:690
@@ -78649,25 +67263,19 @@ msgstr "caso contrário, filtre todos os commits ignorados da lista"
 #: en/git-bisect-lk2009.txt:698
 #, priority:100
 msgid "use a pseudo random number generator (PRNG) to generate a random number between 0 and 1"
-msgstr ""
-"use um gerador de número pseudo-aleatório (PRNG) para gerar um número "
-"aleatório entre '0' e '1'"
+msgstr "use um gerador de número pseudo-aleatório (PRNG) para gerar um número aleatório entre '0' e '1'"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:701
 #, priority:100
 msgid "multiply this random number with its square root to bias it toward 0"
-msgstr ""
-"multiplique este número aleatório com a a sua raiz quadrada para enviesá-lo "
-"para 0"
+msgstr "multiplique este número aleatório com a a sua raiz quadrada para enviesá-lo para 0"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:704
 #, priority:100
 msgid "multiply the result by the number of commits in the filtered list to get an index into this list"
-msgstr ""
-"multiplicada o resultado pela quantidade dos commits na lista dos filtrados "
-"e obtenha um índice nesta lista"
+msgstr "multiplicada o resultado pela quantidade dos commits na lista dos filtrados e obtenha um índice nesta lista"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:706
@@ -78685,87 +67293,55 @@ msgstr "Discussão sobre o algoritmo de salto"
 #: en/git-bisect-lk2009.txt:715
 #, priority:100
 msgid "After step 7) (in the skip algorithm), we could check if the second commit has been skipped and return it if it is not the case. And in fact that was the algorithm we used from when \"git bisect skip\" was developed in Git version 1.5.4 (released on February 1st 2008) until Git version 1.6.4 (released July 29th 2009)."
-msgstr ""
-"Após a etapa 7) (no algoritmo 'skip'), poderíamos verificar se o segundo "
-"commit foi ignorado e retorná-lo, se não for o caso. E de fato, este foi o "
-"algoritmo que utilizamos quando o comando \"git bisect skip\" foi "
-"desenvolvido no Git versão 1.5.4 (lançado em 1º de fevereiro de 2008) até o "
-"Git versão 1.6.4 (lançado em 29 de julho de 2009)."
+msgstr "Após a etapa 7) (no algoritmo 'skip'), poderíamos verificar se o segundo commit foi ignorado e retorná-lo, se não for o caso. E de fato, este foi o algoritmo que utilizamos quando o comando \"git bisect skip\" foi desenvolvido no Git versão 1.5.4 (lançado em 1º de fevereiro de 2008) até o Git versão 1.6.4 (lançado em 29 de julho de 2009)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:721
 #, priority:100
 msgid "But Ingo Molnar and H. Peter Anvin (another well known linux kernel developer) both complained that sometimes the best bisection points all happened to be in an area where all the commits are untestable. And in this case the user was asked to test many untestable commits, which could be very inefficient."
-msgstr ""
-"Porém o Ingo Molnar e o H. Peter Anvin (outro informado desenvolvedor de "
-"kernel do linux) reclamaram que às vezes os melhores pontos de bisseção "
-"aconteciam em uma área onde todos os commits eram testáveis. E neste caso, o "
-"usuário foi solicitado a testar muitos commits onde não são possíveis de "
-"serem testados, o que poderia ser muito ineficiente."
+msgstr "Porém o Ingo Molnar e o H. Peter Anvin (outro informado desenvolvedor de kernel do linux) reclamaram que às vezes os melhores pontos de bisseção aconteciam em uma área onde todos os commits eram testáveis. E neste caso, o usuário foi solicitado a testar muitos commits onde não são possíveis de serem testados, o que poderia ser muito ineficiente."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:725
 #, priority:100
 msgid "Indeed untestable commits are often untestable because a breakage was introduced at one time, and that breakage was fixed only after many other commits were introduced."
-msgstr ""
-"Na verdade, os commits não testáveis geralmente não são testáveis porque uma "
-"quebra foi introduzida em algum momento, e essa quebra foi corrigida somente "
-"depois que muitos outras commits foram introduzidos."
+msgstr "Na verdade, os commits não testáveis geralmente não são testáveis porque uma quebra foi introduzida em algum momento, e essa quebra foi corrigida somente depois que muitos outras commits foram introduzidos."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:729
 #, priority:100
 msgid "This breakage is of course most of the time unrelated to the breakage we are trying to locate in the commit graph. But it prevents us to know if the interesting \"bad behavior\" is present or not."
-msgstr ""
-"Naturalmente, essa quebra não está relacionada à quebra que estamos tentando "
-"localizar no grafo do commit. Porém isso nos impede de saber se o \"mau "
-"comportamento\" que interessa está presente ou não."
+msgstr "Naturalmente, essa quebra não está relacionada à quebra que estamos tentando localizar no grafo do commit. Porém isso nos impede de saber se o \"mau comportamento\" que interessa está presente ou não."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:733
 #, priority:100
 msgid "So it is a fact that commits near an untestable commit have a high probability of being untestable themselves. And the best bisection commits are often found together too (due to the bisection algorithm)."
-msgstr ""
-"Portanto, é fato que os commits próximos de um commit onde o teste não possa "
-"ser feito têm uma alta probabilidade de serem elas mesmas as não testáveis. "
-"Os melhores commits para bisseção também são frequentemente encontrados "
-"juntos (devido ao algoritmo de bisseção)."
+msgstr "Portanto, é fato que os commits próximos de um commit onde o teste não possa ser feito têm uma alta probabilidade de serem elas mesmas as não testáveis. Os melhores commits para bisseção também são frequentemente encontrados juntos (devido ao algoritmo de bisseção)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:736
 #, priority:100
 msgid "This is why it is a bad idea to just chose the next best unskipped bisection commit when the first one has been skipped."
-msgstr ""
-"É por isso que é uma péssima ideia escolher a próxima melhor bisseção do "
-"commit que não foi ignorado quando o primeiro tenha sido ignorado."
+msgstr "É por isso que é uma péssima ideia escolher a próxima melhor bisseção do commit que não foi ignorado quando o primeiro tenha sido ignorado."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:741
 #, priority:100
 msgid "We found that most commits on the graph may give quite a lot of information when they are tested. And the commits that will not on average give a lot of information are the one near the good and bad commits."
-msgstr ""
-"Descobrimos que a maioria dos commits no grafo pode fornecer muitas "
-"informações quando são testadas. E os commits que, em média, não fornecerão "
-"muita informação são os próximos commits bons e ruins."
+msgstr "Descobrimos que a maioria dos commits no grafo pode fornecer muitas informações quando são testadas. E os commits que, em média, não fornecerão muita informação são os próximos commits bons e ruins."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:744
 #, priority:100
 msgid "So using a PRNG with a bias to favor commits away from the good and bad commits looked like a good choice."
-msgstr ""
-"Portanto, ao usar um PRNG com um viés para favorecer os commits longe dos "
-"commits bons e ruins parecia ser uma boa escolha."
+msgstr "Portanto, ao usar um PRNG com um viés para favorecer os commits longe dos commits bons e ruins parecia ser uma boa escolha."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:751
 #, priority:100
 msgid "One obvious improvement to this algorithm would be to look for a commit that has an associated value near the one of the best bisection commit, and that is on another branch, before using the PRNG. Because if such a commit exists, then it is not very likely to be untestable too, so it will probably give more information than a nearly randomly chosen one."
-msgstr ""
-"Uma melhoria óbvia neste algoritmo seria procurar por um commit que tenha um "
-"valor associado próximo ao do melhor commit de bisseção e que esteja em "
-"outra ramificação, antes de utilizar o PRNG. Pois caso este commit exista, é "
-"muito provável que também não seja testável, logo, provavelmente fornecerá "
-"mais informações do que o que foi selecionado aleatoriamente."
+msgstr "Uma melhoria óbvia neste algoritmo seria procurar por um commit que tenha um valor associado próximo ao do melhor commit de bisseção e que esteja em outra ramificação, antes de utilizar o PRNG. Pois caso este commit exista, é muito provável que também não seja testável, logo, provavelmente fornecerá mais informações do que o que foi selecionado aleatoriamente."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:753
@@ -78777,37 +67353,25 @@ msgstr "Verificando as bases mescladas"
 #: en/git-bisect-lk2009.txt:757
 #, priority:100
 msgid "There is another tweak in the bisection algorithm that has not been described in the \"bisection algorithm\" above."
-msgstr ""
-"Há outro ajuste no algoritmo de bisseção que não foi descrito no \"algoritmo "
-"de bisseção\" acima."
+msgstr "Há outro ajuste no algoritmo de bisseção que não foi descrito no \"algoritmo de bisseção\" acima."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:761
 #, priority:100
 msgid "We supposed in the previous examples that the \"good\" commits were ancestors of the \"bad\" commit. But this is not a requirement of \"git bisect\"."
-msgstr ""
-"Nos exemplos anteriores, supomos que os commits \"bons\" eram ancestrais do "
-"commit \"ruim\". Porém isto não é um requisito do \"git bisect\"."
+msgstr "Nos exemplos anteriores, supomos que os commits \"bons\" eram ancestrais do commit \"ruim\". Porém isto não é um requisito do \"git bisect\"."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:769
 #, priority:100
 msgid "Of course the \"bad\" commit cannot be an ancestor of a \"good\" commit, because the ancestors of the good commits are supposed to be \"good\". And all the \"good\" commits must be related to the bad commit.  They cannot be on a branch that has no link with the branch of the \"bad\" commit. But it is possible for a good commit to be related to a bad commit and yet not be neither one of its ancestor nor one of its descendants."
-msgstr ""
-"É claro que o commit \"ruim\" não pode ser um ancestral de um commit \"bom\""
-", porque os ancestrais dos commits bons devem ser \"bons\". E todos os "
-"commits \"bons\" devem estar relacionadas ao commit \"ruim\".  Eles não "
-"podem estar em um ramo que não possua vínculo com o ramo do commit \"ruim\". "
-"Porém é possível que um bom commit esteja relacionado a um commit ruim e no "
-"entanto, não seja um de seus ancestrais e nem um dos seus descendentes."
+msgstr "É claro que o commit \"ruim\" não pode ser um ancestral de um commit \"bom\", porque os ancestrais dos commits bons devem ser \"bons\". E todos os commits \"bons\" devem estar relacionadas ao commit \"ruim\".  Eles não podem estar em um ramo que não possua vínculo com o ramo do commit \"ruim\". Porém é possível que um bom commit esteja relacionado a um commit ruim e no entanto, não seja um de seus ancestrais e nem um dos seus descendentes."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:772
 #, priority:100
 msgid "For example, there can be a \"main\" branch, and a \"dev\" branch that was forked of the main branch at a commit named \"D\" like this:"
-msgstr ""
-"Como por exemplo, pode haver um ramo \"main\" (principal) e um ramo \"dev\" "
-"que foi bifurcada no ramo principal em um commit chamado \"D\" desta maneira:"
+msgstr "Como por exemplo, pode haver um ramo \"main\" (principal) e um ramo \"dev\" que foi bifurcada no ramo principal em um commit chamado \"D\" desta maneira:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:777
@@ -78825,26 +67389,19 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:781
 #, priority:100
 msgid "The commit \"D\" is called a \"merge base\" for branch \"main\" and \"dev\" because it's the best common ancestor for these branches for a merge."
-msgstr ""
-"O commit \"D\" é chamado de uma \"base de mesclagem\" para o ramo \"main\" e "
-"\"dev\" pois é o melhor ancestral comum destas ramificações para uma "
-"mesclagem."
+msgstr "O commit \"D\" é chamado de uma \"base de mesclagem\" para o ramo \"main\" e \"dev\" pois é o melhor ancestral comum destas ramificações para uma mesclagem."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:785
 #, priority:100
 msgid "Now let's suppose that commit J is bad and commit G is good and that we apply the bisection algorithm like it has been previously described."
-msgstr ""
-"Agora, suponha que o commit J seja ruim, que o commit G seja bom e que "
-"apliquemos o algoritmo de bisseção como foi descrito anteriormente."
+msgstr "Agora, suponha que o commit J seja ruim, que o commit G seja bom e que apliquemos o algoritmo de bisseção como foi descrito anteriormente."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:789
 #, priority:100
 msgid "As described in step 1) b) of the bisection algorithm, we remove all the ancestors of the good commits because they are supposed to be good too."
-msgstr ""
-"Conforme descrito na etapa 1) b) do algoritmo de bisseção, removemos todos "
-"os ancestrais dos commits bons porque eles também devem ser bons."
+msgstr "Conforme descrito na etapa 1) b) do algoritmo de bisseção, removemos todos os ancestrais dos commits bons porque eles também devem ser bons."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:791
@@ -78862,39 +67419,25 @@ msgstr "H-I-J\n"
 #: en/git-bisect-lk2009.txt:798
 #, priority:100
 msgid "But what happens if the first bad commit is \"B\" and if it has been fixed in the \"main\" branch by commit \"F\"?"
-msgstr ""
-"Mas o que acontece caso o primeiro commit incorreto seja o \"B\" e se foi "
-"corrigido no ramo \"principal\" (main) pelo commit \"F\"?"
+msgstr "Mas o que acontece caso o primeiro commit incorreto seja o \"B\" e se foi corrigido no ramo \"principal\" (main) pelo commit \"F\"?"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:801
 #, priority:100
 msgid "The result of such a bisection would be that we would find that H is the first bad commit, when in fact it's B. So that would be wrong!"
-msgstr ""
-"O resultado dessa bisseção seria que descobriríamos que \"H\" é o primeiro "
-"commit ruim, quando na verdade é o \"B\". Portanto, isso seria errado!"
+msgstr "O resultado dessa bisseção seria que descobriríamos que \"H\" é o primeiro commit ruim, quando na verdade é o \"B\". Portanto, isso seria errado!"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:807
 #, priority:100
 msgid "And yes it can happen in practice that people working on one branch are not aware that people working on another branch fixed a bug! It could also happen that F fixed more than one bug or that it is a revert of some big development effort that was not ready to be released."
-msgstr ""
-"E sim, na prática pode acontecer das pessoas que trabalham em um ramo não "
-"estejam cientes que as pessoas que trabalham no outro ramo corrigiram um "
-"bug! Também pode acontecer que F tenha corrigido mais de um bug ou que seja "
-"uma reversão de algum grande esforço de desenvolvimento que não estava "
-"pronto para ser liberado."
+msgstr "E sim, na prática pode acontecer das pessoas que trabalham em um ramo não estejam cientes que as pessoas que trabalham no outro ramo corrigiram um bug! Também pode acontecer que F tenha corrigido mais de um bug ou que seja uma reversão de algum grande esforço de desenvolvimento que não estava pronto para ser liberado."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:813
 #, priority:100
 msgid "In fact development teams often maintain both a development branch and a maintenance branch, and it would be quite easy for them if \"git bisect\" just worked when they want to bisect a regression on the development branch that is not on the maintenance branch. They should be able to start bisecting using:"
-msgstr ""
-"De fato, as equipes de desenvolvimento geralmente mantêm um ramo de "
-"desenvolvimento e um ramo de manutenção, seria muito fácil para eles caso o "
-"comando \"git bisect\" funcionasse quando quisessem dividir uma regressão no "
-"ramo de desenvolvimento que não está no ramo de manutenção. Eles devem ser "
-"capaz de começar a dividir utilizando:"
+msgstr "De fato, as equipes de desenvolvimento geralmente mantêm um ramo de desenvolvimento e um ramo de manutenção, seria muito fácil para eles caso o comando \"git bisect\" funcionasse quando quisessem dividir uma regressão no ramo de desenvolvimento que não está no ramo de manutenção. Eles devem ser capaz de começar a dividir utilizando:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:816
@@ -78906,19 +67449,13 @@ msgstr "$ git bisect start dev main\n"
 #: en/git-bisect-lk2009.txt:823
 #, priority:100
 msgid "To enable that additional nice feature, when a bisection is started and when some good commits are not ancestors of the bad commit, we first compute the merge bases between the bad and the good commits and we chose these merge bases as the first commits that will be checked out and tested."
-msgstr ""
-"Para ativar esse recurso adicional, quando uma bisseção é iniciada e quando "
-"alguns commits bons não são ancestrais do commit ruim, primeiro calculamos a "
-"mesclagem das bases entre os commits ruins e os bons, escolhemos estas bases "
-"da mesclagem como os primeiros commits que serão averiguados e testados."
+msgstr "Para ativar esse recurso adicional, quando uma bisseção é iniciada e quando alguns commits bons não são ancestrais do commit ruim, primeiro calculamos a mesclagem das bases entre os commits ruins e os bons, escolhemos estas bases da mesclagem como os primeiros commits que serão averiguados e testados."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:826
 #, priority:100
 msgid "If it happens that one merge base is bad, then the bisection process is stopped with a message like:"
-msgstr ""
-"Caso ocorra de uma base que foi mesclada esteja ruim, o processo de bisseção "
-"será interrompido com uma mensagem como:"
+msgstr "Caso ocorra de uma base que foi mesclada esteja ruim, o processo de bisseção será interrompido com uma mensagem como:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:830
@@ -78934,18 +67471,13 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:834
 #, ignore-ellipsis, priority:100
 msgid "where BBBBBB is the sha1 hash of the bad merge base and [GGGGGG,...] is a comma separated list of the sha1 of the good commits."
-msgstr ""
-"onde BBBBBB é o hash sha1 da base de mesclagem ruim e [GGGGGG, ...] é uma "
-"lista separada por vírgulas do sha1 do bom commit."
+msgstr "onde BBBBBB é o hash sha1 da base de mesclagem ruim e [GGGGGG, ...] é uma lista separada por vírgulas do sha1 do bom commit."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:838
 #, priority:100
 msgid "If some of the merge bases are skipped, then the bisection process continues, but the following message is printed for each skipped merge base:"
-msgstr ""
-"Caso algumas das mesclagens das bases sejam ignoradas, o processo de "
-"bisseção continuará, porém a seguinte mensagem será impressa para cada "
-"mesclagem da base que foi ignorada:"
+msgstr "Caso algumas das mesclagens das bases sejam ignoradas, o processo de bisseção continuará, porém a seguinte mensagem será impressa para cada mesclagem da base que foi ignorada:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:843
@@ -78956,26 +67488,20 @@ msgid ""
 "We continue anyway.\n"
 msgstr ""
 "Aviso: a base da mesclagem entre BBBBBB e [GGGGGG,...] deve ser ignorado.\n"
-"Portanto, não podemos ter certeza de que o primeiro commit ruim esteja entre "
-"MMMMMM e BBBBBB.\n"
+"Portanto, não podemos ter certeza de que o primeiro commit ruim esteja entre MMMMMM e BBBBBB.\n"
 "Continuamos mesmo assim.\n"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:848
 #, ignore-ellipsis, priority:100
 msgid "where BBBBBB is the sha1 hash of the bad commit, MMMMMM is the sha1 hash of the merge base that is skipped and [GGGGGG,...] is a comma separated list of the sha1 of the good commits."
-msgstr ""
-"onde BBBBBB é o hash sha1 do commit ruim, o MMMMMM é o sha1 da base da "
-"mesclagem que é ignorado e [GGGGGG, ...] é uma lista separada por vírgulas "
-"do sha1 dos commits bons."
+msgstr "onde BBBBBB é o hash sha1 do commit ruim, o MMMMMM é o sha1 da base da mesclagem que é ignorado e [GGGGGG, ...] é uma lista separada por vírgulas do sha1 dos commits bons."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:851
 #, priority:100
 msgid "So if there is no bad merge base, the bisection process continues as usual after this step."
-msgstr ""
-"Portanto, caso não haja uma base da mesclagem ruim, o processo de bisseção "
-"continuará normalmente após esta etapa."
+msgstr "Portanto, caso não haja uma base da mesclagem ruim, o processo de bisseção continuará normalmente após esta etapa."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:853
@@ -78993,23 +67519,13 @@ msgstr "Usando conjuntos de teste e o comando 'git bisect' juntos"
 #: en/git-bisect-lk2009.txt:863
 #, priority:100
 msgid "If you both have a test suite and use git bisect, then it becomes less important to check that all tests pass after each commit. Though of course it is probably a good idea to have some checks to avoid breaking too many things because it could make bisecting other bugs more difficult."
-msgstr ""
-"Caso você possua um conjunto de testes e utiliza o `git bisect`, torna-se "
-"menos importante verificar se todos os testes passam após cada confirmação. "
-"Embora, claro, seja provavelmente uma boa ideia fazer algumas verificações "
-"para evitar a quebra de muitas coisas pois isso pode dificultar a bisseção "
-"dos outros bugs."
+msgstr "Caso você possua um conjunto de testes e utiliza o `git bisect`, torna-se menos importante verificar se todos os testes passam após cada confirmação. Embora, claro, seja provavelmente uma boa ideia fazer algumas verificações para evitar a quebra de muitas coisas pois isso pode dificultar a bisseção dos outros bugs."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:868
 #, priority:100
 msgid "You can focus your efforts to check at a few points (for example rc and beta releases) that all the T test cases pass for all the N configurations. And when some tests don't pass you can use \"git bisect\" (or better \"git bisect run\"). So you should perform roughly:"
-msgstr ""
-"Você pode concentrar os teus esforços para verificar alguns pontos (as "
-"versões rc e beta por exemplo) que todos os casos de teste 'T' passam por "
-"todas as 'N' configurações. E quando alguns testes não passam, você pode "
-"usar \"git bisect\" (ou melhor, \"git bisect run\"). Então você deve "
-"executar a grosso modo:"
+msgstr "Você pode concentrar os teus esforços para verificar alguns pontos (as versões rc e beta por exemplo) que todos os casos de teste 'T' passam por todas as 'N' configurações. E quando alguns testes não passam, você pode usar \"git bisect\" (ou melhor, \"git bisect run\"). Então você deve executar a grosso modo:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:871
@@ -79021,66 +67537,43 @@ msgstr "c * N * T + b * M * log2(M) tests\n"
 #: en/git-bisect-lk2009.txt:875
 #, priority:100
 msgid "where c is the number of rounds of test (so a small constant) and b is the ratio of bug per commit (hopefully a small constant too)."
-msgstr ""
-"onde 'c' é a quantidade de rodadas de teste (portanto, uma constante pequena)"
-" e 'b' é a proporção dos erros por commit(espero que também seja uma "
-"constante pequena)."
+msgstr "onde 'c' é a quantidade de rodadas de teste (portanto, uma constante pequena) e 'b' é a proporção dos erros por commit(espero que também seja uma constante pequena)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:878
 #, priority:100
 msgid "So of course it's much better as it's O(N * T) vs O(N * T * M) if you would test everything after each commit."
-msgstr ""
-"Então é claro que é muito melhor que O(N * T) vs O(N * T * M) caso testasse "
-"tudo após cada commit."
+msgstr "Então é claro que é muito melhor que O(N * T) vs O(N * T * M) caso testasse tudo após cada commit."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:883
 #, priority:100
 msgid "This means that test suites are good to prevent some bugs from being committed and they are also quite good to tell you that you have some bugs. But they are not so good to tell you where some bugs have been introduced. To tell you that efficiently, git bisect is needed."
-msgstr ""
-"Isto significa que os conjuntos de testes são bons para evitar que o commit "
-"de alguns bugs sejam feitos e também são bons para dizer que você tem alguns "
-"bugs. Mas eles não são tão bons para dizer onde alguns erros foram "
-"introduzidos. Para te dizer isso eficientemente, o comando 'git bisect' é "
-"necessário."
+msgstr "Isto significa que os conjuntos de testes são bons para evitar que o commit de alguns bugs sejam feitos e também são bons para dizer que você tem alguns bugs. Mas eles não são tão bons para dizer onde alguns erros foram introduzidos. Para te dizer isso eficientemente, o comando 'git bisect' é necessário."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:890
 #, priority:100
 msgid "The other nice thing with test suites, is that when you have one, you already know how to test for bad behavior. So you can use this knowledge to create a new test case for \"git bisect\" when it appears that there is a regression. So it will be easier to bisect the bug and fix it. And then you can add the test case you just created to your test suite."
-msgstr ""
-"A outra coisa interessante dos conjuntos de testes é que, quando você tem "
-"um, já sabe como testar o mau comportamento. Portanto, você pode usar este "
-"conhecimento para criar um novo caso de teste para o comando \"git bisect\" "
-"quando parecer que uma regressão existe. Portanto, será mais fácil dividir o "
-"bug e corrigi-lo. E então você pode adicionar o caso de teste que você "
-"acabou de criar ao seu conjunto de testes."
+msgstr "A outra coisa interessante dos conjuntos de testes é que, quando você tem um, já sabe como testar o mau comportamento. Portanto, você pode usar este conhecimento para criar um novo caso de teste para o comando \"git bisect\" quando parecer que uma regressão existe. Portanto, será mais fácil dividir o bug e corrigi-lo. E então você pode adicionar o caso de teste que você acabou de criar ao seu conjunto de testes."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:893
 #, priority:100
 msgid "So if you know how to create test cases and how to bisect, you will be subject to a virtuous circle:"
-msgstr ""
-"Portanto, caso saiba criar casos de teste e dividir em partes, estará "
-"sujeito a um círculo virtuoso:"
+msgstr "Portanto, caso saiba criar casos de teste e dividir em partes, estará sujeito a um círculo virtuoso:"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:895
 #, priority:100
 msgid "more tests => easier to create tests => easier to bisect => more tests"
-msgstr ""
-"mais testes => mais fácil de criar testes => mais fácil de fazer 'bisect' => "
-"mais testes"
+msgstr "mais testes => mais fácil de criar testes => mais fácil de fazer 'bisect' => mais testes"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:898
 #, priority:100
 msgid "So test suites and \"git bisect\" are complementary tools that are very powerful and efficient when used together."
-msgstr ""
-"Portanto, os conjuntos de testes e o comando \"git bisect\", quando "
-"utilizadas em conjunto, são ferramentas complementares que são muito "
-"poderosas e eficientes."
+msgstr "Portanto, os conjuntos de testes e o comando \"git bisect\", quando utilizadas em conjunto, são ferramentas complementares que são muito poderosas e eficientes."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:900
@@ -79092,9 +67585,7 @@ msgstr "Falhas na construção da bisseção"
 #: en/git-bisect-lk2009.txt:904
 #, priority:100
 msgid "You can very easily automatically bisect broken builds using something like:"
-msgstr ""
-"Você pode facilmente fazer o 'bisect' automaticamente em construções "
-"quebradas usando algo como:"
+msgstr "Você pode facilmente fazer o 'bisect' automaticamente em construções quebradas usando algo como:"
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:908
@@ -79116,16 +67607,13 @@ msgstr "Encaminhando sh -c \"alguns comandos\" para \"git bisect run\""
 #: en/git-bisect-lk2009.txt:917
 #, no-wrap, priority:100
 msgid "$ git bisect run sh -c \"make || exit 125; ./my_app | grep 'good output'\"\n"
-msgstr ""
-"$ git bisect run sh -c \"make || exit 125; ./my_app | grep 'good output'\"\n"
+msgstr "$ git bisect run sh -c \"make || exit 125; ./my_app | grep 'good output'\"\n"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:921
 #, priority:100
 msgid "On the other hand if you do this often, then it can be worth having scripts to avoid too much typing."
-msgstr ""
-"Por outro lado, caso faça isso com frequência, pode valer a pena ter scripts "
-"para evitar muita digitação."
+msgstr "Por outro lado, caso faça isso com frequência, pode valer a pena ter scripts para evitar muita digitação."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:923
@@ -79137,9 +67625,7 @@ msgstr "Localizando regressões de desempenho"
 #: en/git-bisect-lk2009.txt:927
 #, priority:100
 msgid "Here is an example script that comes slightly modified from a real world script used by Junio Hamano <<4>>."
-msgstr ""
-"Aqui está um exemplo do script que é ligeiramente modificado a partir de um "
-"script do mundo real utilizado por Junio Hamano <<4>>."
+msgstr "Aqui está um exemplo do script que é ligeiramente modificado a partir de um script do mundo real utilizado por Junio Hamano <<4>>."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:930
@@ -79231,44 +67717,31 @@ msgstr "Seguindo as melhores práticas gerais"
 #: en/git-bisect-lk2009.txt:967
 #, priority:100
 msgid "It is obviously a good idea not to have commits with changes that knowingly break things, even if some other commits later fix the breakage."
-msgstr ""
-"Obviamente, é uma boa ideia não ter commits com alterações que "
-"conscientemente quebram as coisas, mesmo que os outros commits consigam "
-"consertar quebras posteriores."
+msgstr "Obviamente, é uma boa ideia não ter commits com alterações que conscientemente quebram as coisas, mesmo que os outros commits consigam consertar quebras posteriores."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:970
 #, priority:100
 msgid "It is also a good idea when using any VCS to have only one small logical change in each commit."
-msgstr ""
-"Também é uma boa ideia ao usar qualquer VCS ter apenas uma pequena alteração "
-"lógica em cada commit."
+msgstr "Também é uma boa ideia ao usar qualquer VCS ter apenas uma pequena alteração lógica em cada commit."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:975
 #, priority:100
 msgid "The smaller the changes in your commit, the most effective \"git bisect\" will be. And you will probably need \"git bisect\" less in the first place, as small changes are easier to review even if they are only reviewed by the committer."
-msgstr ""
-"Quanto menores as alterações no seu commit, mais eficaz será o \"git bisect\""
-". E provavelmente você precisará do comando \"git bisect\", não de primeira "
-"pois as pequenas alterações são mais fáceis de revisar, mesmo que sejam "
-"revisadas apenas pelo responsável do envio."
+msgstr "Quanto menores as alterações no seu commit, mais eficaz será o \"git bisect\". E provavelmente você precisará do comando \"git bisect\", não de primeira pois as pequenas alterações são mais fáceis de revisar, mesmo que sejam revisadas apenas pelo responsável do envio."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:978
 #, priority:100
 msgid "Another good idea is to have good commit messages. They can be very helpful to understand why some changes were made."
-msgstr ""
-"Outra boa ideia é ter boas mensagens para os commits. Eles podem ser muito "
-"úteis para entender por que algumas alterações foram feitas."
+msgstr "Outra boa ideia é ter boas mensagens para os commits. Eles podem ser muito úteis para entender por que algumas alterações foram feitas."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:980
 #, priority:100
 msgid "These general best practices are very helpful if you bisect often."
-msgstr ""
-"Estas boas práticas são muito úteis caso você faça 'bisect' com muita "
-"frequência."
+msgstr "Estas boas práticas são muito úteis caso você faça 'bisect' com muita frequência."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:982
@@ -79280,59 +67753,37 @@ msgstr "Evitando mesclagens propensas a erros"
 #: en/git-bisect-lk2009.txt:988
 #, priority:100
 msgid "First merges by themselves can introduce some regressions even when the merge needs no source code conflict resolution. This is because a semantic change can happen in one branch while the other branch is not aware of it."
-msgstr ""
-"As primeiras mesclagens por si só podem introduzir algumas regressões, mesmo "
-"quando a mesclagem não precise de uma resolução de conflitos do código-"
-"fonte. Isso ocorre porque uma mudança semântica pode ocorrer em um ramo, "
-"enquanto o outro ramo não está ciente do que aconteceu."
+msgstr "As primeiras mesclagens por si só podem introduzir algumas regressões, mesmo quando a mesclagem não precise de uma resolução de conflitos do código-fonte. Isso ocorre porque uma mudança semântica pode ocorrer em um ramo, enquanto o outro ramo não está ciente do que aconteceu."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:991
 #, priority:100
 msgid "For example one branch can change the semantic of a function while the other branch add more calls to the same function."
-msgstr ""
-"Como por exemplo, um ramo pode alterar a semântica de uma função, enquanto o "
-"outro ramo adiciona mais chamadas à mesma função."
+msgstr "Como por exemplo, um ramo pode alterar a semântica de uma função, enquanto o outro ramo adiciona mais chamadas à mesma função."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:998
 #, priority:100
 msgid "This is made much worse if many files have to be fixed to resolve conflicts. That's why such merges are called \"evil merges\". They can make regressions very difficult to track down. It can even be misleading to know the first bad commit if it happens to be such a merge, because people might think that the bug comes from bad conflict resolution when it comes from a semantic change in one branch."
-msgstr ""
-"Piora muito caso muitos arquivos precisem ser corrigidos por causa de "
-"conflitos. É por isso que estas mesclagens são chamadas de \"mesclagens más\""
-" (evil merges). Eles podem tornar as regressões muito difíceis de rastrear. "
-"Pode até ser enganador saber que o primeiro commit ruim, caso seja uma "
-"mesclagem deste tipo, porque as pessoas podem pensar que o bug vem de uma má "
-"resolução de conflito quando se trata de uma alteração semântica em um ramo."
+msgstr "Piora muito caso muitos arquivos precisem ser corrigidos por causa de conflitos. É por isso que estas mesclagens são chamadas de \"mesclagens más\" (evil merges). Eles podem tornar as regressões muito difíceis de rastrear. Pode até ser enganador saber que o primeiro commit ruim, caso seja uma mesclagem deste tipo, porque as pessoas podem pensar que o bug vem de uma má resolução de conflito quando se trata de uma alteração semântica em um ramo."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1004
 #, priority:100
 msgid "Anyway \"git rebase\" can be used to linearize history. This can be used either to avoid merging in the first place. Or it can be used to bisect on a linear history instead of the non linear one, as this should give more information in case of a semantic change in one branch."
-msgstr ""
-"De qualquer forma, \"git rebase\" pode ser utilizado para linearizar o "
-"histórico. Pode ser utilizado em primeiro lugar, para evitar a mesclagem. Ou "
-"pode ser utilizado para dividir um histórico linear em vez do que não seja "
-"linear, pois isso deve fornecer mais informações no caso de uma alteração "
-"semântica em um ramo."
+msgstr "De qualquer forma, \"git rebase\" pode ser utilizado para linearizar o histórico. Pode ser utilizado em primeiro lugar, para evitar a mesclagem. Ou pode ser utilizado para dividir um histórico linear em vez do que não seja linear, pois isso deve fornecer mais informações no caso de uma alteração semântica em um ramo."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1007
 #, priority:100
 msgid "Merges can be also made simpler by using smaller branches or by using many topic branches instead of only long version related branches."
-msgstr ""
-"As mesclagens também podem ser simplificadas utilizando os ramos menores ou "
-"ao utilizar muitos tópicos das ramificações, em vez de apenas as "
-"ramificações das versões mais longas."
+msgstr "As mesclagens também podem ser simplificadas utilizando os ramos menores ou ao utilizar muitos tópicos das ramificações, em vez de apenas as ramificações das versões mais longas."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1010
 #, priority:100
 msgid "And testing can be done more often in special integration branches like linux-next for the linux kernel."
-msgstr ""
-"E os testes podem ser feitos com mais frequência nos ramos nas integrações "
-"especiais como 'linux-next' para o kernel do linux."
+msgstr "E os testes podem ser feitos com mais frequência nos ramos nas integrações especiais como 'linux-next' para o kernel do linux."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1012
@@ -79344,23 +67795,19 @@ msgstr "Adaptando o seu fluxo de trabalho"
 #: en/git-bisect-lk2009.txt:1015
 #, priority:100
 msgid "A special work-flow to process regressions can give great results."
-msgstr ""
-"Um fluxo de trabalho especial para processar as regressões pode dar ótimos "
-"resultados."
+msgstr "Um fluxo de trabalho especial para processar as regressões pode dar ótimos resultados."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1017
 #, priority:100
 msgid "Here is an example of a work-flow used by Andreas Ericsson:"
-msgstr ""
-"Aqui está um exemplo de um fluxo de trabalho utilizado por Andreas Ericsson:"
+msgstr "Aqui está um exemplo de um fluxo de trabalho utilizado por Andreas Ericsson:"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1019
 #, priority:100
 msgid "write, in the test suite, a test script that exposes the regression"
-msgstr ""
-"escreva, no conjunto de testes, um script de teste que exponha a regressão"
+msgstr "escreva, no conjunto de testes, um script de teste que exponha a regressão"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1020
@@ -79378,9 +67825,7 @@ msgstr "corrija o bug que muitas vezes se torna óbvio na etapa anterior"
 #: en/git-bisect-lk2009.txt:1022
 #, priority:100
 msgid "commit both the fix and the test script (and if needed more tests)"
-msgstr ""
-"faz o commit de ambas as correções e o script de teste (e se necessário, "
-"mais testes)"
+msgstr "faz o commit de ambas as correções e o script de teste (e se necessário, mais testes)"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1024
@@ -79392,70 +67837,43 @@ msgstr "E aqui está o que o Andreas disse sobre este fluxo de trabalho <<5>>:"
 #: en/git-bisect-lk2009.txt:1034
 #, priority:100
 msgid "To give some hard figures, we used to have an average report-to-fix cycle of 142.6 hours (according to our somewhat weird bug-tracker which just measures wall-clock time). Since we moved to Git, we've lowered that to 16.2 hours. Primarily because we can stay on top of the bug fixing now, and because everyone's jockeying to get to fix bugs (we're quite proud of how lazy we are to let Git find the bugs for us). Each new release results in ~40% fewer bugs (almost certainly due to how we now feel about writing tests)."
-msgstr ""
-"Para dar alguns números concretos, costumávamos ter um relatório médio para "
-"corrigir o ciclo de 142.6 horas (de acordo com nosso rastreador de bugs um "
-"tanto estranho que apenas mede o tempo). Desde que nos mudamos para o Git, "
-"diminuímos para 16.2 horas. Principalmente porque podemos ficar em cima da "
-"correção dos bugs agora e porque todo mundo está tentando resolver os bugs ("
-"estamos muito orgulhosos de como somos preguiçosos em deixar o Git encontrar "
-"os bugs para nós). Cada nova versão resulta em ~40% menos bugs (quase "
-"certamente devido à forma como nos sentimos ao escrever testes)."
+msgstr "Para dar alguns números concretos, costumávamos ter um relatório médio para corrigir o ciclo de 142.6 horas (de acordo com nosso rastreador de bugs um tanto estranho que apenas mede o tempo). Desde que nos mudamos para o Git, diminuímos para 16.2 horas. Principalmente porque podemos ficar em cima da correção dos bugs agora e porque todo mundo está tentando resolver os bugs (estamos muito orgulhosos de como somos preguiçosos em deixar o Git encontrar os bugs para nós). Cada nova versão resulta em ~40% menos bugs (quase certamente devido à forma como nos sentimos ao escrever testes)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1039
 #, priority:100
 msgid "Clearly this work-flow uses the virtuous circle between test suites and \"git bisect\". In fact it makes it the standard procedure to deal with regression."
-msgstr ""
-"Claramente, este fluxo de trabalho utiliza o círculo virtuoso entre os "
-"conjuntos de testes e o \"git bisect\". De fato, torna o procedimento padrão "
-"para lidar com a regressão."
+msgstr "Claramente, este fluxo de trabalho utiliza o círculo virtuoso entre os conjuntos de testes e o \"git bisect\". De fato, torna o procedimento padrão para lidar com a regressão."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1044
 #, ignore-ellipsis, priority:100
 msgid "In other messages Andreas says that they also use the \"best practices\" described above: small logical commits, topic branches, no evil merge,... These practices all improve the bisectability of the commit graph, by making it easier and more useful to bisect."
-msgstr ""
-"Em outras mensagens, Andreas diz que eles também utilizam as \"melhores "
-"práticas\" descritas acima: pequenos commits lógicos, tópicos das "
-"ramificações, sem mesclagem \"do mal\",... Todas estas práticas aprimoram a "
-"bisectabilidade do grafo do commit, tornando mais fácil e mais útil o "
-"processo de bisseção."
+msgstr "Em outras mensagens, Andreas diz que eles também utilizam as \"melhores práticas\" descritas acima: pequenos commits lógicos, tópicos das ramificações, sem mesclagem \"do mal\",... Todas estas práticas aprimoram a bisectabilidade do grafo do commit, tornando mais fácil e mais útil o processo de bisseção."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1047
 #, priority:100
 msgid "So a good work-flow should be designed around the above points. That is making bisecting easier, more useful and standard."
-msgstr ""
-"Portanto, um bom fluxo de trabalho deve ser projetado em torno dos pontos "
-"acima. Isso está tornando a divisão mais fácil, mais útil e padronizado."
+msgstr "Portanto, um bom fluxo de trabalho deve ser projetado em torno dos pontos acima. Isso está tornando a divisão mais fácil, mais útil e padronizado."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1049
 #, no-wrap, priority:100
 msgid "Involving QA people and if possible end users"
-msgstr ""
-"Envolvendo pessoas do controle de qualidade e se possível, usuários finais"
+msgstr "Envolvendo pessoas do controle de qualidade e se possível, usuários finais"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1055
 #, priority:100
 msgid "One nice about \"git bisect\" is that it is not only a developer tool. It can effectively be used by QA people or even end users (if they have access to the source code or if they can get access to all the builds)."
-msgstr ""
-"Um aspecto interessante do comando \"git bisect\" é que ele não é apenas uma "
-"ferramenta de desenvolvedor. Ele pode ser usado efetivamente por pessoas do "
-"controle de qualidade ou mesmo pelos usuários finais (caso eles tenham "
-"acesso ao código-fonte ou se puderem ter acesso a todas as compilações)."
+msgstr "Um aspecto interessante do comando \"git bisect\" é que ele não é apenas uma ferramenta de desenvolvedor. Ele pode ser usado efetivamente por pessoas do controle de qualidade ou mesmo pelos usuários finais (caso eles tenham acesso ao código-fonte ou se puderem ter acesso a todas as compilações)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1059
 #, priority:100
 msgid "There was a discussion at one point on the linux kernel mailing list of whether it was ok to always ask end user to bisect, and very good points were made to support the point of view that it is ok."
-msgstr ""
-"Houve uma discussão em um ponto na lista de discussão do kernel do linux "
-"sobre se era permitido sempre pedir ao usuário final que fizesse um "
-"'bisect', foram levantados muitos pontos interessantes apoiando este ponto "
-"de vista que sim, é permitido."
+msgstr "Houve uma discussão em um ponto na lista de discussão do kernel do linux sobre se era permitido sempre pedir ao usuário final que fizesse um 'bisect', foram levantados muitos pontos interessantes apoiando este ponto de vista que sim, é permitido."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1061
@@ -79467,41 +67885,25 @@ msgstr "Como por exemplo, David Miller escreveu <<6>>:"
 #: en/git-bisect-lk2009.txt:1068
 #, priority:100
 msgid "What people don't get is that this is a situation where the \"end node principle\" applies. When you have limited resources (here: developers)  you don't push the bulk of the burden upon them. Instead you push things out to the resource you have a lot of, the end nodes (here: users), so that the situation actually scales."
-msgstr ""
-"O que as pessoas não entendem é que esta é uma situação onde o \"princípio "
-"do nó final\" se aplica. Quando você tem recursos limitados (aqui: "
-"desenvolvedores) você não impõe a maior parte do ônus sobre eles. Em vez "
-"disso, você envia as coisas para o recurso que possui muitos nós finais "
-"(aqui: usuários) para que a situação realmente se escale."
+msgstr "O que as pessoas não entendem é que esta é uma situação onde o \"princípio do nó final\" se aplica. Quando você tem recursos limitados (aqui: desenvolvedores) você não impõe a maior parte do ônus sobre eles. Em vez disso, você envia as coisas para o recurso que possui muitos nós finais (aqui: usuários) para que a situação realmente se escale."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1072
 #, priority:100
 msgid "This means that it is often \"cheaper\" if QA people or end users can do it."
-msgstr ""
-"Isto significa que geralmente é \"mais barato\" se as pessoas do controle de "
-"qualidade ou dos usuários finais puderem fazer isso."
+msgstr "Isto significa que geralmente é \"mais barato\" se as pessoas do controle de qualidade ou dos usuários finais puderem fazer isso."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1079
 #, priority:100
 msgid "What is interesting too is that end users that are reporting bugs (or QA people that reproduced a bug) have access to the environment where the bug happens. So they can often more easily reproduce a regression. And if they can bisect, then more information will be extracted from the environment where the bug happens, which means that it will be easier to understand and then fix the bug."
-msgstr ""
-"O interessante também é que os usuários finais que estão relatando os bugs ("
-"ou das pessoas do controle de qualidade que reproduziram um bug) têm acesso "
-"ao ambiente onde o bug ocorre. Portanto, eles geralmente podem reproduzir "
-"mais facilmente uma regressão. E se eles puderem fazer um 'bisect', mais "
-"informações serão extraídas do ambiente onde o erro ocorre, o que significa "
-"que será mais fácil compreender e então corrigir o bug."
+msgstr "O interessante também é que os usuários finais que estão relatando os bugs (ou das pessoas do controle de qualidade que reproduziram um bug) têm acesso ao ambiente onde o bug ocorre. Portanto, eles geralmente podem reproduzir mais facilmente uma regressão. E se eles puderem fazer um 'bisect', mais informações serão extraídas do ambiente onde o erro ocorre, o que significa que será mais fácil compreender e então corrigir o bug."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1083
 #, priority:100
 msgid "For open source projects it can be a good way to get more useful contributions from end users, and to introduce them to QA and development activities."
-msgstr ""
-"Para os projetos de código aberto, pode ser uma boa maneira de obter "
-"contribuições mais úteis dos usuários finais e apresentá-las às atividades "
-"do controle de qualidade e desenvolvimento."
+msgstr "Para os projetos de código aberto, pode ser uma boa maneira de obter contribuições mais úteis dos usuários finais e apresentá-las às atividades do controle de qualidade e desenvolvimento."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1085
@@ -79513,10 +67915,7 @@ msgstr "Usando scripts complexos"
 #: en/git-bisect-lk2009.txt:1089
 #, priority:100
 msgid "In some cases like for kernel development it can be worth developing complex scripts to be able to fully automate bisecting."
-msgstr ""
-"Em alguns casos, como no desenvolvimento do kernel, pode valer a pena "
-"desenvolver scripts complexos para poder automatizar completamente a "
-"bissetriz."
+msgstr "Em alguns casos, como no desenvolvimento do kernel, pode valer a pena desenvolver scripts complexos para poder automatizar completamente a bissetriz."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1091
@@ -79528,15 +67927,7 @@ msgstr "Aqui está o que Ingo Molnar diz sobre isso <<7>>:"
 #: en/git-bisect-lk2009.txt:1101
 #, priority:100
 msgid "i have a fully automated bootup-hang bisection script. It is based on \"git-bisect run\". I run the script, it builds and boots kernels fully automatically, and when the bootup fails (the script notices that via the serial log, which it continuously watches - or via a timeout, if the system does not come up within 10 minutes it's a \"bad\" kernel), the script raises my attention via a beep and i power cycle the test box. (yeah, i should make use of a managed power outlet to 100% automate it)"
-msgstr ""
-"Eu tenho um script para bisseção totalmente automatizado que trava o "
-"processo de boot. Tem origem no \"git-bisect run\". Eu o executo, ele cria e "
-"inicializa os kernels automaticamente e quando a inicialização falha (o "
-"script percebe que, por meio do registro log serial, que ele assiste "
-"continuamente ou por um tempo limite, caso o sistema não apareça em 10 "
-"minutos, é um kernel \"ruim\"), o script chama minha atenção através de um "
-"sinal sonoro e eu desligo a caixa de teste. (sim, eu devo usar uma tomada "
-"gerenciada para automatizá-la 100%)"
+msgstr "Eu tenho um script para bisseção totalmente automatizado que trava o processo de boot. Tem origem no \"git-bisect run\". Eu o executo, ele cria e inicializa os kernels automaticamente e quando a inicialização falha (o script percebe que, por meio do registro log serial, que ele assiste continuamente ou por um tempo limite, caso o sistema não apareça em 10 minutos, é um kernel \"ruim\"), o script chama minha atenção através de um sinal sonoro e eu desligo a caixa de teste. (sim, eu devo usar uma tomada gerenciada para automatizá-la 100%)"
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1104
@@ -79548,24 +67939,13 @@ msgstr "Combinando os conjuntos dos testes, git bisect e outros sistemas juntos"
 #: en/git-bisect-lk2009.txt:1109
 #, priority:100
 msgid "We have seen that test suites and git bisect are very powerful when used together. It can be even more powerful if you can combine them with other systems."
-msgstr ""
-"Vimos que os conjuntos dos testes e o comando 'git bisect' são muito "
-"poderosos quando usados juntos. Pode ser ainda mais poderoso caso possa "
-"combiná-los com outros sistemas."
+msgstr "Vimos que os conjuntos dos testes e o comando 'git bisect' são muito poderosos quando usados juntos. Pode ser ainda mais poderoso caso possa combiná-los com outros sistemas."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1116
 #, priority:100
 msgid "For example some test suites could be run automatically at night with some unusual (or even random) configurations. And if a regression is found by a test suite, then \"git bisect\" can be automatically launched, and its result can be emailed to the author of the first bad commit found by \"git bisect\", and perhaps other people too. And a new entry in the bug tracking system could be automatically created too."
-msgstr ""
-"Como por exemplo, alguns conjuntos de testes podem ser executados "
-"automaticamente à noite com algumas configurações incomuns (ou mesmo "
-"aleatórias). E caso uma regressão eja encontrada por um conjunto de testes, "
-"o comando \"git bisect\" poderá ser iniciado automaticamente e o seu "
-"resultado poderá ser enviado através de um e-mail ao autor do primeiro "
-"commit ruim encontrado pelo \"git bisect\", e talvez das outras pessoas "
-"também. E uma nova entrada no sistema de monitoramento dos bugs também pode "
-"ser criada de forma automática."
+msgstr "Como por exemplo, alguns conjuntos de testes podem ser executados automaticamente à noite com algumas configurações incomuns (ou mesmo aleatórias). E caso uma regressão eja encontrada por um conjunto de testes, o comando \"git bisect\" poderá ser iniciado automaticamente e o seu resultado poderá ser enviado através de um e-mail ao autor do primeiro commit ruim encontrado pelo \"git bisect\", e talvez das outras pessoas também. E uma nova entrada no sistema de monitoramento dos bugs também pode ser criada de forma automática."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1119
@@ -79583,22 +67963,13 @@ msgstr "\"git replace\""
 #: en/git-bisect-lk2009.txt:1128
 #, priority:100
 msgid "We saw earlier that \"git bisect skip\" is now using a PRNG to try to avoid areas in the commit graph where commits are untestable. The problem is that sometimes the first bad commit will be in an untestable area."
-msgstr ""
-"Vimos anteriormente que o comando \"git bisect skip\" agora está usando um "
-"PRNG para tentar evitar as áreas no grafo do commit onde o commit não sejam "
-"testáveis. O problema é que, às vezes, o primeiro commit ruim fica em uma "
-"área não testável."
+msgstr "Vimos anteriormente que o comando \"git bisect skip\" agora está usando um PRNG para tentar evitar as áreas no grafo do commit onde o commit não sejam testáveis. O problema é que, às vezes, o primeiro commit ruim fica em uma área não testável."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1134
 #, priority:100
 msgid "To simplify the discussion we will suppose that the untestable area is a simple string of commits and that it was created by a breakage introduced by one commit (let's call it BBC for bisect breaking commit) and later fixed by another one (let's call it BFC for bisect fixing commit)."
-msgstr ""
-"Para simplificar a discussão, supomos que a área não testável seja uma "
-"cadeia simples de commits e que ela foi criada por uma quebra introduzida "
-"por um commit (vamos chamá-lo de 'BBC' para o 'bisect' quebrado do commit) e "
-"posteriormente corrigida por outro (vamos chamá-lo de 'BFC' para o 'bisect' "
-"que vai corrigir o commit)."
+msgstr "Para simplificar a discussão, supomos que a área não testável seja uma cadeia simples de commits e que ela foi criada por uma quebra introduzida por um commit (vamos chamá-lo de 'BBC' para o 'bisect' quebrado do commit) e posteriormente corrigida por outro (vamos chamá-lo de 'BFC' para o 'bisect' que vai corrigir o commit)."
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1139
@@ -79610,21 +67981,13 @@ msgstr "...-Y-BBC-X1-X2-X3-X4-X5-X6-BFC-Z-...\n"
 #: en/git-bisect-lk2009.txt:1143
 #, priority:100
 msgid "where we know that Y is good and BFC is bad, and where BBC and X1 to X6 are untestable."
-msgstr ""
-"onde sabemos que 'Y' é bom e 'BFC' é ruim e onde 'BBC' e de 'X1' até 'X6' "
-"onde os testes não sejam possíveis."
+msgstr "onde sabemos que 'Y' é bom e 'BFC' é ruim e onde 'BBC' e de 'X1' até 'X6' onde os testes não sejam possíveis."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1150
 #, priority:100
 msgid "In this case if you are bisecting manually, what you can do is create a special branch that starts just before the BBC. The first commit in this branch should be the BBC with the BFC squashed into it. And the other commits in the branch should be the commits between BBC and BFC rebased on the first commit of the branch and then the commit after BFC also rebased on."
-msgstr ""
-"Neste caso, caso esteja dividindo manualmente, o que você pode fazer é criar "
-"uma ramificação especial que comece logo antes da \"BBC\". O primeiro commit "
-"neste ramo deve ser o \"BBC\" com o \"BFC\" compactado nele. E os outros "
-"commits no ramo devem ser os commits entre \"BBC\" e \"BFC\" reconstruídos "
-"no primeiro commit do ramo e depois o commit após o BFC também ter sido "
-"reconstruído."
+msgstr "Neste caso, caso esteja dividindo manualmente, o que você pode fazer é criar uma ramificação especial que comece logo antes da \"BBC\". O primeiro commit neste ramo deve ser o \"BBC\" com o \"BFC\" compactado nele. E os outros commits no ramo devem ser os commits entre \"BBC\" e \"BFC\" reconstruídos no primeiro commit do ramo e depois o commit após o BFC também ter sido reconstruído."
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1157
@@ -79642,15 +68005,13 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:1160
 #, priority:100
 msgid "where commits quoted with ' have been rebased."
-msgstr ""
-"onde os commits citados com ' foram reconstruídos na sua base (rebased)."
+msgstr "onde os commits citados com ' foram reconstruídos na sua base (rebased)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1162
 #, priority:100
 msgid "You can easily create such a branch with Git using interactive rebase."
-msgstr ""
-"Você pode criar facilmente um ramo com o Git usando reconstrução interativa."
+msgstr "Você pode criar facilmente um ramo com o Git usando reconstrução interativa."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1164
@@ -79674,9 +68035,7 @@ msgstr "e depois mover o 'BFC' após o 'BBC' e esmagá-lo."
 #: en/git-bisect-lk2009.txt:1173
 #, priority:100
 msgid "After that you can start bisecting as usual in the new branch and you should eventually find the first bad commit."
-msgstr ""
-"Depois disso, é possível começar a dividir normalmente no novo ramo e "
-"eventualmente, encontrar o primeiro commit com problemas."
+msgstr "Depois disso, é possível começar a dividir normalmente no novo ramo e eventualmente, encontrar o primeiro commit com problemas."
 
 #. type: delimited block -
 #: en/git-bisect-lk2009.txt:1178
@@ -79688,59 +68047,31 @@ msgstr "$ git bisect start Z' Y\n"
 #: en/git-bisect-lk2009.txt:1189
 #, priority:100
 msgid "If you are using \"git bisect run\", you can use the same manual fix up as above, and then start another \"git bisect run\" in the special branch. Or as the \"git bisect\" man page says, the script passed to \"git bisect run\" can apply a patch before it compiles and test the software <<8>>. The patch should turn a current untestable commits into a testable one. So the testing will result in \"good\" or \"bad\" and \"git bisect\" will be able to find the first bad commit. And the script should not forget to remove the patch once the testing is done before exiting from the script."
-msgstr ""
-"Caso esteja utilizando o comando `git bisect run`, é possível utilizar a "
-"mesma correção manual acima e em seguida, iniciar outro comando `git bisect "
-"run` no ramo especial. Ou como diz na página do manual `git bisect`, o "
-"script passado ao `git bisect run` pode aplicar um patch antes de compilar e "
-"testar o software <<8>>. O patch deve transformar um commit atual não "
-"testável em um testável. Portanto, o teste resultará em \"bom\" ou \"ruim\" "
-"e o comando `git bisect` será capaz de encontrar o primeiro commit que "
-"estiver ruim. O script não deve se esquecer de remover o patch assim que o "
-"teste for concluído antes de encerrar o script."
+msgstr "Caso esteja utilizando o comando `git bisect run`, é possível utilizar a mesma correção manual acima e em seguida, iniciar outro comando `git bisect run` no ramo especial. Ou como diz na página do manual `git bisect`, o script passado ao `git bisect run` pode aplicar um patch antes de compilar e testar o software <<8>>. O patch deve transformar um commit atual não testável em um testável. Portanto, o teste resultará em \"bom\" ou \"ruim\" e o comando `git bisect` será capaz de encontrar o primeiro commit que estiver ruim. O script não deve se esquecer de remover o patch assim que o teste for concluído antes de encerrar o script."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1194
 #, priority:100
 msgid "(Note that instead of a patch you can use \"git cherry-pick BFC\" to apply the fix, and in this case you should use \"git reset --hard HEAD^\" to revert the cherry-pick after testing and before returning from the script.)"
-msgstr ""
-"(Observe que, em vez de um patch, é possível utilizar o comando \"git cherry-"
-"pick BFC\" para aplicar a correção e neste caso, utilizar o comando \"git "
-"reset --hard HEAD^\" para reverter a escolha seletiva após o teste e antes "
-"de retornar do script.)"
+msgstr "(Observe que, em vez de um patch, é possível utilizar o comando \"git cherry-pick BFC\" para aplicar a correção e neste caso, utilizar o comando \"git reset --hard HEAD^\" para reverter a escolha seletiva após o teste e antes de retornar do script.)"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1202
 #, priority:100
 msgid "But the above ways to work around untestable areas are a little bit clunky. Using special branches is nice because these branches can be shared by developers like usual branches, but the risk is that people will get many such branches. And it disrupts the normal \"git bisect\" work-flow. So, if you want to use \"git bisect run\" completely automatically, you have to add special code in your script to restart bisection in the special branches."
-msgstr ""
-"Porém as maneiras demonstradas acima para solucionar as áreas não testáveis "
-"são um pouco atrapalhadas. Utilizar os ramos especiais é bom porque estas "
-"ramificações podem ser compartilhadas pelos desenvolvedores como ramos "
-"comuns, porém o risco é que as pessoas obtenham muitos ramos. E isso "
-"interrompe o fluxo de trabalho normal \"git bisect\". Portanto, caso queira "
-"utilizar o \"git bisect run\" automaticamente, precisará adicionar um código "
-"especial ao seu script para reiniciar a bisseção nos ramos especiais."
+msgstr "Porém as maneiras demonstradas acima para solucionar as áreas não testáveis são um pouco atrapalhadas. Utilizar os ramos especiais é bom porque estas ramificações podem ser compartilhadas pelos desenvolvedores como ramos comuns, porém o risco é que as pessoas obtenham muitos ramos. E isso interrompe o fluxo de trabalho normal \"git bisect\". Portanto, caso queira utilizar o \"git bisect run\" automaticamente, precisará adicionar um código especial ao seu script para reiniciar a bisseção nos ramos especiais."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1207
 #, priority:100
 msgid "Anyway one can notice in the above special branch example that the Z' and Z commits should point to the same source code state (the same \"tree\" in git parlance). That's because Z' result from applying the same changes as Z just in a slightly different order."
-msgstr ""
-"De qualquer forma, pode-se notar no exemplo do ramo especial acima que os "
-"commit Z' e Z devem apontar para a mesma condição do código-fonte (a mesma "
-"\"árvore\" da linguagem git). Isso ocorre porque Z' resulta da aplicação das "
-"mesmas alterações que Z em uma ordem ligeiramente diferente."
+msgstr "De qualquer forma, pode-se notar no exemplo do ramo especial acima que os commit Z' e Z devem apontar para a mesma condição do código-fonte (a mesma \"árvore\" da linguagem git). Isso ocorre porque Z' resulta da aplicação das mesmas alterações que Z em uma ordem ligeiramente diferente."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1211
 #, priority:100
 msgid "So if we could just \"replace\" Z by Z' when we bisect, then we would not need to add anything to a script. It would just work for anyone in the project sharing the special branches and the replacements."
-msgstr ""
-"Portanto, se pudéssemos \"substituir\" 'Z' por 'Z' quando fazemos o "
-"'bisect', não precisaríamos adicionar nada em um script. Funcionaria apenas "
-"para qualquer pessoa no projeto que compartilhasse as ramificações especiais "
-"e as substituições."
+msgstr "Portanto, se pudéssemos \"substituir\" 'Z' por 'Z' quando fazemos o 'bisect', não precisaríamos adicionar nada em um script. Funcionaria apenas para qualquer pessoa no projeto que compartilhasse as ramificações especiais e as substituições."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1213
@@ -79764,45 +68095,25 @@ msgstr ""
 #: en/git-bisect-lk2009.txt:1225
 #, priority:100
 msgid "That's why the \"git replace\" command was created. Technically it stores replacements \"refs\" in the \"refs/replace/\" hierarchy. These \"refs\" are like branches (that are stored in \"refs/heads/\") or tags (that are stored in \"refs/tags\"), and that means that they can automatically be shared like branches or tags among developers."
-msgstr ""
-"É por isso que o comando \"git replace\" foi criado. Tecnicamente, ele "
-"armazena as substituições das refs na hierarquia \"refs/replace/\". Estas "
-"refs são como ramificações (que são armazenadas em \"refs/heads/\") ou nas "
-"tags (que são armazenadas em \"refs/tags\"), isso significa que eles podem "
-"ser automaticamente compartilhados como ramificações ou tags entre os "
-"desenvolvedores."
+msgstr "É por isso que o comando \"git replace\" foi criado. Tecnicamente, ele armazena as substituições das refs na hierarquia \"refs/replace/\". Estas refs são como ramificações (que são armazenadas em \"refs/heads/\") ou nas tags (que são armazenadas em \"refs/tags\"), isso significa que eles podem ser automaticamente compartilhados como ramificações ou tags entre os desenvolvedores."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1230
 #, priority:100
 msgid "\"git replace\" is a very powerful mechanism. It can be used to fix commits in already released history, for example to change the commit message or the author. And it can also be used instead of git \"grafts\" to link a repository with another old repository."
-msgstr ""
-"O comando \"git replace\" é um mecanismo muito poderoso. Pode ser utilizado "
-"para corrigir os commits no histórico já lançado, como por exemplo, alterar "
-"a mensagem do commit ou o autor do mesmo. E também pode ser utilizado em vez "
-"dos \"enxertos\" do git para vincular um repositório a um outro repositório "
-"antigo."
+msgstr "O comando \"git replace\" é um mecanismo muito poderoso. Pode ser utilizado para corrigir os commits no histórico já lançado, como por exemplo, alterar a mensagem do commit ou o autor do mesmo. E também pode ser utilizado em vez dos \"enxertos\" do git para vincular um repositório a um outro repositório antigo."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1234
 #, priority:100
 msgid "In fact it's this last feature that \"sold\" it to the Git community, so it is now in the \"master\" branch of Git's Git repository and it should be released in Git 1.6.5 in October or November 2009."
-msgstr ""
-"De fato, é este o último recurso que o \"vendeu\" para a comunidade Git, "
-"agora está no ramo \"master\" do repositório Git do Git e deve ser lançado "
-"no Git 1.6.5 em outubro ou novembro de 2009."
+msgstr "De fato, é este o último recurso que o \"vendeu\" para a comunidade Git, agora está no ramo \"master\" do repositório Git do Git e deve ser lançado no Git 1.6.5 em outubro ou novembro de 2009."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1241
 #, priority:100
 msgid "One problem with \"git replace\" is that currently it stores all the replacements refs in \"refs/replace/\", but it would be perhaps better if the replacement refs that are useful only for bisecting would be in \"refs/replace/bisect/\". This way the replacement refs could be used only for bisecting, while other refs directly in \"refs/replace/\" would be used nearly all the time."
-msgstr ""
-"Um problema com o comando \"git replace\" é que ele atualmente armazena "
-"todas as substituições refs no \"refs/replace/\", mas talvez seja melhor "
-"caso as substituições das refs de que são úteis apenas para a bisseção "
-"estivessem no \"refs/replace/bisect/\". Dessa maneira, a reposição das refs "
-"poderiam ser usados apenas para fazer a bisseção, enquanto as outras refs "
-"diretamente em \"refs/replace/\" seriam utilizadas quase que o tempo todo."
+msgstr "Um problema com o comando \"git replace\" é que ele atualmente armazena todas as substituições refs no \"refs/replace/\", mas talvez seja melhor caso as substituições das refs de que são úteis apenas para a bisseção estivessem no \"refs/replace/bisect/\". Dessa maneira, a reposição das refs poderiam ser usados apenas para fazer a bisseção, enquanto as outras refs diretamente em \"refs/replace/\" seriam utilizadas quase que o tempo todo."
 
 #. type: Title ~
 #: en/git-bisect-lk2009.txt:1243
@@ -79814,60 +68125,37 @@ msgstr "Erros esporádicos da bisseção"
 #: en/git-bisect-lk2009.txt:1248
 #, priority:100
 msgid "Another possible improvement to \"git bisect\" would be to optionally add some redundancy to the tests performed so that it would be more reliable when tracking sporadic bugs."
-msgstr ""
-"Outra possível melhoria do \"git bisect\" seria adicionar opcionalmente "
-"alguma redundância aos testes que forem realizados, para que fosse mais "
-"confiável durante o rastreio de erros esporádicos."
+msgstr "Outra possível melhoria do \"git bisect\" seria adicionar opcionalmente alguma redundância aos testes que forem realizados, para que fosse mais confiável durante o rastreio de erros esporádicos."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1252
 #, priority:100
 msgid "This has been requested by some kernel developers because some bugs called sporadic bugs do not appear in all the kernel builds because they are very dependent on the compiler output."
-msgstr ""
-"Isso foi solicitado por alguns desenvolvedores do kernel porque alguns erros "
-"chamados esporádicos não aparecem em todas as compilações porque são muito "
-"dependentes do que é gerado pelo compilador."
+msgstr "Isso foi solicitado por alguns desenvolvedores do kernel porque alguns erros chamados esporádicos não aparecem em todas as compilações porque são muito dependentes do que é gerado pelo compilador."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1261
 #, priority:100
 msgid "The idea is that every 3 test for example, \"git bisect\" could ask the user to test a commit that has already been found to be \"good\" or \"bad\" (because one of its descendants or one of its ancestors has been found to be \"good\" or \"bad\" respectively). If it happens that a commit has been previously incorrectly classified then the bisection can be aborted early, hopefully before too many mistakes have been made. Then the user will have to look at what happened and then restart the bisection using a fixed bisect log."
-msgstr ""
-"A ideia é que a cada três testes por exemplo, o comando \"git bisect\" possa "
-"solicitar ao usuário que teste um commit que já foi considerado \"bom\" ou "
-"\"ruim\" (porque um de seus descendentes ou um dos seus ancestrais tenha "
-"sido encontrado como sendo \"bom\" ou \"ruim\", respectivamente). Caso um "
-"commit tenha sido previamente classificado incorretamente, a bisseção poderá "
-"ser interrompida mais cedo, antes que muitos erros possam ser cometidos. Em "
-"seguida, o usuário terá que verificar o que aconteceu e reiniciar a bisseção "
-"usando um registro log fixo do 'bisect'."
+msgstr "A ideia é que a cada três testes por exemplo, o comando \"git bisect\" possa solicitar ao usuário que teste um commit que já foi considerado \"bom\" ou \"ruim\" (porque um de seus descendentes ou um dos seus ancestrais tenha sido encontrado como sendo \"bom\" ou \"ruim\", respectivamente). Caso um commit tenha sido previamente classificado incorretamente, a bisseção poderá ser interrompida mais cedo, antes que muitos erros possam ser cometidos. Em seguida, o usuário terá que verificar o que aconteceu e reiniciar a bisseção usando um registro log fixo do 'bisect'."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1265
 #, priority:100
 msgid "There is already a project called BBChop created by Ealdwulf Wuffinga on Github that does something like that using Bayesian Search Theory <<9>>:"
-msgstr ""
-"Já existe um projeto chamado 'BBChop' criado por Ealdwulf Wuffinga no Github "
-"que faz algo assim usando a Teoria Bayesiana de Pesquisa <<9>>:"
+msgstr "Já existe um projeto chamado 'BBChop' criado por Ealdwulf Wuffinga no Github que faz algo assim usando a Teoria Bayesiana de Pesquisa <<9>>:"
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1272
 #, priority:100
 msgid "BBChop is like 'git bisect' (or equivalent), but works when your bug is intermittent. That is, it works in the presence of false negatives (when a version happens to work this time even though it contains the bug). It assumes that there are no false positives (in principle, the same approach would work, but adding it may be non-trivial)."
-msgstr ""
-"O BBChop é como o comando 'git bisect' (ou equivalente), mas funciona quando "
-"o seu bug for intermitente. Ou seja, funciona na presença dos falsos "
-"negativos (quando uma versão funcione embora contenha o erro). Assume que "
-"não há falsos positivos (em princípio, a mesma abordagem funcionaria, porém "
-"adicioná-la pode não ser trivial)."
+msgstr "O BBChop é como o comando 'git bisect' (ou equivalente), mas funciona quando o seu bug for intermitente. Ou seja, funciona na presença dos falsos negativos (quando uma versão funcione embora contenha o erro). Assume que não há falsos positivos (em princípio, a mesma abordagem funcionaria, porém adicioná-la pode não ser trivial)."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1276
 #, priority:100
 msgid "But BBChop is independent of any VCS and it would be easier for Git users to have something integrated in Git."
-msgstr ""
-"Porém o 'BBChop' é independente de qualquer VCS e seria mais fácil para os "
-"usuários do Git ter algo integrado no Git."
+msgstr "Porém o 'BBChop' é independente de qualquer VCS e seria mais fácil para os usuários do Git ter algo integrado no Git."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1278
@@ -79879,24 +68167,13 @@ msgstr "Conclusão"
 #: en/git-bisect-lk2009.txt:1285
 #, priority:100
 msgid "We have seen that regressions are an important problem, and that \"git bisect\" has nice features that complement very well practices and other tools, especially test suites, that are generally used to fight regressions. But it might be needed to change some work-flows and (bad) habits to get the most out of it."
-msgstr ""
-"Vimos que as regressões são um problema importante e que o comando \"git "
-"bisect\" possui recursos interessantes que complementam as boas práticas e "
-"outras ferramentas, especialmente os conjuntos de testes, que geralmente são "
-"usados para combater as regressões. Mas pode ser necessário alterar alguns "
-"fluxos de trabalho e hábitos (ruins) para tirar o máximo proveito disso."
+msgstr "Vimos que as regressões são um problema importante e que o comando \"git bisect\" possui recursos interessantes que complementam as boas práticas e outras ferramentas, especialmente os conjuntos de testes, que geralmente são usados para combater as regressões. Mas pode ser necessário alterar alguns fluxos de trabalho e hábitos (ruins) para tirar o máximo proveito disso."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1292
 #, priority:100
 msgid "Some improvements to the algorithms inside \"git bisect\" are possible and some new features could help in some cases, but overall \"git bisect\" works already very well, is used a lot, and is already very useful. To back up that last claim, let's give the final word to Ingo Molnar when he was asked by the author how much time does he think \"git bisect\" saves him when he uses it:"
-msgstr ""
-"Algumas melhorias nos algoritmos dentro do comando \"git bisect\" são "
-"possíveis e alguns novos recursos podem ajudar em alguns casos, porém o "
-"comando \"git bisect\" em geral já funciona muito bem, é muito usado e já é "
-"muito útil. Para apoiar essa última afirmação, vamos dar a palavra final ao "
-"Ingo Molnar, quando o autor lhe perguntou quanto tempo ele acha que o "
-"comando \"git bisect\" o salva quando ele o utiliza:"
+msgstr "Algumas melhorias nos algoritmos dentro do comando \"git bisect\" são possíveis e alguns novos recursos podem ajudar em alguns casos, porém o comando \"git bisect\" em geral já funciona muito bem, é muito usado e já é muito útil. Para apoiar essa última afirmação, vamos dar a palavra final ao Ingo Molnar, quando o autor lhe perguntou quanto tempo ele acha que o comando \"git bisect\" o salva quando ele o utiliza:"
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1295
@@ -79908,57 +68185,37 @@ msgstr "_muito_."
 #: en/git-bisect-lk2009.txt:1300
 #, priority:100
 msgid "About ten years ago did i do my first 'bisection' of a Linux patch queue. That was prior the Git (and even prior the BitKeeper) days. I literally days spent sorting out patches, creating what in essence were standalone commits that i guessed to be related to that bug."
-msgstr ""
-"Cerca de dez anos atrás, eu fiz minha primeira \"bisseção\" de uma fila de "
-"patches do Linux. Isso foi antes dos dias do Git (e mesmo antes do "
-"\"BitKeeper\"). Eu literalmente passei os dias resolvendo os patches, "
-"criando o que em essência eram compromissos independentes que eu acho que "
-"estavam relacionados com este bug."
+msgstr "Cerca de dez anos atrás, eu fiz minha primeira \"bisseção\" de uma fila de patches do Linux. Isso foi antes dos dias do Git (e mesmo antes do \"BitKeeper\"). Eu literalmente passei os dias resolvendo os patches, criando o que em essência eram compromissos independentes que eu acho que estavam relacionados com este bug."
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1303
 #, priority:100
 msgid "It was a tool of absolute last resort. I'd rather spend days looking at printk output than do a manual 'patch bisection'."
-msgstr ""
-"Foi uma ferramenta de último recurso absoluta. Prefiro passar dias olhando a "
-"saída do 'printk' do que fazer uma 'bisseção dos patches' manualmente."
+msgstr "Foi uma ferramenta de último recurso absoluta. Prefiro passar dias olhando a saída do 'printk' do que fazer uma 'bisseção dos patches' manualmente."
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1308
 #, priority:100
 msgid "With Git bisect it's a breeze: in the best case i can get a ~15 step kernel bisection done in 20-30 minutes, in an automated way. Even with manual help or when bisecting multiple, overlapping bugs, it's rarely more than an hour."
-msgstr ""
-"Com o Git bisect, é fácil: no melhor dos casos, é possível obter uma "
-"bisseção do kernel com ~15 passos entre 20 a 30 minutos de maneira "
-"automatizada. Mesmo com ajuda manual ou ao dividir vários bugs acumulados, "
-"raramente leva mais de uma hora."
+msgstr "Com o Git bisect, é fácil: no melhor dos casos, é possível obter uma bisseção do kernel com ~15 passos entre 20 a 30 minutos de maneira automatizada. Mesmo com ajuda manual ou ao dividir vários bugs acumulados, raramente leva mais de uma hora."
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1314
 #, priority:100
 msgid "In fact it's invaluable because there are bugs i would never even _try_ to debug if it wasn't for git bisect. In the past there were bug patterns that were immediately hopeless for me to debug - at best i could send the crash/bug signature to lkml and hope that someone else can think of something."
-msgstr ""
-"Na verdade, é inestimável porque existem bugs que eu nem tentaria depurar "
-"caso não fosse pelo comando `git bisect`. No passado, havia padrões de bug "
-"que eram imediatamente inúteis para se depurar - na melhor das hipóteses eu "
-"poderia enviar a assinatura da falha/bug para o 'lkml' e esperar que alguém "
-"pudesse pensar em algo."
+msgstr "Na verdade, é inestimável porque existem bugs que eu nem tentaria depurar caso não fosse pelo comando `git bisect`. No passado, havia padrões de bug que eram imediatamente inúteis para se depurar - na melhor das hipóteses eu poderia enviar a assinatura da falha/bug para o 'lkml' e esperar que alguém pudesse pensar em algo."
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1318
 #, priority:100
 msgid "And even if a bisection fails today it tells us something valuable about the bug: that it's non-deterministic - timing or kernel image layout dependent."
-msgstr ""
-"E ainda que uma bisseção falhe, hoje ela nos diz algo valioso sobre o bug: "
-"que é não determinístico - depende do tempo ou do layout da imagem do kernel."
+msgstr "E ainda que uma bisseção falhe, hoje ela nos diz algo valioso sobre o bug: que é não determinístico - depende do tempo ou do layout da imagem do kernel."
 
 #. type: delimited block _
 #: en/git-bisect-lk2009.txt:1321
 #, priority:100
 msgid "So git bisect is unconditional goodness - and feel free to quote that ;-)"
-msgstr ""
-"Portanto, o comando 'git bisect' é uma bondade incondicional e fique à "
-"vontade para citar isso ;-)"
+msgstr "Portanto, o comando 'git bisect' é uma bondade incondicional e fique à vontade para citar isso ;-)"
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1324
@@ -79970,48 +68227,31 @@ msgstr "Agradecimentos"
 #: en/git-bisect-lk2009.txt:1330
 #, priority:100
 msgid "Many thanks to Junio Hamano for his help in reviewing this paper, for reviewing the patches I sent to the Git mailing list, for discussing some ideas and helping me improve them, for improving \"git bisect\" a lot and for his awesome work in maintaining and developing Git."
-msgstr ""
-"Meus agradecimentos ao Junio Hamano por sua ajuda na revisão deste "
-"documento, por revisar os patches que enviei para a lista de discussão do "
-"Git, por discutir algumas ideias e por me ajudar a melhorá-las, por melhorar "
-"muito o \"git bisect\" e por seu incrível trabalho em manter e desenvolvendo "
-"o Git."
+msgstr "Meus agradecimentos ao Junio Hamano por sua ajuda na revisão deste documento, por revisar os patches que enviei para a lista de discussão do Git, por discutir algumas ideias e por me ajudar a melhorá-las, por melhorar muito o \"git bisect\" e por seu incrível trabalho em manter e desenvolvendo o Git."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1335
 #, priority:100
 msgid "Many thanks to Ingo Molnar for giving me very useful information that appears in this paper, for commenting on this paper, for his suggestions to improve \"git bisect\" and for evangelizing \"git bisect\" on the linux kernel mailing lists."
-msgstr ""
-"Meus agradecimentos ao Ingo Molnar por me fornecer informações muito úteis "
-"que aparecem neste artigo, por comentar este artigo, pelas suas sugestões "
-"para melhorar o \"git bisect\" e por evangelizar o \"git bisect\" nas listas "
-"de discussão do kernel do linux."
+msgstr "Meus agradecimentos ao Ingo Molnar por me fornecer informações muito úteis que aparecem neste artigo, por comentar este artigo, pelas suas sugestões para melhorar o \"git bisect\" e por evangelizar o \"git bisect\" nas listas de discussão do kernel do linux."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1338
 #, priority:100
 msgid "Many thanks to Linus Torvalds for inventing, developing and evangelizing \"git bisect\", Git and Linux."
-msgstr ""
-"Meus agradecimentos ao Linus Torvalds por inventar, desenvolver e "
-"evangelizar \"git bisect\", Git e o Linux."
+msgstr "Meus agradecimentos ao Linus Torvalds por inventar, desenvolver e evangelizar \"git bisect\", Git e o Linux."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1343
 #, priority:100
 msgid "Many thanks to the many other great people who helped one way or another when I worked on Git, especially to Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
-msgstr ""
-"Meus agradecimentos a muitas outras ótimas pessoas que ajudaram de um jeito "
-"ou de outro quando eu trabalhei no Git, especialmente ao Andreas Ericsson, "
-"Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John "
-"Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
+msgstr "Meus agradecimentos a muitas outras ótimas pessoas que ajudaram de um jeito ou de outro quando eu trabalhei no Git, especialmente ao Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1346
 #, priority:100
 msgid "Many thanks to the Linux-Kongress program committee for choosing the author to given a talk and for publishing this paper."
-msgstr ""
-"Meus agradecimentos ao comitê do programa Linux-Kongress por escolher o "
-"autor para dar uma palestra e por publicar este artigo."
+msgstr "Meus agradecimentos ao comitê do programa Linux-Kongress por escolher o autor para dar uma palestra e por publicar este artigo."
 
 #. type: Title -
 #: en/git-bisect-lk2009.txt:1348
@@ -80023,69 +68263,49 @@ msgstr "Referências"
 #: en/git-bisect-lk2009.txt:1351
 #, priority:100
 msgid "[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], see Executive Summary and Chapter 8."
-msgstr ""
-"[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/"
-"report02-3.pdf['The Economic Impacts of Inadequate Infratructure for "
-"Software Testing'.  Nist Planning Report 02-3], Consulte o Resumo Executivo "
-"e o Capítulo 8."
+msgstr "[[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], Consulte o Resumo Executivo e o Capítulo 8."
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1352
 #, priority:100
 msgid "[[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code Conventions for the Java Programming Language'. Sun Microsystems.]"
-msgstr ""
-"[[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code "
-"Conventions for the Java Programming Language'. Sun Microsystems.]"
+msgstr "[[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code Conventions for the Java Programming Language'. Sun Microsystems.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1353
 #, priority:100
 msgid "[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Software maintenance'. Wikipedia.]"
-msgstr ""
-"[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Manutenção do "
-"Software'. Wikipedia.]"
+msgstr "[[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Manutenção do Software'. Wikipedia.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1354
 #, priority:100
 msgid "[[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.]"
-msgstr ""
-"[[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox."
-"net/[Junio C Hamano. 'A História de sucesso de um bisect automatizado'.]"
+msgstr "[[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'A História de sucesso de um bisect automatizado'.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1355
 #, priority:100
 msgid "[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Fully automated bisecting with \"git bisect run\"'. LWN.net.]"
-msgstr ""
-"[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Um bisect "
-"totalmente automatizado com \"git bisect run\"'. LWN.net.]"
+msgstr "[[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Um bisect totalmente automatizado com \"git bisect run\"'. LWN.net.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1356
 #, priority:100
 msgid "[[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'Bisection divides users and developers'. LWN.net.]"
-msgstr ""
-"[[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'A bisseção divide "
-"usuários e os desenvolvedores'. LWN.net.]"
+msgstr "[[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'A bisseção divide usuários e os desenvolvedores'. LWN.net.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1357
 #, priority:100
 msgid "[[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]"
-msgstr ""
-"[[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo "
-"Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel "
-"mailing list.]"
+msgstr "[[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1358
 #, priority:100
 msgid "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html[Junio C Hamano and the git-list. 'git-bisect(1) Manual Page'. Linux Kernel Archives.]"
-msgstr ""
-"[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html["
-"Junio C Hamano and the git-list. 'git-bisect(1) Página do Manual'. Arquivos "
-"do Linux Kernel.]"
+msgstr "[[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html[Junio C Hamano and the git-list. 'git-bisect(1) Página do Manual'. Arquivos do Linux Kernel.]"
 
 #. type: Plain text
 #: en/git-bisect-lk2009.txt:1358
@@ -80093,6 +68313,19 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 
+#~ msgid "'git show-index'\n"
+#~ msgstr "'git show-index'\n"
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
+#~ msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+#~ msgstr "Isso pode ser definido como uma lista de sequências de texto separadas por vírgula. Quando um rastreamento curl é ativado (consulte `GIT_TRACE_CURL` acima), sempre que um cabeçalho \"Cookies:\" enviado pelo cliente é despejado, os valores dos cookies cuja chave está nesta lista (diferencia as maiúsculas das minúsculas) são redigidos."
+
+#~ msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+#~ msgstr "O `move` se recusa a mover uma árvore de trabalho bloqueada, a menos que a opção `--force` seja utilizado duas vezes."
+
 #~ msgid "Do not GPG-sign commit, to countermand a `--gpg-sign` option given earlier on the command line."
 #~ msgstr "Não assine o commit com GPG-sign que contrarie a opção na linha de comando `--gpg-sign` dada em momento anterior."
 
diff --git a/po/documentation.pt_PT.po b/po/documentation.pt_PT.po
index f5fb9599707a8ebae2dc00c256ac4c79d48ceab6..873c385b7a2b1c86feaaf549043a3dfa52a6e100 100644
--- a/po/documentation.pt_PT.po
+++ b/po/documentation.pt_PT.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-02-08 19:43+0100\n"
 "Last-Translator: Matthias Ahauer <mha1993@live.de>\n"
 "Language-Team: pt_PT\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -130,7 +130,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -478,7 +478,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -490,7 +490,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2038,7 +2038,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4311,7 +4311,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4323,7 +4323,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4878,259 +4878,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5268,7 +5274,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5408,7 +5414,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5564,7 +5570,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5576,13 +5582,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5719,7 +5725,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr ""
@@ -5761,7 +5767,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr ""
@@ -6043,7 +6049,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6397,7 +6403,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6409,13 +6415,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7172,7 +7178,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7760,7 +7766,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9128,7 +9134,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9722,7 +9728,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9848,46 +9854,52 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10242,7 +10254,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11824,7 +11836,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13617,7 +13629,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13713,7 +13725,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13798,9 +13810,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13839,7 +13852,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15981,7 +15994,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17406,7 +17419,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18881,19 +18894,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19463,7 +19476,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19589,156 +19602,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19747,31 +19773,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19780,31 +19806,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19813,31 +19839,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19846,31 +19872,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19878,22 +19904,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20089,78 +20116,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20169,55 +20208,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20227,25 +20266,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20683,259 +20756,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20952,241 +21037,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21194,259 +21279,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21454,73 +21539,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21532,55 +21617,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21589,25 +21674,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21615,19 +21700,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21637,43 +21722,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21681,31 +21766,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21715,25 +21800,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21743,19 +21828,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21763,31 +21848,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21795,67 +21880,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21863,283 +21948,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22148,49 +22233,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22210,7 +22295,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22219,7 +22304,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22230,13 +22315,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22251,13 +22336,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22265,25 +22350,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22292,7 +22377,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22304,307 +22389,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23215,19 +23300,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27026,7 +27111,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28475,7 +28560,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28546,12 +28631,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29042,20 +29139,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29097,226 +29212,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29326,19 +29461,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31218,9 +31353,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36304,7 +36439,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38697,12 +38832,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41276,7 +41407,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41299,7 +41430,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41317,7 +41448,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41425,13 +41556,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41449,7 +41580,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41557,7 +41688,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41569,7 +41700,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46698,7 +46829,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46737,6 +46868,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48920,7 +49057,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49052,7 +49189,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49100,7 +49237,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53346,13 +53483,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53364,7 +53501,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53466,391 +53603,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56100,295 +56237,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56398,19 +56535,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56419,7 +56556,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56428,7 +56565,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56437,13 +56574,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56455,7 +56592,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59221,7 +59358,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59382,6 +59519,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59391,7 +59534,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65099,6 +65242,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.ru.po b/po/documentation.ru.po
index 9461f31adc623f175d2b5a02e988b7c9444a0a34..b75a8cb8437c2dae08ce7dcf57cea0703174e68b 100644
--- a/po/documentation.ru.po
+++ b/po/documentation.ru.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-05-24 21:41+0000\n"
 "Last-Translator: Golubev Alexander <fatzer2@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -131,7 +131,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -480,7 +480,7 @@ msgid "Get and set repository or global options."
 msgstr "Получение и установка глобальных настроек или настроек репозитория."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -492,7 +492,7 @@ msgid "Git data exporter."
 msgstr "Экспорт данных Git."
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2040,7 +2040,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr "Обновление файла со вспомогательной информацией для глупых серверов"
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4313,7 +4313,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4325,7 +4325,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4880,259 +4880,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr "Игнорировать изменения, в которых все строки пустые."
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr "-W"
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5270,7 +5276,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5410,7 +5416,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5566,7 +5572,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5578,13 +5584,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5726,7 +5732,7 @@ msgstr ""
 "\t  [--] [<спецификатор-пути>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "ОПИСАНИЕ"
@@ -5768,7 +5774,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "По ссылке linkgit:git-commit[1] доступны альтернативные пути добавления файлов в коммит."
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "ПАРАМЕТРЫ"
@@ -6050,7 +6056,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "ПРИМЕРЫ"
@@ -6414,7 +6420,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "СМОТРИ ТАКЖЕ"
@@ -6426,13 +6432,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "Является частью пакета linkgit:git[1]"
@@ -7206,7 +7212,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7794,7 +7800,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9162,7 +9168,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9756,7 +9762,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9882,47 +9888,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "-o <option>"
 msgid "-o <path>"
 msgstr "-o <опция>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--date <format>"
 msgid "-s <format>"
 msgstr "--date <формат>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--date <format>"
 msgid "--suffix <format>"
 msgstr "--date <формат>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10277,7 +10289,7 @@ msgstr "Вывод содержимого или типа и информаци
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11859,7 +11871,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13670,7 +13682,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13766,7 +13778,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template=<каталог_шаблонов>"
@@ -13851,9 +13863,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13892,7 +13905,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<каталог-git>"
@@ -16035,7 +16048,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17460,7 +17473,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18945,19 +18958,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19527,7 +19540,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19653,156 +19666,170 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr "git-diff - Вывод разницы между коммитами, коммитом и рабочим каталогом и так далее"
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "'git diff' [<опции>] --cached [<коммит>] [--] [<путь>…]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "'git diff' [<опции>] <коммит> <коммит> [--] [<путь>…]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "'git diff' [<опции>] <коммит>..<коммит> [--] [<путь>…]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+#| msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "'git diff [<опции>] <коммит>\\... <коммит> [--] [<путь>…]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "'git diff [<опции>] <коммит>\\... <коммит> [--] [<путь>…]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19811,31 +19838,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19844,31 +19871,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19877,31 +19904,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19910,31 +19937,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19942,22 +19969,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20153,78 +20181,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20233,55 +20273,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20291,25 +20331,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20747,259 +20821,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, fuzzy, no-wrap, priority:100
 msgid "Commands"
 msgstr "команда"
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -21016,241 +21102,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21258,259 +21344,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21518,73 +21604,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21596,55 +21682,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21653,25 +21739,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21679,19 +21765,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21701,43 +21787,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21745,31 +21831,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21779,25 +21865,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21807,19 +21893,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21827,31 +21913,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21859,67 +21945,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21927,283 +22013,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr "принудительно"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr "готово"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22212,49 +22298,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22274,7 +22360,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22283,7 +22369,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22294,13 +22380,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22315,13 +22401,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22329,25 +22415,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22356,7 +22442,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22368,307 +22454,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23278,20 +23364,21 @@ msgstr ""
 
 #. type: delimited block -
 #: en/git-fetch.txt:259
-#, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+#, fuzzy, no-wrap, priority:220
+#| msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr "$ git fetch origin +pu:pu maint:tmp\n"
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27098,7 +27185,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28547,7 +28634,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28618,12 +28705,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29114,20 +29213,40 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+#| msgid "--object-format=<format>"
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format=<формат>"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "Задать формат объектов (алгоритм хеширования) репозитория. Допустимые значения: 'sha1' и (если включён) 'sha256'. По умолчанию: 'sha1'."
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29169,7 +29288,7 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init - Создание пустого репозитория Git или переинициализация существующего"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
 #| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29178,6 +29297,7 @@ msgstr "git-init - Создание пустого репозитория Git и
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<каталог_шаблонов>]\n"
@@ -29185,217 +29305,237 @@ msgstr ""
 "\t  [--shared[=<права_доступа>]] [каталог]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "Эта команда создаёт пустой репозиторий Git, по существу, каталог `.git` с подкаталогами `objects`, `refs/heads`, `refs/tags`, и файлами шаблонов. Также создаётся начальный файл `HEAD`, который ссылается на HEAD ветки master."
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "Если переменная среды `$GIT_DIR` установлена, то она задаёт путь, который будет использоваться вместо `./.git` в качестве основы для создания репозитория."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "Если каталог хранения объектов задан с помощью переменной среды `$GIT_OBJECT_DIRECTORY`, то каталоги с хеш-кодом sha1 будут создаваться в нём. В противном случае будет использоваться каталог по умолчанию, `$GIT_DIR/objects`."
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "Запускать 'git init' внутри существующего репозитория безопасно. Эта команда не перезапишет то, что там уже есть. Основная причина повторно запускать 'git init' состоит в том, чтобы подхватились только что добавленные шаблоны (или чтобы переместить репозиторий в другое место, если задан параметр `--separate-git-dir`)."
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "Выводить только ошибки и предупреждения; весь остальной вывод будет скрыт."
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "Создать голый репозиторий. Если переменная среды `GIT_DIR` не задана, то ей будет присвоен текущий рабочий каталог."
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format=<формат>"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr "Задать формат объектов (алгоритм хеширования) репозитория. Допустимые значения: 'sha1' и (если включён) 'sha256'. По умолчанию: 'sha1'."
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "Указать каталог с шаблонами. (См. раздел «КАТАЛОГ ШАБЛОНОВ» ниже)"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "-b <branch>"
+msgid "-b <branch-name"
+msgstr "-b <ветка>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch <name>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--branch <ветка>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "КАТАЛОГ ШАБЛОНОВ"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "Файлы и каталоги, из каталога шаблонов, чьи имена начинаются не с точки будут скопированы в `$GIT_DIR` после того, как он будет создан."
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "В качестве каталога шаблонов будет использоваться один из следующих (в порядке перечисления):"
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "аргумент, указанный в параметре `--template`;"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr "значение переменной среды `$GIT_TEMPLATE_DIR`;"
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "переменная настройки `init.templateDir`; или"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "каталог шаблонов по умолчанию: `/usr/share/git-core/templates`."
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "Каталог шаблонов по умолчанию уже содержит некоторую структуру каталогов: рекомендованные «шаблоны исключений» (exlude patterns, см. linkgit:gitignore[5]) и примеры файлов-перехватчиков (hook)."
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29405,19 +29545,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31300,9 +31440,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36387,7 +36527,7 @@ msgid "Show progress."
 msgstr "показать прогресс выполнения"
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr "--expire <время>"
@@ -38792,12 +38932,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41372,7 +41508,7 @@ msgstr "git-remote - Управление отслеживаемыми репо
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41395,7 +41531,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41413,7 +41549,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41521,13 +41657,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41545,7 +41681,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41653,7 +41789,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41665,7 +41801,7 @@ msgstr "'update'"
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46799,7 +46935,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46838,6 +46974,13 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "Задать формат объектов (алгоритм хеширования) репозитория. Допустимые значения: 'sha1' и (если включён) 'sha256'. По умолчанию: 'sha1'."
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -49021,7 +49164,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49153,7 +49296,7 @@ msgstr "-b <ветка>"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49201,7 +49344,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53455,13 +53598,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53473,7 +53616,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53575,391 +53718,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[Пользовательское руководство Git], linkgit:gitworkflows[7]"
@@ -56210,295 +56353,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56508,19 +56651,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56529,7 +56672,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56538,7 +56681,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56547,13 +56690,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56565,7 +56708,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59337,7 +59480,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59498,6 +59641,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59507,7 +59656,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65215,6 +65364,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.tr.po b/po/documentation.tr.po
index f5f8bfb7afb257cbace2aaa5a0eadc2f1eba0e05..ba91bbdc28ce520c1d42278e0b13818303fb42d8 100644
--- a/po/documentation.tr.po
+++ b/po/documentation.tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-05-16 17:45+0000\n"
 "Last-Translator: OÄŸuz Ersen <oguzersen@protonmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.1-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -132,7 +132,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -480,7 +480,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -492,7 +492,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2040,7 +2040,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4313,7 +4313,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4325,7 +4325,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4880,259 +4880,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5270,7 +5276,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5410,7 +5416,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5566,7 +5572,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5578,13 +5584,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5726,7 +5732,7 @@ msgstr ""
 "\t  [--] [<yol belirtimi>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "AÇIKLAMA"
@@ -5768,7 +5774,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "SEÇENEKLER"
@@ -6050,7 +6056,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr ""
@@ -6404,7 +6410,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6416,13 +6422,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7178,7 +7184,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7766,7 +7772,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9134,7 +9140,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9728,7 +9734,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9854,43 +9860,49 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, no-wrap, priority:100
 msgid "-o <path>"
 msgstr "-o <yol>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, no-wrap, priority:100
 msgid "--output-directory <path>"
 msgstr "--output-directory <yol>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "-s <biçim>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, no-wrap, priority:100
 msgid "--suffix <format>"
 msgstr "--suffix <biçim>"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10245,7 +10257,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11827,7 +11839,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13620,7 +13632,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13716,7 +13728,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13801,8 +13813,9 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<yol belirtimi]"
 
 #. type: Plain text
@@ -13842,7 +13855,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15984,7 +15997,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17409,7 +17422,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18884,19 +18897,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19466,7 +19479,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19592,156 +19605,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19750,31 +19776,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19783,31 +19809,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19816,31 +19842,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19849,31 +19875,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19881,22 +19907,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20092,78 +20119,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20172,55 +20211,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20230,25 +20269,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20686,259 +20759,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
+#, priority:100
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20955,241 +21040,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21197,259 +21282,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21457,73 +21542,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21535,55 +21620,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21592,25 +21677,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21618,19 +21703,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21640,43 +21725,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21684,31 +21769,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21718,25 +21803,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21746,19 +21831,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21766,31 +21851,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21798,67 +21883,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21866,283 +21951,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22151,49 +22236,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22213,7 +22298,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22222,7 +22307,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22233,13 +22318,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22254,13 +22339,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22268,25 +22353,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22295,7 +22380,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22307,307 +22392,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23218,19 +23303,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27026,7 +27111,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28475,7 +28560,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28546,12 +28631,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29042,20 +29139,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29097,226 +29212,246 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, no-wrap, priority:300
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29326,19 +29461,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31218,9 +31353,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36302,7 +36437,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38695,12 +38830,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41273,7 +41404,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41296,7 +41427,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41314,7 +41445,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41422,13 +41553,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41446,7 +41577,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41554,7 +41685,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41566,7 +41697,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46694,7 +46825,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46733,6 +46864,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48916,7 +49053,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49048,7 +49185,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49096,7 +49233,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53341,13 +53478,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53359,7 +53496,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53461,391 +53598,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56094,295 +56231,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56392,19 +56529,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56413,7 +56550,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56422,7 +56559,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56431,13 +56568,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56449,7 +56586,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59208,7 +59345,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59369,6 +59506,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59378,7 +59521,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65082,3 +65225,7 @@ msgstr ""
 #, priority:100
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
+
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
diff --git a/po/documentation.zh_HANS-CN.po b/po/documentation.zh_HANS-CN.po
index 9dd833daa42771a32f9a7a717e1cac44fb7ac172..5786c7a398dd99c7234f21fc67c335350dfea57f 100644
--- a/po/documentation.zh_HANS-CN.po
+++ b/po/documentation.zh_HANS-CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-06-28 17:51+0000\n"
 "Last-Translator: 冉 <ranto2012@163.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Weblate 4.2-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -132,7 +132,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -480,7 +480,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -492,7 +492,7 @@ msgid "Git data exporter."
 msgstr "Git "
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -1361,8 +1361,8 @@ msgstr ""
 msgid "linkgit:git-name-rev[1]"
 msgstr "linkgit:git-name-rev[1]"
 
-# 查找给定版本的符号名称
 #. type: Plain text
+# 查找给定版本的符号名称
 #: en/cmds-plumbinginterrogators.txt:36
 #, priority:100
 msgid "Find symbolic names for given revs."
@@ -2041,7 +2041,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4343,7 +4343,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr "忽略行尾空格的变化。"
@@ -4355,7 +4355,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, fuzzy, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr "忽略空格数量的变化。这会忽略行尾的空格，并认为包含一个或多个空格字符的其他序列都是等同的。"
@@ -4466,9 +4466,7 @@ msgstr "使用 <正则表达式> 来确定单词的格式，而不是将一串
 #: en/diff-options.txt:388
 #, fuzzy, priority:280
 msgid "Every non-overlapping match of the <regex> is considered a word.  Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences.  You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters.  A match that contains a newline is silently truncated(!) at the newline."
-msgstr ""
-"<正则表达式> 匹配的的每一个非重叠的匹配都被视为一个单词。在这些匹配项之间的任何内容都被认为是空白，并且在查找差异时被忽略(!)。"
-"您可能需要在您的正则表达式中附加 `|[^[:space:]]`，以确保它匹配所有非空格字符。包含换行的匹配会在换行处被截断(!)。"
+msgstr "<正则表达式> 匹配的的每一个非重叠的匹配都被视为一个单词。在这些匹配项之间的任何内容都被认为是空白，并且在查找差异时被忽略(!)。您可能需要在您的正则表达式中附加 `|[^[:space:]]`，以确保它匹配所有非空格字符。包含换行的匹配会在换行处被截断(!)。"
 
 #. type: Plain text
 #: en/diff-options.txt:391
@@ -4480,9 +4478,7 @@ msgstr "例如，`--word-diff-regex=.` 将把每个字符当作一个单词，
 #: en/diff-options.txt:396
 #, priority:280
 msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1].  Giving it explicitly overrides any diff driver or configuration setting.  Diff drivers override configuration settings."
-msgstr ""
-"正则表达式也可以通过差异程序或配置选项来设置，参见 linkgit:gitattributes[5] 或 linkgit:git-"
-"config[1]。显式指明会覆盖任何程序或配置。差异程序会覆盖配置。"
+msgstr "正则表达式也可以通过差异程序或配置选项来设置，参见 linkgit:gitattributes[5] 或 linkgit:git-config[1]。显式指明会覆盖任何程序或配置。差异程序会覆盖配置。"
 
 #. type: Labeled list
 #: en/diff-options.txt:397
@@ -4494,8 +4490,7 @@ msgstr "--color-words[=<正则表达式>]"
 #: en/diff-options.txt:400
 #, priority:280
 msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
-msgstr ""
-"与 `--word-diff=color` 和（如果指明了正则表达式）`--word-diff-regex=<正则表达式>` 两个选项含义相同。"
+msgstr "与 `--word-diff=color` 和（如果指明了正则表达式）`--word-diff-regex=<正则表达式>` 两个选项含义相同。"
 
 #. type: Labeled list
 #: en/diff-options.txt:402 en/git-status.txt:143
@@ -4531,10 +4526,7 @@ msgstr "--check"
 #: en/diff-options.txt:419
 #, priority:280
 msgid "Warn if changes introduce conflict markers or whitespace errors.  What are considered whitespace errors is controlled by `core.whitespace` configuration.  By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors.  Exits with non-zero status if problems are found. Not compatible with --exit-code."
-msgstr ""
-"如果更改引入冲突标记或空格错误，则发出警告。哪些被认为是空格错误是由 `core.whitespace` "
-"配置控制的。默认情况下，行尾部的空格字符（包括仅由空格字符组成的行）和紧跟在行初缩进内 tab "
-"字符后的空格字符，都被认为是空格字符错误。如果发现问题，则以非零状态退出。与 --exit-code 选项不兼容。"
+msgstr "如果更改引入冲突标记或空格错误，则发出警告。哪些被认为是空格错误是由 `core.whitespace` 配置控制的。默认情况下，行尾部的空格字符（包括仅由空格字符组成的行）和紧跟在行初缩进内 tab 字符后的空格字符，都被认为是空格字符错误。如果发现问题，则以非零状态退出。与 --exit-code 选项不兼容。"
 
 #. type: Labeled list
 #: en/diff-options.txt:420
@@ -4546,11 +4538,7 @@ msgstr "--ws-error-highlight=<种类>"
 #: en/diff-options.txt:429
 #, priority:280
 msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff.  Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`.  When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
-msgstr ""
-"突出显示差异中 `context`（上下文）、`old`（旧）或 `new`（新）行中的空格错误。多个值用逗号隔开，`none` "
-"选项会重置以前的值，`default` 重置列表为 ·new`，`all` 是 `old,new,context` 的简写。当没有给定这个选项，"
-"并且配置变量 `diff.wsErrorHighlight``没有设置时，只有 `new` 行中的空格错误会被高亮显示。空格错误会用 `color."
-"diff.whitespace` 配置进行着色。"
+msgstr "突出显示差异中 `context`（上下文）、`old`（旧）或 `new`（新）行中的空格错误。多个值用逗号隔开，`none` 选项会重置以前的值，`default` 重置列表为 ·new`，`all` 是 `old,new,context` 的简写。当没有给定这个选项，并且配置变量 `diff.wsErrorHighlight``没有设置时，只有 `new` 行中的空格错误会被高亮显示。空格错误会用 `color.diff.whitespace` 配置进行着色。"
 
 #. type: Labeled list
 #: en/diff-options.txt:432
@@ -4574,8 +4562,7 @@ msgstr "--binary"
 #: en/diff-options.txt:440
 #, priority:280
 msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
-msgstr ""
-"除了 `--full-index`输出的差异之外，输出二进制的差异。其可以用 `git-apply` 命令来应用。暗含 `--patch` 选项。"
+msgstr "除了 `--full-index`输出的差异之外，输出二进制的差异。其可以用 `git-apply` 命令来应用。暗含 `--patch` 选项。"
 
 #. type: Labeled list
 #: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
@@ -4587,9 +4574,7 @@ msgstr "--abbrev[=<n>]"
 #: en/diff-options.txt:448
 #, priority:280
 msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix.  This is independent of the `--full-index` option above, which controls the diff-patch output format.  Non default number of digits can be specified with `--abbrev=<n>`."
-msgstr ""
-"在 diff-raw（原始差异）格式输出和 diff-tree（树状差异）头行中，不显示完整的 40 字节十六进制对象名称，而只显示部分前缀。这与上面的 "
-"`--full-index` 选项无关，后者控制了 diff-patch（差异补丁）的输出格式。非默认的位数可以用 `--abbrev=<n>` 指定。"
+msgstr "在 diff-raw（原始差异）格式输出和 diff-tree（树状差异）头行中，不显示完整的 40 字节十六进制对象名称，而只显示部分前缀。这与上面的 `--full-index` 选项无关，后者控制了 diff-patch（差异补丁）的输出格式。非默认的位数可以用 `--abbrev=<n>` 指定。"
 
 #. type: Labeled list
 #: en/diff-options.txt:449
@@ -4613,18 +4598,13 @@ msgstr "将完整的重写更改切分成删除和创建对（pair）。这有
 #: en/diff-options.txt:463
 #, fuzzy, priority:280
 msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
-msgstr ""
-"它会影响决定更改形式的阈值，当单个文件内修改总量达到一定值时，会认为该文件进行了完全重写，而不是将一系列删除和插入操作视为修改。如果视为多个删除和插入修改"
-"，修改中的行可能会碰巧在文本上与原文一致，从而被当作上下文。选项中的数字 `m` 控制 -B 选项的这一方面（默认为 60％）。`-B/70％` "
-"表示，如果在结果中保留的原始内容少于原始内容的30％，则 Git 认为它是完全重写的（否则，生成的补丁将是一系列删除和插入，并与上下文行混合在一起）。"
+msgstr "它会影响决定更改形式的阈值，当单个文件内修改总量达到一定值时，会认为该文件进行了完全重写，而不是将一系列删除和插入操作视为修改。如果视为多个删除和插入修改，修改中的行可能会碰巧在文本上与原文一致，从而被当作上下文。选项中的数字 `m` 控制 -B 选项的这一方面（默认为 60％）。`-B/70％` 表示，如果在结果中保留的原始内容少于原始内容的30％，则 Git 认为它是完全重写的（否则，生成的补丁将是一系列删除和插入，并与上下文行混合在一起）。"
 
 #. type: Plain text
 #: en/diff-options.txt:471
 #, fuzzy, priority:280
 msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
-msgstr ""
-"使用 -M 选项时，一个完全改写的文件也被认为是重命名文件的来源（通常 -M 只考查一个消失文件作为重命名的来源)。选项中的数量 `n` 控制 -B "
-"选项的这一方面（默认为 50％)。`-B20%` 表明，当插入与删除比 20％ 的文件大小更多，该文件可作为重命名到另一文件的可能来源。"
+msgstr "使用 -M 选项时，一个完全改写的文件也被认为是重命名文件的来源（通常 -M 只考查一个消失文件作为重命名的来源)。选项中的数量 `n` 控制 -B 选项的这一方面（默认为 50％)。`-B20%` 表明，当插入与删除比 20％ 的文件大小更多，该文件可作为重命名到另一文件的可能来源。"
 
 #. type: Labeled list
 #: en/diff-options.txt:472
@@ -4933,259 +4913,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, fuzzy, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr " \"a/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, fuzzy, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr " \"b/\""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5323,7 +5309,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5463,7 +5449,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5619,7 +5605,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5631,13 +5617,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5779,7 +5765,7 @@ msgstr ""
 "\t  [--] [<指定路径>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "描述"
@@ -5821,7 +5807,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "请参阅 linkgit:git-commit[1] 了解将内容添加到提交的其他替代方法。"
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "选项"
@@ -6103,7 +6089,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr "此选项可用于分离命令行选项和文件列表（当文件名可能被误认为命令行选项时非常有用）。"
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "实例"
@@ -6396,8 +6382,8 @@ msgstr "删除的内容"
 msgid "Removed content is represented by lines beginning with \"-\". You can prevent staging their removal by converting the \"-\" to a \" \" (space)."
 msgstr "删除的内容以“-”开头的行表示。您可以通过将“-”转换为“ ”（空格）来防止将其删除。"
 
-# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #. type: Labeled list
+# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
 #: en/git-add.txt:379
 #, no-wrap, priority:300
 msgid "modified content"
@@ -6482,7 +6468,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr "修改上下文或删除行的内容"
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr "参见"
@@ -6494,13 +6480,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, fuzzy, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr "linkgit:git[1] 部分"
@@ -7257,7 +7243,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7845,7 +7831,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9213,7 +9199,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9807,7 +9793,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9933,46 +9919,52 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "-o <name>"
 msgid "-o <path>"
 msgstr "-o <名称>"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 msgid "-s <format>"
 msgstr "--patch-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10327,7 +10319,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11909,7 +11901,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13730,7 +13722,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr "克隆完成后，不执行HEAD检出操作。"
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13826,7 +13818,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr "如果指定了要克隆的存储库，且可以通过 ssh 访问该存储库，这将为另一端运行的命令指定非默认路径。"
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr "--template = <模板目录>"
@@ -13911,8 +13903,9 @@ msgstr "可以与 `--single-branch` 结合使用，以克隆和维护除单个
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules[=<pathspec]"
+msgid "--recurse-submodules[=<pathspec>]"
 msgstr "--recurse-submodules[=<路径规范]"
 
 #. type: Plain text
@@ -13952,7 +13945,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr "克隆的所有子模块将使用子模块的远程跟踪分支的状态来更新子模块，而不是超级项目的已记录SHA-1。等同于将`--remote` 传递给 `git submodule update`。"
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr "--separate-git-dir=<git目录>"
@@ -16104,7 +16097,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17530,7 +17523,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -19005,19 +18998,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19587,7 +19580,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19713,156 +19706,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, fuzzy, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, fuzzy, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr "git difftool [<>] [<> [<>]] [--] [<>...]"
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19871,31 +19877,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19904,31 +19910,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19937,31 +19943,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19970,31 +19976,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -20002,22 +20008,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20213,78 +20220,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20293,55 +20312,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20351,25 +20370,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20808,259 +20861,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -21077,241 +21142,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21319,259 +21384,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21579,73 +21644,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21657,55 +21722,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21714,25 +21779,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21740,19 +21805,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21762,43 +21827,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21806,31 +21871,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21840,25 +21905,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21868,19 +21933,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21888,31 +21953,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21920,67 +21985,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21988,283 +22053,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, fuzzy, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr "--[no-]relative-marks"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, fuzzy, no-wrap, priority:100
 msgid "get-mark"
 msgstr "`get-mark`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, fuzzy, no-wrap, priority:100
 msgid "cat-blob"
 msgstr "`cat-blob`"
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, fuzzy, no-wrap, priority:100
 msgid "done"
 msgstr "none"
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22273,49 +22338,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22335,7 +22400,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22344,7 +22409,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22355,13 +22420,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22376,13 +22441,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22390,25 +22455,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22417,7 +22482,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22429,307 +22494,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23340,19 +23405,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27151,7 +27216,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, fuzzy, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr "如果没有 `-z` 选项，带 \"不常见\" 字符的路径名会被加上引号，正如配置变量 \"core.quotePath\" 所解释的那样（参见 linkgit:git-config[1]）。  使用 `-z` 选项，文件名将被逐字输出，并以 NUL 字节结束。"
 
 #. type: Labeled list
@@ -28600,7 +28665,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28671,12 +28736,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29167,20 +29244,40 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, fuzzy, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr "--patch-format"
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr "指定存储库的对象格式（哈希算法）。有效值为 'sha1' 和（如果启用）'sha256'。'sha1' 是默认值。"
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
+#, fuzzy, priority:100
+#| msgid "This option may be specified more than once."
+msgid "This option cannot be used with --stdin."
+msgstr "这个选项可以被指定多次。"
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
 #, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29222,7 +29319,7 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init - 创建一个空的Git仓库或重新初始化已有仓库"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
 #| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29231,6 +29328,7 @@ msgstr "git-init - 创建一个空的Git仓库或重新初始化已有仓库"
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<模板目录>]\n"
@@ -29238,217 +29336,237 @@ msgstr ""
 "\t  [--shared[=<权限>]] [目录]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "该命令创建一个空的Git存储库 - 本质上是一个 `.git` 目录，其中包含 `objects`、`refs/heads`、`refs/tags`和模板文件的子目录。还将创建一个引用master分支 HEAD 的初始 `HEAD` 文件。"
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, fuzzy, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "如果设置了 `$GIT_DIR` 环境变量，那么它将指定用于仓库基础的路径，而不是 `./.git` ."
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "如果通过 `$GIT_OBJECT_DIRECTORY` 环境变量指定了对象存储目录，那么将在该目录下创建 sha1 目录，否则将使用默认的 `$GIT_DIR/objects` 目录。"
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, fuzzy, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "在现有存储库中运行 'git init' 是安全的。它不会覆盖已经存在的内容。重新运行 'git init' 的主要原因是选择新添加的模板（如果给定了 --separate-git-dir 参数，则将存储库移至另一个位置）。"
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "仅打印错误和警告消息；所有其他输出将不会显示。"
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "创建一个纯仓库。如果未设置 `GIT_DIR` 环境变量，则将其设置为当前工作目录。"
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, fuzzy, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr "--patch-format"
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr "指定存储库的对象格式（哈希算法）。有效值为 'sha1' 和（如果启用）'sha256'。'sha1' 是默认值。"
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "指定要使用模板的目录。（请参见下面的“模板目录”部分。）"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "并不将存储库初始化至 `$GIT_DIR` 或 `./.git/` 目录，而是在其中创建一个包含实际存储库路径的文本文件。此文件作为连接到仓库的 Git 符号链接，其与文件系统无关。"
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "如果为重新初始化操作，则将存储库移动到指定的路径。"
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch <name>"
+msgid "-b <branch-name"
+msgstr "--branch <名称>"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch <name>"
+msgid "--initial-branch=<branch-name>"
+msgstr "--branch <名称>"
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr "指定 Git 存储库在多个用户之间共享。这允许属于同一组的用户推送到该存储库。指定时，将设置配置变量 \"core.sharedRepository\"，以便使用请求的权限创建 `$GIT_DIR` 下的文件和目录。未指定时，Git 将使用 umask(2) 返回的权限。"
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr "此选项可以有以下值，如果未给定值，则默认为 'group'："
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask'（或 'false'）"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "使用 umask(2) 返回的权限。未指定 `--shared` 时，此为默认值。"
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group'（或 'true'）"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "使存储库组可写（并且 g+sx，因为 git 组可能不是所有用户的主要组）。这用于放宽原本安全的 umask(2) 值的权限。请注意，umask 仍然适用于其他权限位（例如，如果 umask 为 '0022'，则使用 'group' 不会删除其他（非组）用户的读取特权）。有关如何精确指定存储库权限的信息，请参见 '0xxx'。"
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all' （或 'world' 或 'everybody'）"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "与使用 'group' 选项相同，但使存储库对所有用户可读。"
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr "'0xxx'"
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr "'0xxx' 是一个八进制数，每个文件的模式均为 '0xxx'。' 0xxx' 将覆盖用户的 umask(2) 值（不仅像 'group 和 'all' 那样放宽权限）。'0640' 将创建一个组可读取但不能组写入且其他用户无法访问的存储库。'0660' 将创建当前用户和组可读可写但其他用户无法访问的存储库。"
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr "默认情况下，共享存储库中启用了配置标志 `receive.denyNonFastForwards`，因此您不能强制将非快速前进提交推送到其中。"
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr "如果提供 'dicrectory'，则命令在其中运行。如果此目录不存在，则创建它。"
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "模板目录"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr "模板目录中名称不以点开头的文件和目录将在创建后复制到 `$GIT_DIR` 中。"
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr "模板目录将是以下之一（按顺序）："
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr "用 `--template` 选项给出的参数；"
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr "`$GIT_TEMPLATE_DIR` 环境变量；"
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr "`init.templateDir` 配置变量；或者"
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr "默认模板目录：`/usr/share/git-core/templates`。"
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr "默认的模板目录包括一些目录结构，建议的“排除模式”（请参阅 linkgit:gitignore[5]）和示例钩子文件。"
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr "默认情况下，样例钩子都被禁用。要启用一个示例挂钩，请通过删除其后缀 `.sample` 对其重命名。"
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr "有关钩子执行的更多信息，请参见 linkgit:githooks[5]。"
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr "为现有代码库启动新的 Git 仓库"
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, fuzzy, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29462,19 +29580,19 @@ msgstr ""
 "$ git commit    <3>\n"
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr "创建 /path/to/my/codebase/.git 目录。"
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr "将所有现有文件添加到索引。"
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr "将原始状态记录为历史记录中的第一次提交。"
@@ -31357,9 +31475,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36443,7 +36561,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38836,12 +38954,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41415,7 +41529,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41438,7 +41552,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41456,7 +41570,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41564,13 +41678,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41588,7 +41702,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41696,7 +41810,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41708,7 +41822,7 @@ msgstr "update"
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46841,7 +46955,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46880,6 +46994,13 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, fuzzy, priority:100
+#| msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr "指定存储库的对象格式（哈希算法）。有效值为 'sha1' 和（如果启用）'sha256'。'sha1' 是默认值。"
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -49063,7 +49184,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49195,7 +49316,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49243,7 +49364,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53494,13 +53615,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53512,7 +53633,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53614,391 +53735,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56248,295 +56369,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56546,19 +56667,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56567,7 +56688,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56576,7 +56697,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56585,13 +56706,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56603,7 +56724,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59369,7 +59490,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59530,6 +59651,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59539,7 +59666,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65256,6 +65383,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, fuzzy
 #~ msgid "see linkgit:git-commit-tree[1]"
 #~ msgstr "linkgit:git-commit-tree[1]"
diff --git a/po/documentation.zh_HANT.po b/po/documentation.zh_HANT.po
index 7dad2fde7f6a5a3371c222a5478d942fa84bece8..8566158370744ca1563d3e4bd701f48907f3370d 100644
--- a/po/documentation.zh_HANT.po
+++ b/po/documentation.zh_HANT.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git Documentation\n"
 "Report-Msgid-Bugs-To: jn.avila@free.fr\n"
-"POT-Creation-Date: 2020-06-02 21:43+0200\n"
+"POT-Creation-Date: 2020-07-11 18:07+0200\n"
 "PO-Revision-Date: 2020-03-14 12:37+0000\n"
 "Last-Translator: adam chen <adam.cws@gmail.com>\n"
 "Language-Team: French\n"
@@ -17,7 +17,7 @@ msgstr ""
 "X-Generator: Weblate 4.0-dev\n"
 
 #. type: Labeled list
-#: en/blame-options.txt:1 en/diff-options.txt:666 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
+#: en/blame-options.txt:1 en/diff-options.txt:669 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31
 #, ignore-same, no-wrap, priority:280
 msgid "-b"
 msgstr "-b"
@@ -131,7 +131,7 @@ msgid "-p"
 msgstr "-p"
 
 #. type: Labeled list
-#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:179
+#: en/blame-options.txt:40 en/git-commit.txt:114 en/git-push.txt:176 en/git-worktree.txt:181
 #, ignore-same, no-wrap, priority:280
 msgid "--porcelain"
 msgstr "--porcelain"
@@ -481,7 +481,7 @@ msgid "Get and set repository or global options."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1563
+#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1570
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-export[1]"
 msgstr "linkgit:git-fast-export[1]"
@@ -493,7 +493,7 @@ msgid "Git data exporter."
 msgstr ""
 
 #. type: Plain text
-#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:252
+#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:281
 #, ignore-same, no-wrap, priority:100
 msgid "linkgit:git-fast-import[1]"
 msgstr "linkgit:git-fast-import[1]"
@@ -2042,7 +2042,7 @@ msgid "Update auxiliary info file to help dumb servers."
 msgstr ""
 
 #. type: Title -
-#: en/config.txt:2 en/git-worktree.txt:237
+#: en/config.txt:2 en/git-worktree.txt:239
 #, no-wrap, priority:240
 msgid "CONFIGURATION FILE"
 msgstr ""
@@ -4315,7 +4315,7 @@ msgid "ignore-space-at-eol"
 msgstr "ignore-space-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:330 en/diff-options.txt:665
+#: en/diff-options.txt:330 en/diff-options.txt:668
 #, priority:280
 msgid "Ignore changes in whitespace at EOL."
 msgstr ""
@@ -4327,7 +4327,7 @@ msgid "ignore-space-change"
 msgstr "ignore-space-change"
 
 #. type: Plain text
-#: en/diff-options.txt:334 en/diff-options.txt:671
+#: en/diff-options.txt:334 en/diff-options.txt:674
 #, priority:280
 msgid "Ignore changes in amount of whitespace.  This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
 msgstr ""
@@ -4882,259 +4882,265 @@ msgid "Swap two inputs; that is, show differences from index or on-disk file to
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:647
+#: en/diff-options.txt:648
 #, no-wrap, priority:280
 msgid "--relative[=<path>]"
 msgstr ""
 
+#. type: Labeled list
+#: en/diff-options.txt:649
+#, ignore-same, no-wrap, priority:280
+msgid "--no-relative"
+msgstr "--no-relative"
+
 #. type: Plain text
-#: en/diff-options.txt:654
+#: en/diff-options.txt:658
 #, priority:280
-msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
+msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option.  When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument.  `--no-relative` can be used to countermand both `diff.relative` config option and previous `--relative`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
+#: en/diff-options.txt:659 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
 #, ignore-same, no-wrap, priority:280
 msgid "-a"
 msgstr "-a"
 
 #. type: Labeled list
-#: en/diff-options.txt:657 en/git-grep.txt:103
+#: en/diff-options.txt:660 en/git-grep.txt:103
 #, ignore-same, no-wrap, priority:280
 msgid "--text"
 msgstr "--text"
 
 #. type: Plain text
-#: en/diff-options.txt:659
+#: en/diff-options.txt:662
 #, priority:280
 msgid "Treat all files as text."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:660
+#: en/diff-options.txt:663
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-cr-at-eol"
 msgstr "--ignore-cr-at-eol"
 
 #. type: Plain text
-#: en/diff-options.txt:662
+#: en/diff-options.txt:665
 #, priority:280
 msgid "Ignore carriage-return at the end of line when doing a comparison."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:663
+#: en/diff-options.txt:666
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-at-eol"
 msgstr "--ignore-space-at-eol"
 
 #. type: Labeled list
-#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
+#: en/diff-options.txt:670 en/git-am.txt:107 en/git-apply.txt:182
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-space-change"
 msgstr "--ignore-space-change"
 
 #. type: Labeled list
-#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
+#: en/diff-options.txt:675 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
 #, ignore-same, no-wrap, priority:280
 msgid "-w"
 msgstr "-w"
 
 #. type: Labeled list
-#: en/diff-options.txt:673
+#: en/diff-options.txt:676
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-all-space"
 msgstr "--ignore-all-space"
 
 #. type: Plain text
-#: en/diff-options.txt:677
+#: en/diff-options.txt:680
 #, priority:280
 msgid "Ignore whitespace when comparing lines.  This ignores differences even if one line has whitespace where the other line has none."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:678
+#: en/diff-options.txt:681
 #, ignore-same, no-wrap, priority:280
 msgid "--ignore-blank-lines"
 msgstr "--ignore-blank-lines"
 
 #. type: Plain text
-#: en/diff-options.txt:680
+#: en/diff-options.txt:683
 #, priority:280
 msgid "Ignore changes whose lines are all blank."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:681
+#: en/diff-options.txt:684
 #, no-wrap, priority:280
 msgid "--inter-hunk-context=<lines>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:686
+#: en/diff-options.txt:689
 #, priority:280
 msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other.  Defaults to `diff.interHunkContext` or 0 if the config option is unset."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
+#: en/diff-options.txt:690 en/git-cvsexportcommit.txt:77 en/git-grep.txt:264 en/git-restore.txt:54
 #, no-wrap, priority:280
 msgid "-W"
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:688 en/git-grep.txt:265
+#: en/diff-options.txt:691 en/git-grep.txt:265
 #, ignore-same, no-wrap, priority:280
 msgid "--function-context"
 msgstr "--function-context"
 
 #. type: Plain text
-#: en/diff-options.txt:690
+#: en/diff-options.txt:693
 #, priority:280
 msgid "Show whole surrounding functions of changes."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:693 en/git-ls-remote.txt:48
+#: en/diff-options.txt:696 en/git-ls-remote.txt:48
 #, ignore-same, no-wrap, priority:280
 msgid "--exit-code"
 msgstr "--exit-code"
 
 #. type: Plain text
-#: en/diff-options.txt:697
+#: en/diff-options.txt:700
 #, priority:280
 msgid "Make the program exit with codes similar to diff(1).  That is, it exits with 1 if there were differences and 0 means no differences."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:698 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:147 en/rev-list-options.txt:220
+#: en/diff-options.txt:701 en/fetch-options.txt:227 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:121 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:331 en/git-gc.txt:68 en/git-grep.txt:316 en/git-imap-send.txt:37 en/git-init.txt:43 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:397 en/git-reset.txt:106 en/git-restore.txt:63 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:187 en/merge-options.txt:147 en/rev-list-options.txt:220
 #, ignore-same, no-wrap, priority:300
 msgid "--quiet"
 msgstr "--quiet"
 
 #. type: Plain text
-#: en/diff-options.txt:700
+#: en/diff-options.txt:703
 #, priority:280
 msgid "Disable all output of the program. Implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:703
+#: en/diff-options.txt:706
 #, ignore-same, no-wrap, priority:280
 msgid "--ext-diff"
 msgstr "--ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:707
+#: en/diff-options.txt:710
 #, priority:280
 msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:708
+#: en/diff-options.txt:711
 #, ignore-same, no-wrap, priority:280
 msgid "--no-ext-diff"
 msgstr "--no-ext-diff"
 
 #. type: Plain text
-#: en/diff-options.txt:710
+#: en/diff-options.txt:713
 #, priority:280
 msgid "Disallow external diff drivers."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:711 en/git-cat-file.txt:60 en/git-grep.txt:106
+#: en/diff-options.txt:714 en/git-cat-file.txt:60 en/git-grep.txt:106
 #, ignore-same, no-wrap, priority:280
 msgid "--textconv"
 msgstr "--textconv"
 
 #. type: Labeled list
-#: en/diff-options.txt:712 en/git-grep.txt:109
+#: en/diff-options.txt:715 en/git-grep.txt:109
 #, ignore-same, no-wrap, priority:280
 msgid "--no-textconv"
 msgstr "--no-textconv"
 
 #. type: Plain text
-#: en/diff-options.txt:721
+#: en/diff-options.txt:724
 #, priority:280
 msgid "Allow (or disallow) external text conversion filters to be run when comparing binary files. See linkgit:gitattributes[5] for details. Because textconv filters are typically a one-way conversion, the resulting diff is suitable for human consumption, but cannot be applied. For this reason, textconv filters are enabled by default only for linkgit:git-diff[1] and linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing commands."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:722 en/git-status.txt:87
+#: en/diff-options.txt:725 en/git-status.txt:87
 #, no-wrap, priority:280
 msgid "--ignore-submodules[=<when>]"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:734
+#: en/diff-options.txt:737
 #, priority:280
 msgid "Ignore changes to submodules in the diff generation. <when> can be either \"none\", \"untracked\", \"dirty\" or \"all\", which is the default.  Using \"none\" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified content). Using \"dirty\" ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was the behavior until 1.7.0). Using \"all\" hides all changes to submodules."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:735
+#: en/diff-options.txt:738
 #, no-wrap, priority:280
 msgid "--src-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:737
+#: en/diff-options.txt:740
 #, priority:280
 msgid "Show the given source prefix instead of \"a/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:738
+#: en/diff-options.txt:741
 #, no-wrap, priority:280
 msgid "--dst-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:740
+#: en/diff-options.txt:743
 #, priority:280
 msgid "Show the given destination prefix instead of \"b/\"."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:741
+#: en/diff-options.txt:744
 #, ignore-same, no-wrap, priority:280
 msgid "--no-prefix"
 msgstr "--no-prefix"
 
 #. type: Plain text
-#: en/diff-options.txt:743
+#: en/diff-options.txt:746
 #, priority:280
 msgid "Do not show any source or destination prefix."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:744
+#: en/diff-options.txt:747
 #, no-wrap, priority:280
 msgid "--line-prefix=<prefix>"
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:746
+#: en/diff-options.txt:749
 #, priority:280
 msgid "Prepend an additional prefix to every line of output."
 msgstr ""
 
 #. type: Labeled list
-#: en/diff-options.txt:747
+#: en/diff-options.txt:750
 #, ignore-same, no-wrap, priority:280
 msgid "--ita-invisible-in-index"
 msgstr "--ita-invisible-in-index"
 
 #. type: Plain text
-#: en/diff-options.txt:754
+#: en/diff-options.txt:757
 #, priority:280
 msgid "By default entries added by \"git add -N\" appear as an existing empty file in \"git diff\" and a new file in \"git diff --cached\".  This option makes the entry appear as a new file in \"git diff\" and non-existent in \"git diff --cached\". This option could be reverted with `--ita-visible-in-index`. Both options are experimental and could be removed in future."
 msgstr ""
 
 #. type: Plain text
-#: en/diff-options.txt:756
+#: en/diff-options.txt:759
 #, priority:280
 msgid "For more detailed explanation on these common options, see also linkgit:gitdiffcore[7]."
 msgstr ""
@@ -5272,7 +5278,7 @@ msgid "See also the `fetch.negotiationAlgorithm` configuration variable document
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:175
+#: en/fetch-options.txt:64 en/git-add.txt:70 en/git-clean.txt:50 en/git-commit.txt:333 en/git-http-push.txt:37 en/git-mv.txt:40 en/git-notes.txt:179 en/git-p4.txt:332 en/git-prune-packed.txt:32 en/git-prune.txt:37 en/git-push.txt:173 en/git-quiltimport.txt:35 en/git-read-tree.txt:59 en/git-reflog.txt:120 en/git-rm.txt:51 en/git-send-email.txt:400 en/git-send-pack.txt:51 en/git-svn.txt:688 en/git-worktree.txt:177
 #, ignore-same, no-wrap, priority:300
 msgid "--dry-run"
 msgstr "--dry-run"
@@ -5412,7 +5418,7 @@ msgid "Before fetching, remove any local tags that no longer exist on the remote
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:92
+#: en/fetch-options.txt:127 en/git-add.txt:69 en/git-blame.txt:71 en/git-checkout-index.txt:43 en/git-cherry-pick.txt:92 en/git-clean.txt:49 en/git-clone.txt:144 en/git-commit.txt:175 en/git-format-patch.txt:100 en/git-grep.txt:179 en/git-mailinfo.txt:66 en/git-mv.txt:39 en/git-notes.txt:178 en/git-p4.txt:331 en/git-prune-packed.txt:31 en/git-prune.txt:36 en/git-push.txt:172 en/git-quiltimport.txt:34 en/git-read-tree.txt:58 en/git-rebase.txt:408 en/git-reflog.txt:119 en/git-repack.txt:82 en/git-revert.txt:77 en/git-rm.txt:50 en/git-shortlog.txt:29 en/git-submodule.txt:312 en/git-svn.txt:687 en/git-unpack-objects.txt:30 en/git-worktree.txt:176 en/merge-options.txt:92
 #, ignore-same, no-wrap, priority:300
 msgid "-n"
 msgstr "-n"
@@ -5568,7 +5574,7 @@ msgid "When given, and the repository to fetch from is handled by 'git fetch-pac
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:41 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:184 en/merge-options.txt:146
+#: en/fetch-options.txt:226 en/git-am.txt:73 en/git-branch.txt:192 en/git-bundle.txt:105 en/git-checkout-index.txt:30 en/git-checkout.txt:107 en/git-clean.txt:53 en/git-clone.txt:120 en/git-commit.txt:329 en/git-diff-files.txt:44 en/git-fetch-pack.txt:48 en/git-format-patch.txt:330 en/git-grep.txt:315 en/git-imap-send.txt:36 en/git-init.txt:42 en/git-ls-remote.txt:38 en/git-merge-file.txt:67 en/git-merge-index.txt:35 en/git-notes.txt:206 en/git-pack-objects.txt:173 en/git-prune-packed.txt:36 en/git-pull.txt:77 en/git-push.txt:361 en/git-read-tree.txt:132 en/git-rebase.txt:396 en/git-repack.txt:78 en/git-reset.txt:105 en/git-restore.txt:62 en/git-rev-parse.txt:113 en/git-rm.txt:73 en/git-show-ref.txt:70 en/git-stash.txt:215 en/git-submodule.txt:265 en/git-svn.txt:670 en/git-switch.txt:140 en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34 en/git-update-index.txt:59 en/git-worktree.txt:186 en/merge-options.txt:146
 #, ignore-same, no-wrap, priority:300
 msgid "-q"
 msgstr "-q"
@@ -5580,13 +5586,13 @@ msgid "Pass --quiet to git-fetch-pack and silence any other internally used git
 msgstr ""
 
 #. type: Labeled list
-#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188 en/merge-options.txt:150
+#: en/fetch-options.txt:232 en/git-add.txt:74 en/git-apply.txt:224 en/git-archimport.txt:74 en/git-archive.txt:47 en/git-branch.txt:181 en/git-cherry.txt:29 en/git-clone.txt:125 en/git-commit.txt:314 en/git-count-objects.txt:21 en/git-cvsexportcommit.txt:82 en/git-cvsimport.txt:52 en/git-diff-tree.txt:78 en/git-fetch-pack.txt:111 en/git-grep.txt:141 en/git-http-fetch.txt:30 en/git-imap-send.txt:32 en/git-index-pack.txt:27 en/git-ls-files.txt:134 en/git-mv.txt:43 en/git-notes.txt:210 en/git-p4.txt:208 en/git-prune.txt:41 en/git-pull.txt:83 en/git-push.txt:367 en/git-read-tree.txt:63 en/git-rebase.txt:400 en/git-remote.txt:35 en/git-status.txt:50 en/git-svn.txt:366 en/git-tag.txt:87 en/git-verify-commit.txt:23 en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:190 en/merge-options.txt:150
 #, ignore-same, no-wrap, priority:300
 msgid "-v"
 msgstr "-v"
 
 #. type: Labeled list
-#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:151
+#: en/fetch-options.txt:233 en/git-add.txt:75 en/git-apply.txt:225 en/git-archive.txt:48 en/git-branch.txt:183 en/git-clone.txt:126 en/git-commit.txt:315 en/git-count-objects.txt:22 en/git-daemon.txt:148 en/git-fsck.txt:85 en/git-help.txt:50 en/git-http-push.txt:40 en/git-imap-send.txt:33 en/git-mv.txt:44 en/git-notes.txt:211 en/git-p4.txt:209 en/git-pack-redundant.txt:39 en/git-prune.txt:42 en/git-pull.txt:84 en/git-push.txt:368 en/git-rebase.txt:401 en/git-reflog.txt:124 en/git-remote.txt:36 en/git-send-pack.txt:61 en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:159 en/git-verify-commit.txt:24 en/git-verify-pack.txt:27 en/git-verify-tag.txt:24 en/git-worktree.txt:191 en/merge-options.txt:151
 #, ignore-same, no-wrap, priority:300
 msgid "--verbose"
 msgstr "--verbose"
@@ -5728,7 +5734,7 @@ msgstr ""
 "\t  [--] [<pathspec>...]\n"
 
 #. type: Title -
-#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:19 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:18 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
+#: en/git-add.txt:18 en/git-am.txt:22 en/git-annotate.txt:14 en/git-apply.txt:22 en/git-archimport.txt:16 en/git-archive.txt:18 en/git-bisect.txt:15 en/git-blame.txt:18 en/git-branch.txt:28 en/git-bugreport.txt:14 en/git-bundle.txt:18 en/git-cat-file.txt:16 en/git-check-attr.txt:16 en/git-check-ignore.txt:16 en/git-check-mailmap.txt:16 en/git-checkout-index.txt:19 en/git-checkout.txt:20 en/git-check-ref-format.txt:17 en/git-cherry-pick.txt:16 en/git-cherry.txt:14 en/git-citool.txt:14 en/git-clean.txt:14 en/git-clone.txt:23 en/git-column.txt:15 en/git-commit-tree.txt:18 en/git-commit.txt:20 en/git-config.txt:29 en/git-count-objects.txt:14 en/git-credential-cache--daemon.txt:14 en/git-credential-cache.txt:15 en/git-credential-store.txt:15 en/git-credential.txt:15 en/git-cvsexportcommit.txt:17 en/git-cvsimport.txt:20 en/git-cvsserver.txt:61 en/git-daemon.txt:27 en/git-describe.txt:16 en/git-diff-files.txt:15 en/git-diff-index.txt:15 en/git-difftool.txt:14 en/git-diff-tree.txt:17 en/git-diff.txt:20 en/git-fast-export.txt:15 en/git-fast-import.txt:15 en/git-fetch-pack.txt:18 en/git-fetch.txt:19 en/git-filter-branch.txt:33 en/git-fmt-merge-msg.txt:16 en/git-for-each-ref.txt:18 en/git-format-patch.txt:36 en/git-fsck-objects.txt:15 en/git-fsck.txt:18 en/git-gc.txt:15 en/git-get-tar-commit-id.txt:16 en/git-grep.txt:34 en/git-gui.txt:14 en/git-hash-object.txt:16 en/git-help.txt:15 en/git-http-backend.txt:14 en/git-http-fetch.txt:15 en/git-http-push.txt:15 en/git-imap-send.txt:16 en/git-index-pack.txt:18 en/git-init-db.txt:16 en/git-init.txt:19 en/git-instaweb.txt:16 en/git-interpret-trailers.txt:15 en/git-log.txt:15 en/git-ls-files.txt:25 en/git-ls-remote.txt:17 en/git-ls-tree.txt:17 en/git-mailinfo.txt:16 en/git-mailsplit.txt:15 en/git-merge-base.txt:19 en/git-merge-file.txt:18 en/git-merge-index.txt:15 en/git-merge-one-file.txt:15 en/git-mergetool--lib.txt:14 en/git-mergetool.txt:14 en/git-merge-tree.txt:15 en/git-merge.txt:19 en/git-mktag.txt:15 en/git-mktree.txt:15 en/git-mv.txt:15 en/git-name-rev.txt:16 en/git-notes.txt:26 en/git-p4.txt:19 en/git-pack-objects.txt:21 en/git-pack-redundant.txt:15 en/git-pack-refs.txt:14 en/git-parse-remote.txt:15 en/git-patch-id.txt:14 en/git-prune-packed.txt:16 en/git-prune.txt:15 en/git-pull.txt:16 en/git-push.txt:20 en/git-quiltimport.txt:17 en/git-read-tree.txt:19 en/git-rebase.txt:18 en/git-receive-pack.txt:15 en/git-reflog.txt:15 en/git-remote-ext.txt:14 en/git-remote-fd.txt:13 en/git-remote.txt:27 en/git-repack.txt:15 en/git-replace.txt:19 en/git-request-pull.txt:14 en/git-rerere.txt:14 en/git-reset.txt:17 en/git-restore.txt:16 en/git-revert.txt:15 en/git-rev-list.txt:15 en/git-rev-parse.txt:15 en/git-rm.txt:16 en/git-send-email.txt:17 en/git-send-pack.txt:18 en/git-shell.txt:17 en/git-sh-i18n--envsubst.txt:19 en/git-sh-i18n.txt:14 en/git-shortlog.txt:15 en/git-show-branch.txt:19 en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15 en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:25 en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:27 en/git-svn.txt:14 en/git-switch.txt:17 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16 en/git-update-index.txt:32 en/git-update-ref.txt:14 en/git-update-server-info.txt:15 en/git-upload-archive.txt:15 en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14 en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15 en/gitglossary.txt:13
 #, no-wrap, priority:300
 msgid "DESCRIPTION"
 msgstr "說明"
@@ -5770,7 +5776,7 @@ msgid "Please see linkgit:git-commit[1] for alternative ways to add content to a
 msgstr "linkgit:git-commit[1] 為另一種將內容加入到提交中的做法。"
 
 #. type: Title -
-#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:39 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:96 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:39 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
+#: en/git-add.txt:52 en/git-am.txt:28 en/git-annotate.txt:24 en/git-apply.txt:36 en/git-archimport.txt:69 en/git-archive.txt:34 en/git-bisect.txt:356 en/git-blame.txt:50 en/git-branch.txt:96 en/git-bugreport.txt:40 en/git-bundle.txt:37 en/git-cat-file.txt:30 en/git-check-attr.txt:21 en/git-check-ignore.txt:27 en/git-check-mailmap.txt:25 en/git-checkout-index.txt:24 en/git-checkout.txt:106 en/git-check-ref-format.txt:100 en/git-cherry-pick.txt:42 en/git-cherry.txt:28 en/git-clean.txt:27 en/git-clone.txt:44 en/git-column.txt:22 en/git-commit-tree.txt:46 en/git-commit.txt:64 en/git-config.txt:72 en/git-count-objects.txt:20 en/git-credential-cache.txt:27 en/git-credential-store.txt:30 en/git-cvsexportcommit.txt:35 en/git-cvsimport.txt:51 en/git-cvsserver.txt:28 en/git-daemon.txt:48 en/git-describe.txt:36 en/git-diff-files.txt:22 en/git-diff-index.txt:23 en/git-difftool.txt:21 en/git-diff-tree.txt:26 en/git-diff.txt:107 en/git-fast-export.txt:25 en/git-fast-import.txt:35 en/git-fetch-pack.txt:34 en/git-fetch.txt:46 en/git-filter-branch.txt:96 en/git-fmt-merge-msg.txt:25 en/git-for-each-ref.txt:28 en/git-format-patch.txt:88 en/git-fsck.txt:22 en/git-gc.txt:35 en/git-grep.txt:74 en/git-hash-object.txt:24 en/git-help.txt:44 en/git-http-fetch.txt:23 en/git-http-push.txt:24 en/git-imap-send.txt:30 en/git-index-pack.txt:26 en/git-init.txt:40 en/git-instaweb.txt:21 en/git-interpret-trailers.txt:73 en/git-log.txt:25 en/git-ls-files.txt:34 en/git-ls-remote.txt:23 en/git-ls-tree.txt:37 en/git-mailinfo.txt:26 en/git-mailsplit.txt:23 en/git-merge-base.txt:70 en/git-merge-file.txt:53 en/git-merge-index.txt:22 en/git-mergetool.txt:26 en/git-merge.txt:63 en/git-mktree.txt:22 en/git-mv.txt:30 en/git-name-rev.txt:22 en/git-notes.txt:126 en/git-p4.txt:199 en/git-pack-objects.txt:50 en/git-pack-redundant.txt:29 en/git-pack-refs.txt:46 en/git-patch-id.txt:31 en/git-prune-packed.txt:30 en/git-prune.txt:34 en/git-pull.txt:75 en/git-quiltimport.txt:32 en/git-read-tree.txt:33 en/git-rebase.txt:209 en/git-receive-pack.txt:40 en/git-reflog.txt:61 en/git-remote.txt:33 en/git-repack.txt:29 en/git-replace.txt:59 en/git-request-pull.txt:28 en/git-reset.txt:103 en/git-restore.txt:34 en/git-revert.txt:35 en/git-rev-list.txt:63 en/git-rev-parse.txt:26 en/git-rm.txt:30 en/git-send-email.txt:43 en/git-send-pack.txt:27 en/git-shortlog.txt:27 en/git-show-branch.txt:32 en/git-show-index.txt:40 en/git-show-ref.txt:34 en/git-show.txt:36 en/git-stash.txt:153 en/git-status.txt:25 en/git-stripspace.txt:37 en/git-submodule.txt:264 en/git-svn.txt:575 en/git-switch.txt:35 en/git-symbolic-ref.txt:33 en/git-tag.txt:59 en/git.txt:41 en/git-unpack-file.txt:22 en/git-unpack-objects.txt:29 en/git-update-index.txt:44 en/git-upload-archive.txt:56 en/git-upload-pack.txt:26 en/git-var.txt:19 en/git-verify-commit.txt:18 en/git-verify-pack.txt:22 en/git-verify-tag.txt:18 en/git-web--browse.txt:43 en/git-worktree.txt:117 en/git-write-tree.txt:29
 #, no-wrap, priority:300
 msgid "OPTIONS"
 msgstr "選項"
@@ -6053,7 +6059,7 @@ msgid "This option can be used to separate command-line options from the list of
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123 en/git-fast-export.txt:162 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:142 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-add.txt:211 en/git-archive.txt:149 en/git-bisect.txt:369 en/git-branch.txt:308 en/git-bundle.txt:136 en/git-check-attr.txt:71 en/git-checkout-index.txt:143 en/git-checkout.txt:510 en/git-check-ref-format.txt:123 en/git-cherry-pick.txt:169 en/git-cherry.txt:43 en/git-clone.txt:315 en/git-column.txt:50 en/git-commit.txt:370 en/git-config.txt:343 en/git-credential-cache.txt:55 en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91 en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:134 en/git-fast-export.txt:167 en/git-fetch.txt:242 en/git-filter-branch.txt:247 en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:273 en/git-format-patch.txt:669 en/git-grep.txt:336 en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:149 en/git-interpret-trailers.txt:256 en/git-log.txt:123 en/git-ls-remote.txt:95 en/git-merge-file.txt:81 en/git-merge.txt:324 en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60 en/git-pull.txt:203 en/git-push.txt:570 en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50 en/git-reset.txt:134 en/git-restore.txt:147 en/git-revert.txt:125 en/git-rev-parse.txt:438 en/git-rm.txt:167 en/git-send-email.txt:483 en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58 en/git-stash.txt:263 en/git-stripspace.txt:49 en/git-switch.txt:191 en/git-update-index.txt:357 en/git-var.txt:27 en/git-worktree.txt:357
 #, no-wrap, priority:300
 msgid "EXAMPLES"
 msgstr "範例"
@@ -6407,7 +6413,7 @@ msgid "modifying the contents of context or removal lines"
 msgstr ""
 
 #. type: Title -
-#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:193 en/git-fast-export.txt:250 en/git-fast-import.txt:1561 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:985 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
+#: en/git-add.txt:428 en/git-am.txt:245 en/git-annotate.txt:28 en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493 en/git-blame.txt:231 en/git-branch.txt:374 en/git-check-attr.txt:115 en/git-check-ignore.txt:119 en/git-checkout.txt:596 en/git-cherry-pick.txt:241 en/git-cherry.txt:140 en/git-clean.txt:137 en/git-commit-tree.txt:95 en/git-commit.txt:537 en/git-difftool.txt:137 en/git-diff.txt:204 en/git-fast-export.txt:279 en/git-fast-import.txt:1568 en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:389 en/git-format-patch.txt:714 en/git-gc.txt:153 en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89 en/git-interpret-trailers.txt:385 en/git-ls-files.txt:245 en/git-ls-remote.txt:116 en/git-merge.txt:367 en/git-pack-objects.txt:401 en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81 en/git-pull.txt:250 en/git-read-tree.txt:437 en/git-receive-pack.txt:251 en/git-remote-ext.txt:120 en/git-remote-fd.txt:54 en/git-remote.txt:249 en/git-repack.txt:182 en/git-replace.txt:149 en/git-restore.txt:209 en/git-revert.txt:140 en/git-rm.txt:191 en/git-send-email.txt:521 en/git-shell.txt:99 en/git-show-ref.txt:178 en/git-stash.txt:349 en/git-status.txt:438 en/git-submodule.txt:451 en/git-svn.txt:1170 en/git-switch.txt:267 en/git-tag.txt:381 en/git.txt:982 en/git-update-index.txt:569 en/git-upload-pack.txt:48 en/git-var.txt:63 en/gitglossary.txt:18
 #, no-wrap, priority:300
 msgid "SEE ALSO"
 msgstr ""
@@ -6419,13 +6425,13 @@ msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-
 msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title -
-#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:52 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:202 en/git-fast-export.txt:254 en/git-fast-import.txt:1565 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22 en/git-init.txt:158 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:993 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41 en/gitglossary.txt:26
+#: en/git-add.txt:437 en/git-am.txt:249 en/git-annotate.txt:32 en/git-apply.txt:284 en/git-archimport.txt:112 en/git-archive.txt:196 en/git-bisect.txt:498 en/git-blame.txt:235 en/git-branch.txt:382 en/git-bugreport.txt:53 en/git-bundle.txt:244 en/git-cat-file.txt:318 en/git-check-attr.txt:119 en/git-check-ignore.txt:125 en/git-check-mailmap.txt:46 en/git-checkout-index.txt:176 en/git-checkout.txt:601 en/git-check-ref-format.txt:139 en/git-cherry-pick.txt:245 en/git-cherry.txt:144 en/git-citool.txt:24 en/git-clean.txt:141 en/git-clone.txt:353 en/git-column.txt:78 en/git-commit-tree.txt:100 en/git-commit.txt:545 en/git-config.txt:499 en/git-count-objects.txt:53 en/git-credential-cache--daemon.txt:29 en/git-credential-cache.txt:79 en/git-credential-store.txt:109 en/git-cvsexportcommit.txt:117 en/git-cvsimport.txt:227 en/git-cvsserver.txt:432 en/git-daemon.txt:339 en/git-describe.txt:206 en/git-diff-files.txt:51 en/git-diff-index.txt:121 en/git-difftool.txt:148 en/git-diff-tree.txt:125 en/git-diff.txt:214 en/git-fast-export.txt:283 en/git-fast-import.txt:1572 en/git-fetch-pack.txt:131 en/git-fetch.txt:298 en/git-filter-branch.txt:702 en/git-fmt-merge-msg.txt:77 en/git-for-each-ref.txt:393 en/git-format-patch.txt:718 en/git-fsck-objects.txt:21 en/git-fsck.txt:174 en/git-gc.txt:160 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:365 en/git-gui.txt:120 en/git-hash-object.txt:62 en/git-help.txt:203 en/git-http-backend.txt:276 en/git-http-fetch.txt:55 en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:115 en/git-init-db.txt:22 en/git-init.txt:165 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389 en/git-log.txt:242 en/git-ls-files.txt:249 en/git-ls-remote.txt:120 en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:246 en/git-merge-file.txt:94 en/git-merge-index.txt:82 en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:48 en/git-mergetool.txt:113 en/git-merge-tree.txt:28 en/git-merge.txt:376 en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68 en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:407 en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72 en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:254 en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:442 en/git-rebase.txt:1262 en/git-receive-pack.txt:255 en/git-reflog.txt:137 en/git-remote-ext.txt:124 en/git-remote-fd.txt:58 en/git-remote.txt:255 en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221 en/git-reset.txt:502 en/git-restore.txt:214 en/git-revert.txt:144 en/git-rev-list.txt:71 en/git-rev-parse.txt:463 en/git-rm.txt:195 en/git-send-email.txt:525 en/git-send-pack.txt:155 en/git-shell.txt:105 en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:92 en/git-show-branch.txt:203 en/git-show-index.txt:49 en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22 en/git-stash.txt:357 en/git-status.txt:442 en/git-stripspace.txt:93 en/git-submodule.txt:455 en/git-svn.txt:1174 en/git-switch.txt:272 en/git-symbolic-ref.txt:68 en/git-tag.txt:386 en/git.txt:990 en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51 en/git-update-index.txt:575 en/git-update-ref.txt:177 en/git-update-server-info.txt:34 en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31 en/git-verify-pack.txt:52 en/git-verify-tag.txt:31 en/git-web--browse.txt:123 en/git-whatchanged.txt:42 en/git-worktree.txt:383 en/git-write-tree.txt:41 en/gitglossary.txt:26
 #, no-wrap, priority:300
 msgid "GIT"
 msgstr "GIT"
 
 #. type: Plain text
-#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:53 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:203 en/git-fast-export.txt:255 en/git-fast-import.txt:1566 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23 en/git-init.txt:159 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:994 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42 en/gitglossary.txt:27
+#: en/git-add.txt:438 en/git-am.txt:250 en/git-annotate.txt:33 en/git-apply.txt:285 en/git-archimport.txt:113 en/git-archive.txt:197 en/git-bisect.txt:499 en/git-blame.txt:236 en/git-branch.txt:383 en/git-bugreport.txt:54 en/git-bundle.txt:245 en/git-cat-file.txt:319 en/git-check-attr.txt:120 en/git-check-ignore.txt:126 en/git-check-mailmap.txt:47 en/git-checkout-index.txt:177 en/git-checkout.txt:602 en/git-check-ref-format.txt:140 en/git-cherry-pick.txt:246 en/git-cherry.txt:145 en/git-citool.txt:25 en/git-clean.txt:142 en/git-clone.txt:354 en/git-column.txt:79 en/git-commit-tree.txt:101 en/git-commit.txt:546 en/git-config.txt:500 en/git-count-objects.txt:54 en/git-credential-cache--daemon.txt:30 en/git-credential-cache.txt:80 en/git-credential-store.txt:110 en/git-cvsexportcommit.txt:118 en/git-cvsimport.txt:228 en/git-cvsserver.txt:433 en/git-daemon.txt:340 en/git-describe.txt:207 en/git-diff-files.txt:52 en/git-diff-index.txt:122 en/git-difftool.txt:149 en/git-diff-tree.txt:126 en/git-diff.txt:215 en/git-fast-export.txt:284 en/git-fast-import.txt:1573 en/git-fetch-pack.txt:132 en/git-fetch.txt:299 en/git-filter-branch.txt:703 en/git-fmt-merge-msg.txt:78 en/git-for-each-ref.txt:394 en/git-format-patch.txt:719 en/git-fsck-objects.txt:22 en/git-fsck.txt:175 en/git-gc.txt:161 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:366 en/git-gui.txt:121 en/git-hash-object.txt:63 en/git-help.txt:204 en/git-http-backend.txt:277 en/git-http-fetch.txt:56 en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:116 en/git-init-db.txt:23 en/git-init.txt:166 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390 en/git-log.txt:243 en/git-ls-files.txt:250 en/git-ls-remote.txt:121 en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:247 en/git-merge-file.txt:95 en/git-merge-index.txt:83 en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:49 en/git-mergetool.txt:114 en/git-merge-tree.txt:29 en/git-merge.txt:377 en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69 en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:408 en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73 en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:255 en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:443 en/git-rebase.txt:1263 en/git-receive-pack.txt:256 en/git-reflog.txt:138 en/git-remote-ext.txt:125 en/git-remote-fd.txt:59 en/git-remote.txt:256 en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222 en/git-reset.txt:503 en/git-restore.txt:215 en/git-revert.txt:145 en/git-rev-list.txt:72 en/git-rev-parse.txt:464 en/git-rm.txt:196 en/git-send-email.txt:526 en/git-send-pack.txt:156 en/git-shell.txt:106 en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:93 en/git-show-branch.txt:204 en/git-show-index.txt:50 en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23 en/git-stash.txt:358 en/git-status.txt:443 en/git-stripspace.txt:94 en/git-submodule.txt:456 en/git-svn.txt:1175 en/git-switch.txt:273 en/git-symbolic-ref.txt:69 en/git-tag.txt:387 en/git.txt:991 en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52 en/git-update-index.txt:576 en/git-update-ref.txt:178 en/git-update-server-info.txt:35 en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32 en/git-verify-pack.txt:53 en/git-verify-tag.txt:32 en/git-web--browse.txt:124 en/git-whatchanged.txt:43 en/git-worktree.txt:384 en/git-write-tree.txt:42 en/gitglossary.txt:27
 #, priority:300
 msgid "Part of the linkgit:git[1] suite"
 msgstr ""
@@ -7182,7 +7188,7 @@ msgid "Note, for the reasons stated above usage of context-free patches is disco
 msgstr ""
 
 #. type: Plain text
-#: en/git-apply.txt:145 en/git-rebase.txt:610
+#: en/git-apply.txt:145 en/git-rebase.txt:262 en/git-rebase.txt:610
 #, ignore-same, no-wrap, priority:100
 msgid "--apply"
 msgstr "--apply"
@@ -7770,7 +7776,7 @@ msgid "zip"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
+#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:120
 #, ignore-same, no-wrap, priority:280
 msgid "-0"
 msgstr "-0"
@@ -9138,7 +9144,7 @@ msgid ""
 "\t[-v [--abbrev=<length> | --no-abbrev]]\n"
 "\t[--column[=<options>] | --no-column] [--sort=<key>]\n"
 "\t[(--merged | --no-merged) [<commit>]]\n"
-"\t[--contains [<commit]] [--no-contains [<commit>]]\n"
+"\t[--contains [<commit>]] [--no-contains [<commit>]]\n"
 "\t[--points-at <object>] [--format=<format>]\n"
 "\t[(-r | --remotes) | (-a | --all)]\n"
 "\t[--list] [<pattern>...]\n"
@@ -9732,7 +9738,7 @@ msgid "Patterns will normally need quoting."
 msgstr ""
 
 #. type: Title -
-#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:97 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
+#: en/git-branch.txt:351 en/git-gc.txt:115 en/git-index-pack.txt:105 en/git-prune.txt:71 en/git-symbolic-ref.txt:54 en/git-update-index.txt:553
 #, no-wrap, priority:240
 msgid "NOTES"
 msgstr ""
@@ -9858,47 +9864,53 @@ msgid "A list of enabled hooks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-bugreport.txt:37
+#: en/git-bugreport.txt:33
+#, priority:100
+msgid "$SHELL"
+msgstr ""
+
+#. type: Plain text
+#: en/git-bugreport.txt:38
 #, priority:100
 msgid "This tool is invoked via the typical Git setup process, which means that in some cases, it might not be able to launch - for example, if a relevant config file is unreadable. In this kind of scenario, it may be helpful to manually gather the kind of information listed above when manually asking for help."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:40
+#: en/git-bugreport.txt:41
 #, fuzzy, no-wrap, priority:100
 #| msgid "--path"
 msgid "-o <path>"
 msgstr "--path"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:41
+#: en/git-bugreport.txt:42
 #, fuzzy, no-wrap, priority:100
 #| msgid "--no-empty-directory"
 msgid "--output-directory <path>"
 msgstr "--no-empty-directory"
 
 #. type: Plain text
-#: en/git-bugreport.txt:44
+#: en/git-bugreport.txt:45
 #, priority:100
 msgid "Place the resulting bug report file in `<path>` instead of the root of the Git repository."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-bugreport.txt:45
+#: en/git-bugreport.txt:46
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "-s <format>"
 msgstr "--git-format"
 
 #. type: Labeled list
-#: en/git-bugreport.txt:46
+#: en/git-bugreport.txt:47
 #, fuzzy, no-wrap, priority:100
 #| msgid "--git-format"
 msgid "--suffix <format>"
 msgstr "--git-format"
 
 #. type: Plain text
-#: en/git-bugreport.txt:50
+#: en/git-bugreport.txt:51
 #, priority:100
 msgid "Specify an alternate suffix for the bugreport name, to create a file named 'git-bugreport-<formatted suffix>'. This should take the form of a strftime(3) format string; the current local time will be used."
 msgstr ""
@@ -10253,7 +10265,7 @@ msgstr ""
 #, no-wrap, priority:100
 msgid ""
 "'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>\n"
-"'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]\n"
+"'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]\n"
 msgstr ""
 
 #. type: Plain text
@@ -11835,7 +11847,7 @@ msgid "Create the new branch's reflog; see linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:143
+#: en/git-checkout.txt:201 en/git-daemon.txt:156 en/git-switch.txt:82 en/git-worktree.txt:145
 #, ignore-same, no-wrap, priority:240
 msgid "--detach"
 msgstr "--detach"
@@ -13628,7 +13640,7 @@ msgid "No checkout of HEAD is performed after the clone is complete."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:148 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:149
+#: en/git-clone.txt:148 en/git-init.txt:47 en/git-p4.txt:305 en/git.txt:149
 #, ignore-same, no-wrap, priority:300
 msgid "--bare"
 msgstr "--bare"
@@ -13724,7 +13736,7 @@ msgid "When given, and the repository to clone from is accessed via ssh, this sp
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:204 en/git-init.txt:56 en/git-svn.txt:578
+#: en/git-clone.txt:204 en/git-init.txt:57 en/git-svn.txt:578
 #, no-wrap, priority:300
 msgid "--template=<template_directory>"
 msgstr ""
@@ -13809,9 +13821,10 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-clone.txt:262
-#, no-wrap, priority:300
-msgid "--recurse-submodules[=<pathspec]"
-msgstr ""
+#, fuzzy, no-wrap, priority:300
+#| msgid "--recurse-submodules"
+msgid "--recurse-submodules[=<pathspec>]"
+msgstr "--recurse-submodules"
 
 #. type: Plain text
 #: en/git-clone.txt:270
@@ -13850,7 +13863,7 @@ msgid "All submodules which are cloned will use the status of the submodule's re
 msgstr ""
 
 #. type: Labeled list
-#: en/git-clone.txt:287 en/git-init.txt:61
+#: en/git-clone.txt:287 en/git-init.txt:62
 #, no-wrap, priority:300
 msgid "--separate-git-dir=<git dir>"
 msgstr ""
@@ -15992,7 +16005,7 @@ msgid ""
 msgstr ""
 
 #. type: Title -
-#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:375
+#: en/git-config.txt:478 en/git-describe.txt:198 en/git-fetch.txt:285 en/git-mv.txt:56 en/git-pack-refs.txt:64 en/git-pull.txt:241 en/git-rebase.txt:1239 en/git-replace.txt:139 en/git-rm.txt:182 en/git-svn.txt:1065 en/git-worktree.txt:377
 #, no-wrap, priority:280
 msgid "BUGS"
 msgstr ""
@@ -17417,7 +17430,7 @@ msgid "Testing has been done using both the CLI CVS client, and the Eclipse CVS
 msgstr ""
 
 #. type: Title -
-#: en/git-cvsserver.txt:73 en/git-fast-export.txt:243
+#: en/git-cvsserver.txt:73 en/git-fast-export.txt:272
 #, no-wrap, priority:100
 msgid "LIMITATIONS"
 msgstr ""
@@ -18892,19 +18905,19 @@ msgid "Compares the files in the working tree and the index.  When paths are spe
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:25 en/git-diff.txt:100
+#: en/git-diff-files.txt:25 en/git-diff.txt:111
 #, no-wrap, priority:280
 msgid "-1 --base"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:26 en/git-diff.txt:101
+#: en/git-diff-files.txt:26 en/git-diff.txt:112
 #, no-wrap, priority:280
 msgid "-2 --ours"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-files.txt:27 en/git-diff.txt:102
+#: en/git-diff-files.txt:27 en/git-diff.txt:113
 #, no-wrap, priority:280
 msgid "-3 --theirs"
 msgstr ""
@@ -19474,7 +19487,7 @@ msgid "The id of a tree object."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff-tree.txt:32 en/git-diff.txt:114 en/git-submodule.txt:437
+#: en/git-diff-tree.txt:32 en/git-diff.txt:125 en/git-submodule.txt:437
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "<path>..."
 msgstr ""
@@ -19600,156 +19613,169 @@ msgid "git-diff - Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:17
+#: en/git-diff.txt:18
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "'git diff' [<options>] [<commit>] [--] [<path>...]\n"
 "'git diff' [<options>] --cached [<commit>] [--] [<path>...]\n"
-"'git diff' [<options>] <commit> <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]\n"
+"'git diff' [<options>] <commit>...<commit> [--] [<path>...]\n"
 "'git diff' [<options>] <blob> <blob>\n"
 "'git diff' [<options>] --no-index [--] <path> <path>\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:23
+#: en/git-diff.txt:25
 #, priority:280
-msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between two blob objects, or changes between two files on disk."
+msgid "Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes resulting from a merge, changes between two blob objects, or changes between two files on disk."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:24
+#: en/git-diff.txt:26
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:31
+#: en/git-diff.txt:33
 #, priority:280
 msgid "This form is to view the changes you made relative to the index (staging area for the next commit).  In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't.  You can stage these changes by using linkgit:git-add[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:32
+#: en/git-diff.txt:34
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] --no-index [--] <path> <path>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:40
+#: en/git-diff.txt:42
 #, priority:280
 msgid "This form is to compare the given two paths on the filesystem.  You can omit the `--no-index` option when running the command in a working tree controlled by Git and at least one of the paths points outside the working tree, or when running the command outside a working tree controlled by Git. This form implies `--exit-code`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:41
+#: en/git-diff.txt:43
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:50
+#: en/git-diff.txt:52
 #, priority:280
 msgid "This form is to view the changes you staged for the next commit relative to the named <commit>.  Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD.  If HEAD does not exist (e.g. unborn branches) and <commit> is not given, it shows all staged changes.  --staged is a synonym of --cached."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:51
+#: en/git-diff.txt:53
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:58
+#: en/git-diff.txt:60
 #, priority:280
 msgid "This form is to view the changes you have in your working tree relative to the named <commit>.  You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:59
+#: en/git-diff.txt:61
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:63
+#: en/git-diff.txt:65
 #, priority:280
 msgid "This is to view the changes between two arbitrary <commit>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:64
+#: en/git-diff.txt:66
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:69
+#: en/git-diff.txt:71
 #, priority:280
 msgid "This is synonymous to the previous form.  If <commit> on one side is omitted, it will have the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:70
+#: en/git-diff.txt:72
+#, ignore-ellipsis, no-wrap, priority:280
+msgid "'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-diff.txt:80
+#, priority:280
+msgid "This form is to view the results of a merge commit.  The first listed <commit> must be the merge itself; the remaining two or more commits should be its parents.  A convenient way to produce the desired set of revisions is to use the {caret}@ suffix.  For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-diff.txt:81
 #, ignore-ellipsis, no-wrap, priority:280
 msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:77
+#: en/git-diff.txt:88
 #, ignore-ellipsis, priority:280
 msgid "This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>.  \"git diff A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\".  You can omit any one of <commit>, which has the same effect as using HEAD instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:82
+#: en/git-diff.txt:93
 #, priority:280
 msgid "Just in case you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use \"..\" notations, can be any <tree>."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:89
+#: en/git-diff.txt:100
 #, ignore-ellipsis, priority:280
 msgid "For a more complete list of ways to spell <commit>, see \"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is about comparing two _endpoints_, not ranges, and the range notations (\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:90
+#: en/git-diff.txt:101
 #, no-wrap, priority:280
 msgid "'git diff' [<options>] <blob> <blob>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:94
+#: en/git-diff.txt:105
 #, priority:280
 msgid "This form is to view the differences between the raw contents of two blob objects."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:108
+#: en/git-diff.txt:119
 #, priority:280
 msgid "Compare the working tree with the \"base\" version (stage #1), \"our branch\" (stage #2) or \"their branch\" (stage #3).  The index contains these stages only for unmerged entries i.e.  while resolving conflicts.  See linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:113
+#: en/git-diff.txt:124
 #, priority:280
 msgid "Omit diff output for unmerged entries and just show \"Unmerged\".  Can be used only when comparing the working tree with the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:118
+#: en/git-diff.txt:129
 #, priority:280
 msgid "The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:125
+#: en/git-diff.txt:136
 #, no-wrap, priority:280
 msgid "Various ways to check your working tree"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:131
+#: en/git-diff.txt:142
 #, no-wrap, priority:280
 msgid ""
 "$ git diff            <1>\n"
@@ -19758,31 +19784,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:134
+#: en/git-diff.txt:145
 #, priority:280
 msgid "Changes in the working tree not yet staged for the next commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:136
+#: en/git-diff.txt:147
 #, priority:280
 msgid "Changes between the index and your last commit; what you would be committing if you run \"git commit\" without \"-a\" option."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:138
+#: en/git-diff.txt:149
 #, priority:280
 msgid "Changes in the working tree since your last commit; what you would be committing if you run \"git commit -a\""
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:139
+#: en/git-diff.txt:150
 #, no-wrap, priority:280
 msgid "Comparing with arbitrary commits"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:145
+#: en/git-diff.txt:156
 #, no-wrap, priority:280
 msgid ""
 "$ git diff test            <1>\n"
@@ -19791,31 +19817,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:149
+#: en/git-diff.txt:160
 #, priority:280
 msgid "Instead of using the tip of the current branch, compare with the tip of \"test\" branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:152
+#: en/git-diff.txt:163
 #, priority:280
 msgid "Instead of comparing with the tip of \"test\" branch, compare with the tip of the current branch, but limit the comparison to the file \"test\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:153
+#: en/git-diff.txt:164
 #, priority:280
 msgid "Compare the version before the last commit and the last commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:154
+#: en/git-diff.txt:165
 #, no-wrap, priority:280
 msgid "Comparing branches"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:160
+#: en/git-diff.txt:171
 #, ignore-ellipsis, no-wrap, priority:280
 msgid ""
 "$ git diff topic master    <1>\n"
@@ -19824,31 +19850,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:163
+#: en/git-diff.txt:174
 #, priority:280
 msgid "Changes between the tips of the topic and the master branches."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:164 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
+#: en/git-diff.txt:175 en/git-remote-fd.txt:44 en/git-remote-fd.txt:52 en/git-web--browse.txt:52
 #, priority:280
 msgid "Same as above."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:166
+#: en/git-diff.txt:177
 #, priority:280
 msgid "Changes that occurred on the master branch since when the topic branch was started off it."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:167
+#: en/git-diff.txt:178
 #, no-wrap, priority:280
 msgid "Limiting the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:173
+#: en/git-diff.txt:184
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --diff-filter=MRC            <1>\n"
@@ -19857,31 +19883,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:177
+#: en/git-diff.txt:188
 #, priority:280
 msgid "Show only modification, rename, and copy, but not addition or deletion."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:179
+#: en/git-diff.txt:190
 #, priority:280
 msgid "Show only names and the nature of change, but not actual diff output."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:180
+#: en/git-diff.txt:191
 #, priority:280
 msgid "Limit diff output to named subtrees."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-diff.txt:181
+#: en/git-diff.txt:192
 #, no-wrap, priority:280
 msgid "Munging the diff output"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-diff.txt:186
+#: en/git-diff.txt:197
 #, no-wrap, priority:280
 msgid ""
 "$ git diff --find-copies-harder -B -C  <1>\n"
@@ -19889,22 +19915,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:190
+#: en/git-diff.txt:201
 #, priority:280
 msgid "Spend extra cycles to find renames, copies and complete rewrites (very expensive)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:191
+#: en/git-diff.txt:202
 #, priority:280
 msgid "Output diff in reverse."
 msgstr ""
 
 #. type: Plain text
-#: en/git-diff.txt:200
-#, priority:280
-msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
-msgstr ""
+#: en/git-diff.txt:212
+#, fuzzy, priority:280
+#| msgid "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
+msgid "diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1], linkgit:git-show[1]"
+msgstr "linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
 
 #. type: Title =
 #: en/git-fast-export.txt:2
@@ -20100,78 +20127,90 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-fast-export.txt:122
+#, no-wrap, priority:100
+msgid "--anonymize-map=<from>[:<to>]"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:126
+#, priority:100
+msgid "Convert token `<from>` to `<to>` in the anonymized output. If `<to>` is omitted, map `<from>` to itself (i.e., do not anonymize it). See the section on `ANONYMIZING` below."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-export.txt:127
 #, ignore-same, no-wrap, priority:100
 msgid "--reference-excluded-parents"
 msgstr "--reference-excluded-parents"
 
 #. type: Plain text
-#: en/git-fast-export.txt:133
+#: en/git-fast-export.txt:138
 #, priority:100
 msgid "By default, running a command such as `git fast-export master~5..master` will not include the commit master{tilde}5 and will make master{tilde}4 no longer have master{tilde}5 as a parent (though both the old master{tilde}4 and new master{tilde}4 will have all the same files).  Use --reference-excluded-parents to instead have the stream refer to commits in the excluded range of history by their sha1sum.  Note that the resulting stream can only be used by a repository which already contains the necessary parent commits."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:134
+#: en/git-fast-export.txt:139
 #, ignore-same, no-wrap, priority:100
 msgid "--show-original-ids"
 msgstr "--show-original-ids"
 
 #. type: Plain text
-#: en/git-fast-export.txt:140
+#: en/git-fast-export.txt:145
 #, priority:100
 msgid "Add an extra directive to the output for commits and blobs, `original-oid <SHA1SUM>`.  While such directives will likely be ignored by importers such as git-fast-import, it may be useful for intermediary filters (e.g. for rewriting commit messages which refer to older commits, or for stripping blobs by id)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:141
+#: en/git-fast-export.txt:146
 #, no-wrap, priority:100
 msgid "--reencode=(yes|no|abort)"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:147
+#: en/git-fast-export.txt:152
 #, priority:100
 msgid "Specify how to handle `encoding` header in commit objects.  When asking to 'abort' (which is the default), this program will die when encountering such a commit object.  With 'yes', the commit message will be re-encoded into UTF-8.  With 'no', the original encoding will be preserved."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:148
+#: en/git-fast-export.txt:153
 #, ignore-same, no-wrap, priority:100
 msgid "--refspec"
 msgstr "--refspec"
 
 #. type: Plain text
-#: en/git-fast-export.txt:151
+#: en/git-fast-export.txt:156
 #, priority:100
 msgid "Apply the specified refspec to each ref exported. Multiple of them can be specified."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-export.txt:152
+#: en/git-fast-export.txt:157
 #, ignore-ellipsis, no-wrap, priority:100
 msgid "[<git-rev-list-args>...]"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:160
+#: en/git-fast-export.txt:165
 #, priority:100
 msgid "A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that specifies the specific objects and references to export.  For example, `master~10..master` causes the current master reference to be exported along with all objects added since its 10th ancestor commit and (unless the --reference-excluded-parents option is specified) all files common to master{tilde}9 and master{tilde}10."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:166
+#: en/git-fast-export.txt:171
 #, no-wrap, priority:100
 msgid "$ git fast-export --all | (cd /empty/repository && git fast-import)\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:171
+#: en/git-fast-export.txt:176
 #, priority:100
 msgid "This will export the whole repository and import it into the existing empty repository.  Except for reencoding commits that are not in UTF-8, it would be a one-to-one mirror."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:176
+#: en/git-fast-export.txt:181
 #, no-wrap, priority:100
 msgid ""
 "$ git fast-export master~5..master |\n"
@@ -20180,55 +20219,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:180
+#: en/git-fast-export.txt:185
 #, priority:100
 msgid "This makes a new branch called 'other' from 'master~5..master' (i.e. if 'master' has linear history, it will take the last 5 commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:184
+#: en/git-fast-export.txt:189
 #, priority:100
 msgid "Note that this assumes that none of the blobs and commit messages referenced by that revision range contains the string 'refs/heads/master'."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-export.txt:187
+#: en/git-fast-export.txt:192
 #, no-wrap, priority:100
 msgid "ANONYMIZING"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:195
+#: en/git-fast-export.txt:200
 #, priority:100
 msgid "If the `--anonymize` option is given, git will attempt to remove all identifying information from the repository while still retaining enough of the original tree and history patterns to reproduce some bugs. The goal is that a git bug which is found on a private repository will persist in the anonymized repository, and the latter can be shared with git developers to help solve the bug."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:207
+#: en/git-fast-export.txt:212
 #, priority:100
 msgid "With this option, git will replace all refnames, paths, blob contents, commit and tag messages, names, and email addresses in the output with anonymized data.  Two instances of the same string will be replaced equivalently (e.g., two commits with the same author will have the same anonymized author in the output, but bear no resemblance to the original author string). The relationship between commits, branches, and tags is retained, as well as the commit timestamps (but the commit messages and refnames bear no resemblance to the originals). The relative makeup of the tree is retained (e.g., if you have a root tree with 10 files and 3 trees, so will the output), but their names and the contents of the files will be replaced."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:210
+#: en/git-fast-export.txt:215
 #, priority:100
 msgid "If you think you have found a git bug, you can start by exporting an anonymized stream of the whole repository:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:213
+#: en/git-fast-export.txt:218
 #, no-wrap, priority:100
 msgid "$ git fast-export --anonymize --all >anon-stream\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:218
+#: en/git-fast-export.txt:223
 #, priority:100
 msgid "Then confirm that the bug persists in a repository created from that stream (many bugs will not, as they really do depend on the exact repository contents):"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:224
+#: en/git-fast-export.txt:229
 #, ignore-ellipsis, no-wrap, priority:100
 msgid ""
 "$ git init anon-repo\n"
@@ -20238,25 +20277,59 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:231
+#: en/git-fast-export.txt:236
 #, priority:100
 msgid "If the anonymized repository shows the bug, it may be worth sharing `anon-stream` along with a regular bug report. Note that the anonymized stream compresses very well, so gzipping it is encouraged. If you want to examine the stream to see that it does not contain any private data, you can peruse it directly before sending. You may also want to try:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-export.txt:234
+#: en/git-fast-export.txt:239
 #, no-wrap, priority:100
 msgid "$ perl -pe 's/\\d+/X/g' <anon-stream | sort -u | less\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:240
+#: en/git-fast-export.txt:245
 #, priority:100
 msgid "which shows all of the unique lines (with numbers converted to \"X\", to collapse \"User 0\", \"User 1\", etc into \"User X\"). This produces a much smaller output, and it is usually easy to quickly confirm that there is no private data in the stream."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-export.txt:248
+#: en/git-fast-export.txt:251
+#, priority:100
+msgid "Reproducing some bugs may require referencing particular commits or paths, which becomes challenging after refnames and paths have been anonymized. You can ask for a particular token to be left as-is or mapped to a new value. For example, if you have a bug which reproduces with `git rev-list sensitive -- secret.c`, you can run:"
+msgstr ""
+
+#. type: delimited block -
+#: en/git-fast-export.txt:257
+#, no-wrap, priority:100
+msgid ""
+"$ git fast-export --anonymize --all \\\n"
+"      --anonymize-map=sensitive:foo \\\n"
+"      --anonymize-map=secret.c:bar.c \\\n"
+"      >stream\n"
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:261
+#, priority:100
+msgid "After importing the stream, you can then run `git rev-list foo -- bar.c` in the anonymized repository."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:266
+#, priority:100
+msgid "Note that paths and refnames are split into tokens at slash boundaries.  The command above would anonymize `subdir/secret.c` as something like `path123/bar.c`; you could then search for `bar.c` in the anonymized repository to determine the final pathname."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:270
+#, priority:100
+msgid "To make referencing the final pathname simpler, you can map each path component; so if you also anonymize `subdir` to `publicdir`, then the final pathname would be `publicdir/bar.c`."
+msgstr ""
+
+#. type: Plain text
+#: en/git-fast-export.txt:277
 #, priority:100
 msgid "Since 'git fast-import' cannot tag trees, you will not be able to export the linux.git repository completely, as it contains a tag referencing a tree instead of a commit."
 msgstr ""
@@ -20694,259 +20767,271 @@ msgid "If the local offset is not available in the source material, use ``+0000'
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:297
+#: en/git-fast-import.txt:298
 #, priority:100
-msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value."
+msgid "Unlike the `rfc2822` format, this format is very strict.  Any variation in formatting will cause fast-import to reject the value, and some sanity checks on the numeric values may also be performed."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:298
+#: en/git-fast-import.txt:299
+#, ignore-same, no-wrap, priority:100
+msgid "`raw-permissive`"
+msgstr "`raw-permissive`"
+
+#. type: Plain text
+#: en/git-fast-import.txt:304
+#, priority:100
+msgid "This is the same as `raw` except that no sanity checks on the numeric epoch and local offset are performed.  This can be useful when trying to filter or import an existing history with e.g. bogus timezone values."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-fast-import.txt:305
 #, no-wrap, priority:100
 msgid "`rfc2822`"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:300
+#: en/git-fast-import.txt:307
 #, priority:100
 msgid "This is the standard email format as described by RFC 2822."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:305
+#: en/git-fast-import.txt:312
 #, priority:100
 msgid "An example value is ``Tue Feb 6 11:22:18 2007 -0500''.  The Git parser is accurate, but a little on the lenient side.  It is the same parser used by 'git am' when applying patches received from email."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:311
+#: en/git-fast-import.txt:318
 #, priority:100
 msgid "Some malformed strings may be accepted as valid dates.  In some of these cases Git will still be able to obtain the correct date from the malformed string.  There are also some types of malformed strings which Git will parse wrong, and yet consider valid.  Seriously malformed strings will be rejected."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:316
+#: en/git-fast-import.txt:323
 #, priority:100
 msgid "Unlike the `raw` format above, the time zone/UTC offset information contained in an RFC 2822 date string is used to adjust the date value to UTC prior to storage.  Therefore it is important that this information be as accurate as possible."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:321
+#: en/git-fast-import.txt:328
 #, priority:100
 msgid "If the source material uses RFC 2822 style dates, the frontend should let fast-import handle the parsing and conversion (rather than attempting to do it itself) as the Git parser has been well tested in the wild."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:326
+#: en/git-fast-import.txt:333
 #, priority:100
 msgid "Frontends should prefer the `raw` format if the source material already uses UNIX-epoch format, can be coaxed to give dates in that format, or its format is easily convertible to it, as there is no ambiguity in parsing."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:327
+#: en/git-fast-import.txt:334
 #, ignore-same, no-wrap, priority:100
 msgid "`now`"
 msgstr "`now`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:330
+#: en/git-fast-import.txt:337
 #, priority:100
 msgid "Always use the current time and time zone.  The literal `now` must always be supplied for `<when>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:335
+#: en/git-fast-import.txt:342
 #, priority:100
 msgid "This is a toy format.  The current time and time zone of this system is always copied into the identity string at the time it is being created by fast-import.  There is no way to specify a different time or time zone."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:340
+#: en/git-fast-import.txt:347
 #, priority:100
 msgid "This particular format is supplied as it's short to implement and may be useful to a process that wants to create a new commit right now, without needing to use a working directory or 'git update-index'."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:347
+#: en/git-fast-import.txt:354
 #, priority:100
 msgid "If separate `author` and `committer` commands are used in a `commit` the timestamps may not match, as the system clock will be polled twice (once for each command).  The only way to ensure that both author and committer identity information has the same timestamp is to omit `author` (thus copying from `committer`) or to use a date format other than `now`."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:349
+#: en/git-fast-import.txt:356
 #, no-wrap, priority:100
 msgid "Commands"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:353
+#: en/git-fast-import.txt:360
 #, priority:100
 msgid "fast-import accepts several commands to update the current repository and control the current import process.  More detailed discussion (with examples) of each command follows later."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:354 en/git-fast-import.txt:423
+#: en/git-fast-import.txt:361 en/git-fast-import.txt:430
 #, ignore-same, no-wrap, priority:100
 msgid "`commit`"
 msgstr "`commit`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:358
+#: en/git-fast-import.txt:365
 #, priority:100
 msgid "Creates a new branch or updates an existing branch by creating a new commit and updating the branch to point at the newly created commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:359 en/git-fast-import.txt:813
+#: en/git-fast-import.txt:366 en/git-fast-import.txt:820
 #, ignore-same, no-wrap, priority:100
 msgid "`tag`"
 msgstr "`tag`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:364
+#: en/git-fast-import.txt:371
 #, priority:100
 msgid "Creates an annotated tag object from an existing commit or branch.  Lightweight tags are not supported by this command, as they are not recommended for recording meaningful points in time."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:365 en/git-fast-import.txt:858
+#: en/git-fast-import.txt:372 en/git-fast-import.txt:865
 #, ignore-same, no-wrap, priority:100
 msgid "`reset`"
 msgstr "`reset`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:369
+#: en/git-fast-import.txt:376
 #, priority:100
 msgid "Reset an existing branch (or a new branch) to a specific revision.  This command must be used to change a branch to a specific revision without making a commit on it."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:370 en/git-fast-import.txt:887
+#: en/git-fast-import.txt:377 en/git-fast-import.txt:894
 #, ignore-same, no-wrap, priority:100
 msgid "`blob`"
 msgstr "`blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:374
+#: en/git-fast-import.txt:381
 #, priority:100
 msgid "Convert raw file data into a blob, for future use in a `commit` command.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:375 en/git-fast-import.txt:960
+#: en/git-fast-import.txt:382 en/git-fast-import.txt:967
 #, ignore-same, no-wrap, priority:100
 msgid "`alias`"
 msgstr "`alias`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:381
+#: en/git-fast-import.txt:388
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object.  Using --import-marks and referring to missing marks will cause fast-import to fail, so aliases can provide a way to set otherwise pruned commits to a valid value (e.g. the nearest non-pruned ancestor)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:382 en/git-fast-import.txt:975
+#: en/git-fast-import.txt:389 en/git-fast-import.txt:982
 #, ignore-same, no-wrap, priority:100
 msgid "`checkpoint`"
 msgstr "`checkpoint`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:387
+#: en/git-fast-import.txt:394
 #, priority:100
 msgid "Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:388 en/git-fast-import.txt:1003
+#: en/git-fast-import.txt:395 en/git-fast-import.txt:1010
 #, ignore-same, no-wrap, priority:100
 msgid "`progress`"
 msgstr "`progress`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:392
+#: en/git-fast-import.txt:399
 #, priority:100
 msgid "Causes fast-import to echo the entire line to its own standard output.  This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:393 en/git-fast-import.txt:1210
+#: en/git-fast-import.txt:400 en/git-fast-import.txt:1217
 #, ignore-same, no-wrap, priority:100
 msgid "`done`"
 msgstr "`done`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:397
+#: en/git-fast-import.txt:404
 #, priority:100
 msgid "Marks the end of the stream. This command is optional unless the `done` feature was requested using the `--done` command-line option or `feature done` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:398 en/git-fast-import.txt:1028
+#: en/git-fast-import.txt:405 en/git-fast-import.txt:1035
 #, ignore-same, no-wrap, priority:100
 msgid "`get-mark`"
 msgstr "`get-mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:402
+#: en/git-fast-import.txt:409
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to the file descriptor set with `--cat-blob-fd`, or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:403 en/git-fast-import.txt:1043
+#: en/git-fast-import.txt:410 en/git-fast-import.txt:1050
 #, ignore-same, no-wrap, priority:100
 msgid "`cat-blob`"
 msgstr "`cat-blob`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:407
+#: en/git-fast-import.txt:414
 #, priority:100
 msgid "Causes fast-import to print a blob in 'cat-file --batch' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:408 en/git-fast-import.txt:1074
+#: en/git-fast-import.txt:415 en/git-fast-import.txt:1081
 #, ignore-same, no-wrap, priority:100
 msgid "`ls`"
 msgstr "`ls`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:412
+#: en/git-fast-import.txt:419
 #, priority:100
 msgid "Causes fast-import to print a line describing a directory entry in 'ls-tree' format to the file descriptor set with `--cat-blob-fd` or `stdout` if unspecified."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:413 en/git-fast-import.txt:1127
+#: en/git-fast-import.txt:420 en/git-fast-import.txt:1134
 #, ignore-same, no-wrap, priority:100
 msgid "`feature`"
 msgstr "`feature`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:416
+#: en/git-fast-import.txt:423
 #, priority:100
 msgid "Enable the specified feature. This requires that fast-import supports the specified feature, and aborts if it does not."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:417 en/git-fast-import.txt:1182
+#: en/git-fast-import.txt:424 en/git-fast-import.txt:1189
 #, ignore-same, no-wrap, priority:100
 msgid "`option`"
 msgstr "`option`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:421
+#: en/git-fast-import.txt:428
 #, priority:100
 msgid "Specify any of the options listed under OPTIONS that do not change stream semantic to suit the frontend's needs. This command is optional and is not needed to perform an import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:426
+#: en/git-fast-import.txt:433
 #, priority:100
 msgid "Create or update a branch with a new commit, recording one logical change to the project."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:439
+#: en/git-fast-import.txt:446
 #, no-wrap, priority:100
 msgid ""
 "\t'commit' SP <ref> LF\n"
@@ -20963,241 +21048,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:447
+#: en/git-fast-import.txt:454
 #, priority:100
 msgid "where `<ref>` is the name of the branch to make the commit on.  Typically branch names are prefixed with `refs/heads/` in Git, so importing the CVS branch symbol `RELENG-1_0` would use `refs/heads/RELENG-1_0` for the value of `<ref>`.  The value of `<ref>` must be a valid refname in Git.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:453
+#: en/git-fast-import.txt:460
 #, priority:100
 msgid "A `mark` command may optionally appear, requesting fast-import to save a reference to the newly created commit for future use by the frontend (see below for format).  It is very common for frontends to mark every commit they create, thereby allowing future branch creation from any imported commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:459
+#: en/git-fast-import.txt:466
 #, priority:100
 msgid "The `data` command following `committer` must supply the commit message (see below for `data` command syntax).  To import an empty commit message use a 0 length data.  Commit messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:467
+#: en/git-fast-import.txt:474
 #, priority:100
 msgid "Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` and `notemodify` commands may be included to update the contents of the branch prior to creating the commit.  These commands may be supplied in any order.  However it is recommended that a `filedeleteall` command precede all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in the same commit, as `filedeleteall` wipes the branch clean (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:474
+#: en/git-fast-import.txt:481
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required).  Note that for reasons of backward compatibility, if the commit ends with a `data` command (i.e. it has no `from`, `merge`, `filemodify`, `filedelete`, `filecopy`, `filerename`, `filedeleteall` or `notemodify` commands) then two `LF` commands may appear at the end of the command instead of just one."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:476
+#: en/git-fast-import.txt:483
 #, ignore-same, no-wrap, priority:100
 msgid "`author`"
 msgstr "`author`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:482
+#: en/git-fast-import.txt:489
 #, priority:100
 msgid "An `author` command may optionally appear, if the author information might differ from the committer information.  If `author` is omitted then fast-import will automatically use the committer's information for the author portion of the commit.  See below for a description of the fields in `author`, as they are identical to `committer`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:484
+#: en/git-fast-import.txt:491
 #, ignore-same, no-wrap, priority:100
 msgid "`committer`"
 msgstr "`committer`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:487
+#: en/git-fast-import.txt:494
 #, priority:100
 msgid "The `committer` command indicates who made this commit, and when they made it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:495
+#: en/git-fast-import.txt:502
 #, priority:100
 msgid "Here `<name>` is the person's display name (for example ``Com M Itter'') and `<email>` is the person's email address (``\\cm@example.com'').  `LT` and `GT` are the literal less-than (\\x3c)  and greater-than (\\x3e) symbols.  These are required to delimit the email address from the other fields in the line.  Note that `<name>` and `<email>` are free-form and may contain any sequence of bytes, except `LT`, `GT` and `LF`.  `<name>` is typically UTF-8 encoded."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:500
+#: en/git-fast-import.txt:507
 #, priority:100
 msgid "The time of the change is specified by `<when>` using the date format that was selected by the --date-format=<fmt> command-line option.  See ``Date Formats'' above for the set of supported formats, and their syntax."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:502
+#: en/git-fast-import.txt:509
 #, ignore-same, no-wrap, priority:100
 msgid "`encoding`"
 msgstr "`encoding`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:506
+#: en/git-fast-import.txt:513
 #, priority:100
 msgid "The optional `encoding` command indicates the encoding of the commit message.  Most commits are UTF-8 and the encoding is omitted, but this allows importing commit messages into git without first reencoding them."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:508
+#: en/git-fast-import.txt:515
 #, ignore-same, no-wrap, priority:100
 msgid "`from`"
 msgstr "`from`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:514
+#: en/git-fast-import.txt:521
 #, priority:100
 msgid "The `from` command is used to specify the commit to initialize this branch from.  This revision will be the first ancestor of the new commit.  The state of the tree built at this commit will begin with the state at the `from` commit, and be altered by the content modifications in this commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:524
+#: en/git-fast-import.txt:531
 #, priority:100
 msgid "Omitting the `from` command in the first commit of a new branch will cause fast-import to create that commit with no ancestor. This tends to be desired only for the initial commit of a project.  If the frontend creates all files from scratch when making a new branch, a `merge` command may be used instead of `from` to start the commit with an empty tree.  Omitting the `from` command on existing branches is usually desired, as the current commit on that branch is automatically assumed to be the first ancestor of the new commit."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:527
+#: en/git-fast-import.txt:534
 #, priority:100
 msgid "As `LF` is not valid in a Git refname or SHA-1 expression, no quoting or escaping syntax is supported within `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:529
+#: en/git-fast-import.txt:536
 #, priority:100
 msgid "Here `<commit-ish>` is any of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:533
+#: en/git-fast-import.txt:540
 #, priority:100
 msgid "The name of an existing branch already in fast-import's internal branch table.  If fast-import doesn't know the name, it's treated as a SHA-1 expression."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:535
+#: en/git-fast-import.txt:542
 #, priority:100
 msgid "A mark reference, `:<idnum>`, where `<idnum>` is the mark number."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:541
+#: en/git-fast-import.txt:548
 #, priority:100
 msgid "The reason fast-import uses `:` to denote a mark reference is this character is not legal in a Git branch name.  The leading `:` makes it easy to distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of base-10 digits."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:543
+#: en/git-fast-import.txt:550
 #, priority:100
 msgid "Marks must be declared (via `mark`) before they can be used."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:545
+#: en/git-fast-import.txt:552
 #, priority:100
 msgid "A complete 40 byte or abbreviated commit SHA-1 in hex."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:548
+#: en/git-fast-import.txt:555
 #, priority:100
 msgid "Any valid Git SHA-1 expression that resolves to a commit.  See ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:551
+#: en/git-fast-import.txt:558
 #, priority:100
 msgid "The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:554
+#: en/git-fast-import.txt:561
 #, priority:100
 msgid "The special case of restarting an incremental import from the current branch value should be written as:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-fast-import.txt:556
+#: en/git-fast-import.txt:563
 #, no-wrap, priority:100
 msgid "\tfrom refs/heads/branch^0\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:563
+#: en/git-fast-import.txt:570
 #, priority:100
 msgid "The `^0` suffix is necessary as fast-import does not permit a branch to start from itself, and the branch is created in memory before the `from` command is even read from the input.  Adding `^0` will force fast-import to resolve the commit through Git's revision parsing library, rather than its internal branch table, thereby loading in the existing value of the branch."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:565
+#: en/git-fast-import.txt:572
 #, ignore-same, no-wrap, priority:100
 msgid "`merge`"
 msgstr "`merge`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:573
+#: en/git-fast-import.txt:580
 #, priority:100
 msgid "Includes one additional ancestor commit.  The additional ancestry link does not change the way the tree state is built at this commit.  If the `from` command is omitted when creating a new branch, the first `merge` commit will be the first ancestor of the current commit, and the branch will start out with no files.  An unlimited number of `merge` commands per commit are permitted by fast-import, thereby establishing an n-way merge."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:576
+#: en/git-fast-import.txt:583
 #, priority:100
 msgid "Here `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:578
+#: en/git-fast-import.txt:585
 #, ignore-same, no-wrap, priority:100
 msgid "`filemodify`"
 msgstr "`filemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:582
+#: en/git-fast-import.txt:589
 #, priority:100
 msgid "Included in a `commit` command to add a new file or change the content of an existing file.  This command has two different means of specifying the content of the file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:583 en/git-fast-import.txt:750
+#: en/git-fast-import.txt:590 en/git-fast-import.txt:757
 #, no-wrap, priority:100
 msgid "External data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:586
+#: en/git-fast-import.txt:593
 #, priority:100
 msgid "The data content for the file was already supplied by a prior `blob` command.  The frontend just needs to connect it."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:589
+#: en/git-fast-import.txt:596
 #, no-wrap, priority:100
 msgid "\t'M' SP <mode> SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:596
+#: en/git-fast-import.txt:603
 #, priority:100
 msgid "Here usually `<dataref>` must be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object.  If `<mode>` is `040000`` then `<dataref>` must be the full 40-byte SHA-1 of an existing Git tree object or a mark reference set with `--import-marks`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:597 en/git-fast-import.txt:763
+#: en/git-fast-import.txt:604 en/git-fast-import.txt:770
 #, no-wrap, priority:100
 msgid "Inline data format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:601
+#: en/git-fast-import.txt:608
 #, priority:100
 msgid "The data content for the file has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:605
+#: en/git-fast-import.txt:612
 #, no-wrap, priority:100
 msgid ""
 "\t'M' SP <mode> SP 'inline' SP <path> LF\n"
@@ -21205,259 +21290,259 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:608 en/git-fast-import.txt:774
+#: en/git-fast-import.txt:615 en/git-fast-import.txt:781
 #, priority:100
 msgid "See below for a detailed description of the `data` command."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:611
+#: en/git-fast-import.txt:618
 #, priority:100
 msgid "In both formats `<mode>` is the type of file entry, specified in octal.  Git only supports the following modes:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:615
+#: en/git-fast-import.txt:622
 #, priority:100
 msgid "`100644` or `644`: A normal (not-executable) file.  The majority of files in most projects use this mode.  If in doubt, this is what you want."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:616
+#: en/git-fast-import.txt:623
 #, priority:100
 msgid "`100755` or `755`: A normal, but executable, file."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:617
+#: en/git-fast-import.txt:624
 #, priority:100
 msgid "`120000`: A symlink, the content of the file will be the link target."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:620
+#: en/git-fast-import.txt:627
 #, priority:100
 msgid "`160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:622
+#: en/git-fast-import.txt:629
 #, priority:100
 msgid "`040000`: A subdirectory.  Subdirectories can only be specified by SHA or through a tree mark set with `--import-marks`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:625
+#: en/git-fast-import.txt:632
 #, priority:100
 msgid "In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:629
+#: en/git-fast-import.txt:636
 #, priority:100
 msgid "A `<path>` string must use UNIX-style directory separators (forward slash `/`), may contain any byte other than `LF`, and must not start with double quote (`\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:636
+#: en/git-fast-import.txt:643
 #, priority:100
 msgid "A path can use C-style string quoting; this is accepted in all cases and mandatory if the filename starts with double quote or contains `LF`. In C-style quoting, the complete name should be surrounded with double quotes, and any `LF`, backslash, or double quote characters must be escaped by preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it\"`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:638
+#: en/git-fast-import.txt:645
 #, priority:100
 msgid "The value of `<path>` must be in canonical form. That is it must not:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:640
+#: en/git-fast-import.txt:647
 #, priority:100
 msgid "contain an empty directory component (e.g. `foo//bar` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:641
+#: en/git-fast-import.txt:648
 #, priority:100
 msgid "end with a directory separator (e.g. `foo/` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:642
+#: en/git-fast-import.txt:649
 #, priority:100
 msgid "start with a directory separator (e.g. `/foo` is invalid),"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:644
+#: en/git-fast-import.txt:651
 #, priority:100
 msgid "contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:646
+#: en/git-fast-import.txt:653
 #, priority:100
 msgid "The root of the tree can be represented by an empty string as `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:648
+#: en/git-fast-import.txt:655
 #, priority:100
 msgid "It is recommended that `<path>` always be encoded using UTF-8."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:650
+#: en/git-fast-import.txt:657
 #, ignore-same, no-wrap, priority:100
 msgid "`filedelete`"
 msgstr "`filedelete`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:656
+#: en/git-fast-import.txt:663
 #, priority:100
 msgid "Included in a `commit` command to remove a file or recursively delete an entire directory from the branch.  If the file or directory removal makes its parent directory empty, the parent directory will be automatically removed too.  This cascades up the tree until the first non-empty directory or the root is reached."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:659
+#: en/git-fast-import.txt:666
 #, no-wrap, priority:100
 msgid "\t'D' SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:664
+#: en/git-fast-import.txt:671
 #, priority:100
 msgid "here `<path>` is the complete path of the file or subdirectory to be removed from the branch.  See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:666
+#: en/git-fast-import.txt:673
 #, ignore-same, no-wrap, priority:100
 msgid "`filecopy`"
 msgstr "`filecopy`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:671
+#: en/git-fast-import.txt:678
 #, priority:100
 msgid "Recursively copies an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist.  If the destination exists it will be completely replaced by the content copied from the source."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:674
+#: en/git-fast-import.txt:681
 #, no-wrap, priority:100
 msgid "\t'C' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:680 en/git-fast-import.txt:700
+#: en/git-fast-import.txt:687 en/git-fast-import.txt:707
 #, priority:100
 msgid "here the first `<path>` is the source location and the second `<path>` is the destination.  See `filemodify` above for a detailed description of what `<path>` may look like.  To use a source path that contains SP the path must be quoted."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:685
+#: en/git-fast-import.txt:692
 #, priority:100
 msgid "A `filecopy` command takes effect immediately.  Once the source location has been copied to the destination any future commands applied to the source location will not impact the destination of the copy."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:687
+#: en/git-fast-import.txt:694
 #, ignore-same, no-wrap, priority:100
 msgid "`filerename`"
 msgstr "`filerename`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:691
+#: en/git-fast-import.txt:698
 #, priority:100
 msgid "Renames an existing file or subdirectory to a different location within the branch.  The existing file or directory must exist. If the destination exists it will be replaced by the source directory."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:694
+#: en/git-fast-import.txt:701
 #, no-wrap, priority:100
 msgid "\t'R' SP <path> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:705
+#: en/git-fast-import.txt:712
 #, priority:100
 msgid "A `filerename` command takes effect immediately.  Once the source location has been renamed to the destination any future commands applied to the source location will create new files there and not impact the destination of the rename."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:714
+#: en/git-fast-import.txt:721
 #, priority:100
 msgid "Note that a `filerename` is the same as a `filecopy` followed by a `filedelete` of the source location.  There is a slight performance advantage to using `filerename`, but the advantage is so small that it is never worth trying to convert a delete/add pair in source material into a rename for fast-import.  This `filerename` command is provided just to simplify frontends that already have rename information and don't want bother with decomposing it into a `filecopy` followed by a `filedelete`."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:716
+#: en/git-fast-import.txt:723
 #, ignore-same, no-wrap, priority:100
 msgid "`filedeleteall`"
 msgstr "`filedeleteall`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:721
+#: en/git-fast-import.txt:728
 #, priority:100
 msgid "Included in a `commit` command to remove all files (and also all directories) from the branch.  This command resets the internal branch structure to have no files in it, allowing the frontend to subsequently add all interesting files from scratch."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:724
+#: en/git-fast-import.txt:731
 #, no-wrap, priority:100
 msgid "\t'deleteall' LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:730
+#: en/git-fast-import.txt:737
 #, priority:100
 msgid "This command is extremely useful if the frontend does not know (or does not care to know) what files are currently on the branch, and therefore cannot generate the proper `filedelete` commands to update the content."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:738
+#: en/git-fast-import.txt:745
 #, priority:100
 msgid "Issuing a `filedeleteall` followed by the needed `filemodify` commands to set the correct content will produce the same results as sending only the needed `filemodify` and `filedelete` commands.  The `filedeleteall` approach may however require fast-import to use slightly more memory per active branch (less than 1 MiB for even most large projects); so frontends that can easily obtain only the affected paths for a commit are encouraged to do so."
 msgstr ""
 
 #. type: Title ^
-#: en/git-fast-import.txt:740
+#: en/git-fast-import.txt:747
 #, ignore-same, no-wrap, priority:100
 msgid "`notemodify`"
 msgstr "`notemodify`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:749
+#: en/git-fast-import.txt:756
 #, priority:100
 msgid "Included in a `commit` `<notes_ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents.  Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to use any other commands to write to the `<notes_ref>` tree except `filedeleteall` to delete all existing notes in this tree.  This command has two different means of specifying the content of the note."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:754
+#: en/git-fast-import.txt:761
 #, priority:100
 msgid "The data content for the note was already supplied by a prior `blob` command.  The frontend just needs to connect it to the commit that is to be annotated."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:757
+#: en/git-fast-import.txt:764
 #, no-wrap, priority:100
 msgid "\t'N' SP <dataref> SP <commit-ish> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:762
+#: en/git-fast-import.txt:769
 #, priority:100
 msgid "Here `<dataref>` can be either a mark reference (`:<idnum>`)  set by a prior `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:767
+#: en/git-fast-import.txt:774
 #, priority:100
 msgid "The data content for the note has not been supplied yet.  The frontend wants to supply it as part of this modify command."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:771
+#: en/git-fast-import.txt:778
 #, no-wrap, priority:100
 msgid ""
 "\t'N' SP 'inline' SP <commit-ish> LF\n"
@@ -21465,73 +21550,73 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:777
+#: en/git-fast-import.txt:784
 #, priority:100
 msgid "In both formats `<commit-ish>` is any of the commit specification expressions also accepted by `from` (see above)."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:779
+#: en/git-fast-import.txt:786
 #, ignore-same, no-wrap, priority:100
 msgid "`mark`"
 msgstr "`mark`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:785
+#: en/git-fast-import.txt:792
 #, priority:100
 msgid "Arranges for fast-import to save a reference to the current object, allowing the frontend to recall this object at a future point in time, without knowing its SHA-1.  Here the current object is the object creation command the `mark` command appears within.  This can be `commit`, `tag`, and `blob`, but `commit` is the most common usage."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:788
+#: en/git-fast-import.txt:795
 #, no-wrap, priority:100
 msgid "\t'mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:794
+#: en/git-fast-import.txt:801
 #, priority:100
 msgid "where `<idnum>` is the number assigned by the frontend to this mark.  The value of `<idnum>` is expressed as an ASCII decimal integer.  The value 0 is reserved and cannot be used as a mark.  Only values greater than or equal to 1 may be used as marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:798
+#: en/git-fast-import.txt:805
 #, priority:100
 msgid "New marks are created automatically.  Existing marks can be moved to another object simply by reusing the same `<idnum>` in another `mark` command."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:800
+#: en/git-fast-import.txt:807
 #, ignore-same, no-wrap, priority:100
 msgid "`original-oid`"
 msgstr "`original-oid`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:805
+#: en/git-fast-import.txt:812
 #, priority:100
 msgid "Provides the name of the object in the original source control system.  fast-import will simply ignore this directive, but filter processes which operate on and modify the stream before feeding to fast-import may have uses for this information"
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:808
+#: en/git-fast-import.txt:815
 #, no-wrap, priority:100
 msgid "\t'original-oid' SP <object-identifier> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:811
+#: en/git-fast-import.txt:818
 #, priority:100
 msgid "where `<object-identifer>` is any string not containing LF."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:816
+#: en/git-fast-import.txt:823
 #, priority:100
 msgid "Creates an annotated tag referring to a specific commit.  To create lightweight (non-annotated) tags see the `reset` command below."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:824
+#: en/git-fast-import.txt:831
 #, no-wrap, priority:100
 msgid ""
 "\t'tag' SP <name> LF\n"
@@ -21543,55 +21628,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:827
+#: en/git-fast-import.txt:834
 #, priority:100
 msgid "where `<name>` is the name of the tag to create."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:832
+#: en/git-fast-import.txt:839
 #, priority:100
 msgid "Tag names are automatically prefixed with `refs/tags/` when stored in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the corresponding ref as `refs/tags/RELENG-1_0-FINAL`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:836
+#: en/git-fast-import.txt:843
 #, priority:100
 msgid "The value of `<name>` must be a valid refname in Git and therefore may contain forward slashes.  As `LF` is not valid in a Git refname, no quoting or escaping syntax is supported here."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:839
+#: en/git-fast-import.txt:846
 #, priority:100
 msgid "The `from` command is the same as in the `commit` command; see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:842
+#: en/git-fast-import.txt:849
 #, priority:100
 msgid "The `tagger` command uses the same format as `committer` within `commit`; again see above for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:848
+#: en/git-fast-import.txt:855
 #, priority:100
 msgid "The `data` command following `tagger` must supply the annotated tag message (see below for `data` command syntax).  To import an empty tag message use a 0 length data.  Tag messages are free-form and are not interpreted by Git.  Currently they must be encoded in UTF-8, as fast-import does not permit other encodings to be specified."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:856
+#: en/git-fast-import.txt:863
 #, priority:100
 msgid "Signing annotated tags during import from within fast-import is not supported.  Trying to include your own PGP/GPG signature is not recommended, as the frontend does not (easily) have access to the complete set of bytes which normally goes into such a signature.  If signing is required, create lightweight tags from within fast-import with `reset`, then create the annotated versions of those tags offline with the standard 'git tag' process."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:863
+#: en/git-fast-import.txt:870
 #, priority:100
 msgid "Creates (or recreates) the named branch, optionally starting from a specific revision.  The reset command allows a frontend to issue a new `from` command for an existing branch, or to create a new branch from an existing commit without creating a new commit."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:868
+#: en/git-fast-import.txt:875
 #, no-wrap, priority:100
 msgid ""
 "\t'reset' SP <ref> LF\n"
@@ -21600,25 +21685,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:872
+#: en/git-fast-import.txt:879
 #, priority:100
 msgid "For a detailed description of `<ref>` and `<commit-ish>` see above under `commit` and `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:874 en/git-fast-import.txt:1001
+#: en/git-fast-import.txt:881 en/git-fast-import.txt:1008
 #, priority:100
 msgid "The `LF` after the command is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:877
+#: en/git-fast-import.txt:884
 #, priority:100
 msgid "The `reset` command can also be used to create lightweight (non-annotated) tags.  For example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:881
+#: en/git-fast-import.txt:888
 #, no-wrap, priority:100
 msgid ""
 "\treset refs/tags/938\n"
@@ -21626,19 +21711,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:885
+#: en/git-fast-import.txt:892
 #, priority:100
 msgid "would create the lightweight tag `refs/tags/938` referring to whatever commit mark `:938` references."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:892
+#: en/git-fast-import.txt:899
 #, priority:100
 msgid "Requests writing one file revision to the packfile.  The revision is not connected to any commit; this connection must be formed in a subsequent `commit` command by referencing the blob through an assigned mark."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:898
+#: en/git-fast-import.txt:905
 #, no-wrap, priority:100
 msgid ""
 "\t'blob' LF\n"
@@ -21648,43 +21733,43 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:904
+#: en/git-fast-import.txt:911
 #, priority:100
 msgid "The mark command is optional here as some frontends have chosen to generate the Git SHA-1 for the blob on their own, and feed that directly to `commit`.  This is typically more work than it's worth however, as marks are inexpensive to store and easy to use."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:906
+#: en/git-fast-import.txt:913
 #, ignore-same, no-wrap, priority:100
 msgid "`data`"
 msgstr "`data`"
 
 #. type: Plain text
-#: en/git-fast-import.txt:913
+#: en/git-fast-import.txt:920
 #, priority:100
 msgid "Supplies raw data (for use as blob/file content, commit messages, or annotated tag messages) to fast-import.  Data can be supplied using an exact byte count or delimited with a terminating line.  Real frontends intended for production-quality conversions should always use the exact byte count format, as it is more robust and performs better.  The delimited format is intended primarily for testing fast-import."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:918
+#: en/git-fast-import.txt:925
 #, priority:100
 msgid "Comment lines appearing within the `<raw>` part of `data` commands are always taken to be part of the body of the data and are therefore never ignored by fast-import.  This makes it safe to import any file/message content whose lines might start with `#`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:919
+#: en/git-fast-import.txt:926
 #, no-wrap, priority:100
 msgid "Exact byte count format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:921
+#: en/git-fast-import.txt:928
 #, priority:100
 msgid "The frontend must specify the number of bytes of data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:925
+#: en/git-fast-import.txt:932
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP <count> LF\n"
@@ -21692,31 +21777,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:931
+#: en/git-fast-import.txt:938
 #, priority:100
 msgid "where `<count>` is the exact number of bytes appearing within `<raw>`.  The value of `<count>` is expressed as an ASCII decimal integer.  The `LF` on either side of `<raw>` is not included in `<count>` and will not be included in the imported data."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:936
+#: en/git-fast-import.txt:943
 #, priority:100
 msgid "The `LF` after `<raw>` is optional (it used to be required) but recommended.  Always including it makes debugging a fast-import stream easier as the next command always starts in column 0 of the next line, even if `<raw>` did not end with an `LF`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:937
+#: en/git-fast-import.txt:944
 #, no-wrap, priority:100
 msgid "Delimited format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:942
+#: en/git-fast-import.txt:949
 #, priority:100
 msgid "A delimiter string is used to mark the end of the data.  fast-import will compute the length by searching for the delimiter.  This format is primarily useful for testing and is not recommended for real data."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:948
+#: en/git-fast-import.txt:955
 #, no-wrap, priority:100
 msgid ""
 "\t'data' SP '<<' <delim> LF\n"
@@ -21726,25 +21811,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:956
+#: en/git-fast-import.txt:963
 #, priority:100
 msgid "where `<delim>` is the chosen delimiter string.  The string `<delim>` must not appear on a line by itself within `<raw>`, as otherwise fast-import will think the data ends earlier than it really does.  The `LF` immediately trailing `<raw>` is part of `<raw>`.  This is one of the limitations of the delimited format, it is impossible to supply a data chunk which does not have an LF as its last byte."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:958
+#: en/git-fast-import.txt:965
 #, priority:100
 msgid "The `LF` after `<delim> LF` is optional (it used to be required)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:963
+#: en/git-fast-import.txt:970
 #, priority:100
 msgid "Record that a mark refers to a given object without first creating any new object."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:969
+#: en/git-fast-import.txt:976
 #, no-wrap, priority:100
 msgid ""
 "\t'alias' LF\n"
@@ -21754,19 +21839,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:972
+#: en/git-fast-import.txt:979
 #, priority:100
 msgid "For a detailed description of `<commit-ish>` see above under `from`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:978
+#: en/git-fast-import.txt:985
 #, priority:100
 msgid "Forces fast-import to close the current packfile, start a new one, and to save out all current branch refs, tags and marks."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:982
+#: en/git-fast-import.txt:989
 #, no-wrap, priority:100
 msgid ""
 "\t'checkpoint' LF\n"
@@ -21774,31 +21859,31 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:988
+#: en/git-fast-import.txt:995
 #, priority:100
 msgid "Note that fast-import automatically switches packfiles when the current packfile reaches --max-pack-size, or 4 GiB, whichever limit is smaller.  During an automatic packfile switch fast-import does not update the branch refs, tags or marks."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:993
+#: en/git-fast-import.txt:1000
 #, priority:100
 msgid "As a `checkpoint` can require a significant amount of CPU time and disk IO (to compute the overall pack SHA-1 checksum, generate the corresponding index file, and update the refs) it can easily take several minutes for a single `checkpoint` command to complete."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:999
+#: en/git-fast-import.txt:1006
 #, priority:100
 msgid "Frontends may choose to issue checkpoints during extremely large and long running imports, or when they need to allow another Git process access to a branch.  However given that a 30 GiB Subversion repository can be loaded into Git through fast-import in about 3 hours, explicit checkpointing may not be necessary."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1008
+#: en/git-fast-import.txt:1015
 #, priority:100
 msgid "Causes fast-import to print the entire `progress` line unmodified to its standard output channel (file descriptor 1) when the command is processed from the input stream.  The command otherwise has no impact on the current import, or on any of fast-import's internal state."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1012
+#: en/git-fast-import.txt:1019
 #, no-wrap, priority:100
 msgid ""
 "\t'progress' SP <any> LF\n"
@@ -21806,67 +21891,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1018
+#: en/git-fast-import.txt:1025
 #, priority:100
 msgid "The `<any>` part of the command may contain any sequence of bytes that does not contain `LF`.  The `LF` after the command is optional.  Callers may wish to process the output through a tool such as sed to remove the leading part of the line, for example:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1021
+#: en/git-fast-import.txt:1028
 #, no-wrap, priority:100
 msgid "\tfrontend | git fast-import | sed 's/^progress //'\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1026
+#: en/git-fast-import.txt:1033
 #, priority:100
 msgid "Placing a `progress` command immediately after a `checkpoint` will inform the reader when the `checkpoint` has been completed and it can safely access the refs that fast-import updated."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1034
+#: en/git-fast-import.txt:1041
 #, priority:100
 msgid "Causes fast-import to print the SHA-1 corresponding to a mark to stdout or to the file descriptor previously arranged with the `--cat-blob-fd` argument. The command otherwise has no impact on the current import; its purpose is to retrieve SHA-1s that later commits might want to refer to in their commit messages."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1037
+#: en/git-fast-import.txt:1044
 #, no-wrap, priority:100
 msgid "\t'get-mark' SP ':' <idnum> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1041 en/git-fast-import.txt:1072 en/git-fast-import.txt:1125
+#: en/git-fast-import.txt:1048 en/git-fast-import.txt:1079 en/git-fast-import.txt:1132
 #, priority:100
 msgid "See ``Responses To Commands'' below for details about how to read this output safely."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1049
+#: en/git-fast-import.txt:1056
 #, priority:100
 msgid "Causes fast-import to print a blob to a file descriptor previously arranged with the `--cat-blob-fd` argument.  The command otherwise has no impact on the current import; its main purpose is to retrieve blobs that may be in fast-import's memory but not accessible from the target repository."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1052
+#: en/git-fast-import.txt:1059
 #, no-wrap, priority:100
 msgid "\t'cat-blob' SP <dataref> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1057
+#: en/git-fast-import.txt:1064
 #, priority:100
 msgid "The `<dataref>` can be either a mark reference (`:<idnum>`)  set previously or a full 40-byte SHA-1 of a Git blob, preexisting or ready to be written."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1059
+#: en/git-fast-import.txt:1066
 #, priority:100
 msgid "Output uses the same format as `git cat-file --batch`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1063
+#: en/git-fast-import.txt:1070
 #, no-wrap, priority:100
 msgid ""
 "\t<sha1> SP 'blob' SP <size> LF\n"
@@ -21874,283 +21959,283 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1069
+#: en/git-fast-import.txt:1076
 #, priority:100
 msgid "This command can be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit.  For a `filemodify` using an inline directive, it can also appear right before the `data` directive."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1080
+#: en/git-fast-import.txt:1087
 #, priority:100
 msgid "Prints information about the object at a path to a file descriptor previously arranged with the `--cat-blob-fd` argument.  This allows printing a blob from the active commit (with `cat-blob`) or copying a blob or tree from a previous commit for use in the current one (with `filemodify`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1083
+#: en/git-fast-import.txt:1090
 #, priority:100
 msgid "The `ls` command can also be used where a `filemodify` directive can appear, allowing it to be used in the middle of a commit."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1084
+#: en/git-fast-import.txt:1091
 #, no-wrap, priority:100
 msgid "Reading from the active commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1088
+#: en/git-fast-import.txt:1095
 #, priority:100
 msgid "This form can only be used in the middle of a `commit`.  The path names a directory entry within fast-import's active commit.  The path must be quoted in this case."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1091
+#: en/git-fast-import.txt:1098
 #, no-wrap, priority:100
 msgid "\t'ls' SP <path> LF\n"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1093
+#: en/git-fast-import.txt:1100
 #, no-wrap, priority:100
 msgid "Reading from a named tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1099
+#: en/git-fast-import.txt:1106
 #, priority:100
 msgid "The `<dataref>` can be a mark reference (`:<idnum>`) or the full 40-byte SHA-1 of a Git tag, commit, or tree object, preexisting or waiting to be written.  The path is relative to the top level of the tree named by `<dataref>`."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1102
+#: en/git-fast-import.txt:1109
 #, no-wrap, priority:100
 msgid "\t'ls' SP <dataref> SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1105
+#: en/git-fast-import.txt:1112
 #, priority:100
 msgid "See `filemodify` above for a detailed description of `<path>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1107
+#: en/git-fast-import.txt:1114
 #, priority:100
 msgid "Output uses the same format as `git ls-tree <tree> -- <path>`:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1110
+#: en/git-fast-import.txt:1117
 #, no-wrap, priority:100
 msgid "\t<mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1115
+#: en/git-fast-import.txt:1122
 #, priority:100
 msgid "The <dataref> represents the blob, tree, or commit object at <path> and can be used in later 'get-mark', 'cat-blob', 'filemodify', or 'ls' commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1118
+#: en/git-fast-import.txt:1125
 #, priority:100
 msgid "If there is no file or subtree at that path, 'git fast-import' will instead report"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1121
+#: en/git-fast-import.txt:1128
 #, no-wrap, priority:100
 msgid "\tmissing SP <path> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1130
+#: en/git-fast-import.txt:1137
 #, priority:100
 msgid "Require that fast-import supports the specified feature, or abort if it does not."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1133
+#: en/git-fast-import.txt:1140
 #, no-wrap, priority:100
 msgid "\t'feature' SP <feature> ('=' <argument>)? LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1136
+#: en/git-fast-import.txt:1143
 #, priority:100
 msgid "The <feature> part of the command may be any one of the following:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1137 en/git-fast-import.txt:1204
+#: en/git-fast-import.txt:1144 en/git-fast-import.txt:1211
 #, no-wrap, priority:100
 msgid "date-format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1138 en/git-fast-import.txt:1206
+#: en/git-fast-import.txt:1145 en/git-fast-import.txt:1213
 #, no-wrap, priority:100
 msgid "export-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1139
+#: en/git-fast-import.txt:1146
 #, no-wrap, priority:100
 msgid "relative-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1140
+#: en/git-fast-import.txt:1147
 #, no-wrap, priority:100
 msgid "no-relative-marks"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1141 en/git-fast-import.txt:1208
+#: en/git-fast-import.txt:1148 en/git-fast-import.txt:1215
 #, no-wrap, priority:100
 msgid "force"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1145
+#: en/git-fast-import.txt:1152
 #, priority:100
 msgid "Act as though the corresponding command-line option with a leading `--` was passed on the command line (see OPTIONS, above)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1146 en/git-fast-import.txt:1205
+#: en/git-fast-import.txt:1153 en/git-fast-import.txt:1212
 #, no-wrap, priority:100
 msgid "import-marks"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1147
+#: en/git-fast-import.txt:1154
 #, no-wrap, priority:100
 msgid "import-marks-if-exists"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1155
+#: en/git-fast-import.txt:1162
 #, priority:100
 msgid "Like --import-marks except in two respects: first, only one \"feature import-marks\" or \"feature import-marks-if-exists\" command is allowed per stream; second, an --import-marks= or --import-marks-if-exists command-line option overrides any of these \"feature\" commands in the stream; third, \"feature import-marks-if-exists\" like a corresponding command-line option silently skips a nonexistent file."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1156
+#: en/git-fast-import.txt:1163
 #, no-wrap, priority:100
 msgid "get-mark"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1157
+#: en/git-fast-import.txt:1164
 #, no-wrap, priority:100
 msgid "cat-blob"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1158
+#: en/git-fast-import.txt:1165
 #, no-wrap, priority:100
 msgid "ls"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1166
+#: en/git-fast-import.txt:1173
 #, priority:100
 msgid "Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command respectively.  Versions of fast-import not supporting the specified command will exit with a message indicating so.  This lets the import error out early with a clear message, rather than wasting time on the early part of an import before the unsupported command is detected."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1167
+#: en/git-fast-import.txt:1174
 #, no-wrap, priority:100
 msgid "notes"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1172
+#: en/git-fast-import.txt:1179
 #, priority:100
 msgid "Require that the backend support the 'notemodify' (N)  subcommand to the 'commit' command.  Versions of fast-import not supporting notes will exit with a message indicating so."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-fast-import.txt:1173
+#: en/git-fast-import.txt:1180
 #, no-wrap, priority:100
 msgid "done"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1180
+#: en/git-fast-import.txt:1187
 #, priority:100
 msgid "Error out if the stream ends without a 'done' command.  Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go undetected.  This may occur, for example, if an import front end dies in mid-operation without emitting SIGTERM or SIGKILL at its subordinate git fast-import instance."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1187
+#: en/git-fast-import.txt:1194
 #, priority:100
 msgid "Processes the specified option so that git fast-import behaves in a way that suits the frontend's needs.  Note that options specified by the frontend are overridden by any options the user may specify to git fast-import itself."
 msgstr ""
 
 #. type: delimited block .
-#: en/git-fast-import.txt:1190
+#: en/git-fast-import.txt:1197
 #, no-wrap, priority:100
 msgid "    'option' SP <option> LF\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1195
+#: en/git-fast-import.txt:1202
 #, priority:100
 msgid "The `<option>` part of the command may contain any of the options listed in the OPTIONS section that do not change import semantics, without the leading `--` and is treated in the same way."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1199
+#: en/git-fast-import.txt:1206
 #, priority:100
 msgid "Option commands must be the first commands on the input (not counting feature commands), to give an option command after any non-option command is an error."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1202
+#: en/git-fast-import.txt:1209
 #, priority:100
 msgid "The following command-line options change import semantics and may therefore not be passed as option:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1207
+#: en/git-fast-import.txt:1214
 #, priority:100
 msgid "cat-blob-fd"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1213
+#: en/git-fast-import.txt:1220
 #, priority:100
 msgid "If the `done` feature is not in use, treated as if EOF was read.  This can be used to tell fast-import to finish early."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1217
+#: en/git-fast-import.txt:1224
 #, priority:100
 msgid "If the `--done` command-line option or `feature done` command is in use, the `done` command is mandatory and marks the end of the stream."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1219
+#: en/git-fast-import.txt:1226
 #, no-wrap, priority:100
 msgid "RESPONSES TO COMMANDS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1226
+#: en/git-fast-import.txt:1233
 #, priority:100
 msgid "New objects written by fast-import are not available immediately.  Most fast-import commands have no visible effect until the next checkpoint (or completion).  The frontend can send commands to fill fast-import's input pipe without worrying about how quickly they will take effect, which improves performance by simplifying scheduling."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1233
+#: en/git-fast-import.txt:1240
 #, priority:100
 msgid "For some frontends, though, it is useful to be able to read back data from the current repository as it is being updated (for example when the source material describes objects in terms of patches to be applied to previously imported objects).  This can be accomplished by connecting the frontend and fast-import via bidirectional pipes:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1238
+#: en/git-fast-import.txt:1245
 #, no-wrap, priority:100
 msgid ""
 "\tmkfifo fast-import-output\n"
@@ -22159,49 +22244,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1242
+#: en/git-fast-import.txt:1249
 #, priority:100
 msgid "A frontend set up this way can use `progress`, `get-mark`, `ls`, and `cat-blob` commands to read information from the import in progress."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1246
+#: en/git-fast-import.txt:1253
 #, priority:100
 msgid "To avoid deadlock, such frontends must completely consume any pending output from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes to fast-import that might block."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1248
+#: en/git-fast-import.txt:1255
 #, no-wrap, priority:100
 msgid "CRASH REPORTS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1254
+#: en/git-fast-import.txt:1261
 #, priority:100
 msgid "If fast-import is supplied invalid input it will terminate with a non-zero exit status and create a crash report in the top level of the Git repository it was importing into.  Crash reports contain a snapshot of the internal fast-import state as well as the most recent commands that lead up to the crash."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1261
+#: en/git-fast-import.txt:1268
 #, priority:100
 msgid "All recent commands (including stream comments, file changes and progress commands) are shown in the command history within the crash report, but raw file data and commit messages are excluded from the crash report.  This exclusion saves space within the report file and reduces the amount of buffering that fast-import must perform during execution."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1269
+#: en/git-fast-import.txt:1276
 #, priority:100
 msgid "After writing a crash report fast-import will close the current packfile and export the marks table.  This allows the frontend developer to inspect the repository state and resume the import from the point where it crashed.  The modified branches and tags are not updated during a crash, as the import did not complete successfully.  Branch and tag information can be found in the crash report and must be applied manually if the update is needed."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1271
+#: en/git-fast-import.txt:1278
 #, priority:100
 msgid "An example crash:"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1287
+#: en/git-fast-import.txt:1294
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat >in <<END_OF_INPUT\n"
@@ -22221,7 +22306,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1291
+#: en/git-fast-import.txt:1298
 #, no-wrap, priority:100
 msgid ""
 "\t$ git fast-import <in\n"
@@ -22230,7 +22315,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1297
+#: en/git-fast-import.txt:1304
 #, no-wrap, priority:100
 msgid ""
 "\t$ cat .git/fast_import_crash_8434\n"
@@ -22241,13 +22326,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1299
+#: en/git-fast-import.txt:1306
 #, no-wrap, priority:100
 msgid "\tfatal: Corrupt mode: M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1309
+#: en/git-fast-import.txt:1316
 #, no-wrap, priority:100
 msgid ""
 "\tMost Recent Commands Before Crash\n"
@@ -22262,13 +22347,13 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1310
+#: en/git-fast-import.txt:1317
 #, no-wrap, priority:100
 msgid "M 777 inline bob\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1313
+#: en/git-fast-import.txt:1320
 #, no-wrap, priority:100
 msgid ""
 "Active Branch LRU\n"
@@ -22276,25 +22361,25 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1314
+#: en/git-fast-import.txt:1321
 #, no-wrap, priority:100
 msgid "active_branches = 1 cur, 5 max\n"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1317
+#: en/git-fast-import.txt:1324
 #, priority:100
 msgid "pos clock name ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1318
+#: en/git-fast-import.txt:1325
 #, priority:100
 msgid "0 refs/heads/master"
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1322
+#: en/git-fast-import.txt:1329
 #, no-wrap, priority:100
 msgid ""
 "Inactive Branches\n"
@@ -22303,7 +22388,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1328
+#: en/git-fast-import.txt:1335
 #, no-wrap, priority:100
 msgid ""
 "status      : active loaded dirty\n"
@@ -22315,307 +22400,307 @@ msgid ""
 msgstr ""
 
 #. type: delimited block =
-#: en/git-fast-import.txt:1332
+#: en/git-fast-import.txt:1339
 #, priority:100
 msgid "------------------- END OF CRASH REPORT"
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1335
+#: en/git-fast-import.txt:1342
 #, no-wrap, priority:100
 msgid "TIPS AND TRICKS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1338
+#: en/git-fast-import.txt:1345
 #, priority:100
 msgid "The following tips and tricks have been collected from various users of fast-import, and are offered here as suggestions."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1340
+#: en/git-fast-import.txt:1347
 #, no-wrap, priority:100
 msgid "Use One Mark Per Commit"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1348
+#: en/git-fast-import.txt:1355
 #, priority:100
 msgid "When doing a repository conversion, use a unique mark per commit (`mark :<n>`) and supply the --export-marks option on the command line.  fast-import will dump a file which lists every mark and the Git object SHA-1 that corresponds to it.  If the frontend can tie the marks back to the source repository, it is easy to verify the accuracy and completeness of the import by comparing each Git commit to the corresponding source revision."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1352
+#: en/git-fast-import.txt:1359
 #, priority:100
 msgid "Coming from a system such as Perforce or Subversion this should be quite simple, as the fast-import mark can also be the Perforce changeset number or the Subversion revision number."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1354
+#: en/git-fast-import.txt:1361
 #, no-wrap, priority:100
 msgid "Freely Skip Around Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1359
+#: en/git-fast-import.txt:1366
 #, priority:100
 msgid "Don't bother trying to optimize the frontend to stick to one branch at a time during an import.  Although doing so might be slightly faster for fast-import, it tends to increase the complexity of the frontend code considerably."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1363
+#: en/git-fast-import.txt:1370
 #, priority:100
 msgid "The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1365
+#: en/git-fast-import.txt:1372
 #, no-wrap, priority:100
 msgid "Handling Renames"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1370
+#: en/git-fast-import.txt:1377
 #, priority:100
 msgid "When importing a renamed file or directory, simply delete the old name(s) and modify the new name(s) during the corresponding commit.  Git performs rename detection after-the-fact, rather than explicitly during a commit."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1372
+#: en/git-fast-import.txt:1379
 #, no-wrap, priority:100
 msgid "Use Tag Fixup Branches"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1376
+#: en/git-fast-import.txt:1383
 #, priority:100
 msgid "Some other SCM systems let the user create a tag from multiple files which are not from the same commit/changeset.  Or to create tags which are a subset of the files available in the repository."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1383
+#: en/git-fast-import.txt:1390
 #, priority:100
 msgid "Importing these tags as-is in Git is impossible without making at least one commit which ``fixes up'' the files to match the content of the tag.  Use fast-import's `reset` command to reset a dummy branch outside of your normal branch space to the base commit for the tag, then commit one or more file fixup commits, and finally tag the dummy branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1389
+#: en/git-fast-import.txt:1396
 #, priority:100
 msgid "For example since all normal branches are stored under `refs/heads/` name the tag fixup branch `TAG_FIXUP`.  This way it is impossible for the fixup branch used by the importer to have namespace conflicts with real branches imported from the source (the name `TAG_FIXUP` is not `refs/heads/TAG_FIXUP`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1395
+#: en/git-fast-import.txt:1402
 #, priority:100
 msgid "When committing fixups, consider using `merge` to connect the commit(s) which are supplying file revisions to the fixup branch.  Doing so will allow tools such as 'git blame' to track through the real commit history and properly annotate the source files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1398
+#: en/git-fast-import.txt:1405
 #, priority:100
 msgid "After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP` to remove the dummy branch."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1400
+#: en/git-fast-import.txt:1407
 #, no-wrap, priority:100
 msgid "Import Now, Repack Later"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1404
+#: en/git-fast-import.txt:1411
 #, priority:100
 msgid "As soon as fast-import completes the Git repository is completely valid and ready for use.  Typically this takes only a very short time, even for considerably large projects (100,000+ commits)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1411
+#: en/git-fast-import.txt:1418
 #, priority:100
 msgid "However repacking the repository is necessary to improve data locality and access performance.  It can also take hours on extremely large projects (especially if -f and a large --window parameter is used).  Since repacking is safe to run alongside readers and writers, run the repack in the background and let it finish when it finishes.  There is no reason to wait to explore your new Git project!"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1416
+#: en/git-fast-import.txt:1423
 #, priority:100
 msgid "If you choose to wait for the repack, don't try to run benchmarks or performance tests until repacking is completed.  fast-import outputs suboptimal packfiles that are simply never seen in real use situations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1418
+#: en/git-fast-import.txt:1425
 #, no-wrap, priority:100
 msgid "Repacking Historical Data"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1425
+#: en/git-fast-import.txt:1432
 #, priority:100
 msgid "If you are repacking very old imported data (e.g. older than the last year), consider expending some extra CPU time and supplying --window=50 (or higher) when you run 'git repack'.  This will take longer, but will also produce a smaller packfile.  You only need to expend the effort once, and everyone using your project will benefit from the smaller repository."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1427
+#: en/git-fast-import.txt:1434
 #, no-wrap, priority:100
 msgid "Include Some Progress Messages"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1434
+#: en/git-fast-import.txt:1441
 #, priority:100
 msgid "Every once in a while have your frontend emit a `progress` message to fast-import.  The contents of the messages are entirely free-form, so one suggestion would be to output the current month and year each time the current commit date moves into the next month.  Your users will feel better knowing how much of the data stream has been processed."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1437
+#: en/git-fast-import.txt:1444
 #, no-wrap, priority:100
 msgid "PACKFILE OPTIMIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1443
+#: en/git-fast-import.txt:1450
 #, priority:100
 msgid "When packing a blob fast-import always attempts to deltify against the last blob written.  Unless specifically arranged for by the frontend, this will probably not be a prior version of the same file, so the generated delta will not be the smallest possible.  The resulting packfile will be compressed, but will not be optimal."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1451
+#: en/git-fast-import.txt:1458
 #, priority:100
 msgid "Frontends which have efficient access to all revisions of a single file (for example reading an RCS/CVS ,v file) can choose to supply all revisions of that file as a sequence of consecutive `blob` commands.  This allows fast-import to deltify the different file revisions against each other, saving space in the final packfile.  Marks can be used to later identify individual file revisions during a sequence of `commit` commands."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1458
+#: en/git-fast-import.txt:1465
 #, priority:100
 msgid "The packfile(s) created by fast-import do not encourage good disk access patterns.  This is caused by fast-import writing the data in the order it is received on standard input, while Git typically organizes data within packfiles to make the most recent (current tip) data appear before historical data.  Git also clusters commits together, speeding up revision traversal through better cache locality."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1465
+#: en/git-fast-import.txt:1472
 #, priority:100
 msgid "For this reason it is strongly recommended that users repack the repository with `git repack -a -d` after fast-import completes, allowing Git to reorganize the packfiles for faster data access.  If blob deltas are suboptimal (see above) then also adding the `-f` option to force recomputation of all deltas can significantly reduce the final packfile size (30-50% smaller can be quite typical)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1473
+#: en/git-fast-import.txt:1480
 #, priority:100
 msgid "Instead of running `git repack` you can also run `git gc --aggressive`, which will also optimize other things after an import (e.g. pack loose refs). As noted in the \"AGGRESSIVE\" section in linkgit:git-gc[1] the `--aggressive` option will find new deltas with the `-f` option to linkgit:git-repack[1]. For the reasons elaborated on above using `--aggressive` after a fast-import is one of the few cases where it's known to be worthwhile."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1475
+#: en/git-fast-import.txt:1482
 #, no-wrap, priority:100
 msgid "MEMORY UTILIZATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1481
+#: en/git-fast-import.txt:1488
 #, priority:100
 msgid "There are a number of factors which affect how much memory fast-import requires to perform an import.  Like critical sections of core Git, fast-import uses its own memory allocators to amortize any overheads associated with malloc.  In practice fast-import tends to amortize any malloc overheads to 0, due to its use of large block allocations."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1483
+#: en/git-fast-import.txt:1490
 #, no-wrap, priority:100
 msgid "per object"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1490
+#: en/git-fast-import.txt:1497
 #, priority:100
 msgid "fast-import maintains an in-memory structure for every object written in this execution.  On a 32 bit system the structure is 32 bytes, on a 64 bit system the structure is 40 bytes (due to the larger pointer sizes).  Objects in the table are not deallocated until fast-import terminates.  Importing 2 million objects on a 32 bit system will require approximately 64 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1496
+#: en/git-fast-import.txt:1503
 #, priority:100
 msgid "The object table is actually a hashtable keyed on the object name (the unique SHA-1).  This storage configuration allows fast-import to reuse an existing or already written object and avoid writing duplicates to the output packfile.  Duplicate blobs are surprisingly common in an import, typically due to branch merges in the source."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1498
+#: en/git-fast-import.txt:1505
 #, no-wrap, priority:100
 msgid "per mark"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1504
+#: en/git-fast-import.txt:1511
 #, priority:100
 msgid "Marks are stored in a sparse array, using 1 pointer (4 bytes or 8 bytes, depending on pointer size) per mark.  Although the array is sparse, frontends are still strongly encouraged to use marks between 1 and n, where n is the total number of marks required for this import."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1506
+#: en/git-fast-import.txt:1513
 #, no-wrap, priority:100
 msgid "per branch"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1509
+#: en/git-fast-import.txt:1516
 #, priority:100
 msgid "Branches are classified as active and inactive.  The memory usage of the two classes is significantly different."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1515
+#: en/git-fast-import.txt:1522
 #, priority:100
 msgid "Inactive branches are stored in a structure which uses 96 or 120 bytes (32 bit or 64 bit systems, respectively), plus the length of the branch name (typically under 200 bytes), per branch.  fast-import will easily handle as many as 10,000 inactive branches in under 2 MiB of memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1522
+#: en/git-fast-import.txt:1529
 #, priority:100
 msgid "Active branches have the same overhead as inactive branches, but also contain copies of every tree that has been recently modified on that branch.  If subtree `include` has not been modified since the branch became active, its contents will not be loaded into memory, but if subtree `src` has been modified by a commit since the branch became active, then its contents will be loaded in memory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1526
+#: en/git-fast-import.txt:1533
 #, priority:100
 msgid "As active branches store metadata about the files contained on that branch, their in-memory storage size can grow to a considerable size (see below)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1531
+#: en/git-fast-import.txt:1538
 #, priority:100
 msgid "fast-import automatically moves active branches to inactive status based on a simple least-recently-used algorithm.  The LRU chain is updated on each `commit` command.  The maximum number of active branches can be increased or decreased on the command line with --active-branches=."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1533
+#: en/git-fast-import.txt:1540
 #, no-wrap, priority:100
 msgid "per active tree"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1538
+#: en/git-fast-import.txt:1545
 #, priority:100
 msgid "Trees (aka directories) use just 12 bytes of memory on top of the memory required for their entries (see ``per active file'' below).  The cost of a tree is virtually 0, as its overhead amortizes out over the individual file entries."
 msgstr ""
 
 #. type: Title ~
-#: en/git-fast-import.txt:1540
+#: en/git-fast-import.txt:1547
 #, no-wrap, priority:100
 msgid "per active file entry"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1546
+#: en/git-fast-import.txt:1553
 #, priority:100
 msgid "Files (and pointers to subtrees) within active trees require 52 or 64 bytes (32/64 bit platforms) per entry.  To conserve space, file and tree names are pooled in a common string table, allowing the filename ``Makefile'' to use just 16 bytes (after including the string header overhead) no matter how many times it occurs within the project."
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1551
+#: en/git-fast-import.txt:1558
 #, priority:100
 msgid "The active branch LRU, when coupled with the filename string pool and lazy loading of subtrees, allows fast-import to efficiently import projects with 2,000+ branches and 45,114+ files in a very limited memory footprint (less than 2.7 MiB per active branch)."
 msgstr ""
 
 #. type: Title -
-#: en/git-fast-import.txt:1553
+#: en/git-fast-import.txt:1560
 #, no-wrap, priority:100
 msgid "SIGNALS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-fast-import.txt:1559
+#: en/git-fast-import.txt:1566
 #, priority:100
 msgid "Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile early, simulating a `checkpoint` command.  The impatient operator can use this facility to peek at the objects and refs from an import in progress, at the cost of some added running time and worse compression."
 msgstr ""
@@ -23226,19 +23311,19 @@ msgstr ""
 #. type: delimited block -
 #: en/git-fetch.txt:259
 #, no-wrap, priority:220
-msgid "$ git fetch origin +pu:pu maint:tmp\n"
+msgid "$ git fetch origin +seen:seen maint:tmp\n"
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:264
 #, priority:220
-msgid "This updates (or creates, as necessary) branches `pu` and `tmp` in the local repository by fetching from the branches (respectively)  `pu` and `maint` from the remote repository."
+msgid "This updates (or creates, as necessary) branches `seen` and `tmp` in the local repository by fetching from the branches (respectively)  `seen` and `maint` from the remote repository."
 msgstr ""
 
 #. type: Plain text
 #: en/git-fetch.txt:267
 #, priority:220
-msgid "The `pu` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
+msgid "The `seen` branch will be updated even if it does not fast-forward, because it is prefixed with a plus sign; `tmp` will not be."
 msgstr ""
 
 #. type: Plain text
@@ -27038,7 +27123,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-grep.txt:213
 #, priority:100
-msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see linkgit:git-config[1])."
+msgid "Use \\0 as the delimiter for pathnames in the output, and print them verbatim. Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable core.quotePath (see glinkgit:it-config[1])."
 msgstr ""
 
 #. type: Labeled list
@@ -28487,7 +28572,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-http-fetch.txt:13
 #, no-wrap, priority:100
-msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>\n"
 msgstr ""
 
 #. type: Plain text
@@ -28558,12 +28643,24 @@ msgstr ""
 
 #. type: Labeled list
 #: en/git-http-fetch.txt:43
+#, no-wrap, priority:100
+msgid "--packfile=<hash>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-http-fetch.txt:49
+#, priority:100
+msgid "Instead of a commit id on the command line (which is not expected in this case), 'git http-fetch' fetches the packfile directly at the given URL and uses index-pack to generate corresponding .idx and .keep files.  The hash is used to determine the name of the temporary file and is arbitrary. The output of index-pack is printed to stdout."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-http-fetch.txt:50
 #, ignore-same, no-wrap, priority:100
 msgid "--recover"
 msgstr "--recover"
 
 #. type: Plain text
-#: en/git-http-fetch.txt:46
+#: en/git-http-fetch.txt:53
 #, priority:100
 msgid "Verify that everything reachable from target is fetched.  Used after an earlier fetch is interrupted."
 msgstr ""
@@ -29054,20 +29151,38 @@ msgstr ""
 msgid "Die, if the pack is larger than <size>."
 msgstr ""
 
+#. type: Labeled list
+#: en/git-index-pack.txt:96 en/git-show-index.txt:42
+#, no-wrap, priority:100
+msgid "--object-format=<hash-algorithm>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:101
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the pack.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository."
+msgstr ""
+
 #. type: Plain text
 #: en/git-index-pack.txt:103
 #, priority:100
+msgid "This option cannot be used with --stdin."
+msgstr ""
+
+#. type: Plain text
+#: en/git-index-pack.txt:111
+#, priority:100
 msgid "Once the index has been created, the list of object names is sorted and the SHA-1 hash of that list is printed to stdout. If --stdin was also used then this is prefixed by either \"pack\\t\", or \"keep\\t\" if a new .keep file was successfully created. This is useful to remove a"
 msgstr ""
 
 #. type: Block title
-#: en/git-index-pack.txt:103
+#: en/git-index-pack.txt:111
 #, no-wrap, priority:100
 msgid "keep file used as a lock to prevent the race with 'git repack'"
 msgstr ""
 
 #. type: Plain text
-#: en/git-index-pack.txt:105
+#: en/git-index-pack.txt:113
 #, priority:100
 msgid "mentioned above."
 msgstr ""
@@ -29109,7 +29224,7 @@ msgid "git-init - Create an empty Git repository or reinitialize an existing one
 msgstr "git-init -創建一個空的Git倉庫或是重新初始化已存在的倉庫"
 
 #. type: Plain text
-#: en/git-init.txt:15
+#: en/git-init.txt:16
 #, fuzzy, no-wrap, priority:300
 #| msgid ""
 #| "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
@@ -29118,6 +29233,7 @@ msgstr "git-init -創建一個空的Git倉庫或是重新初始化已存在的
 msgid ""
 "'git init' [-q | --quiet] [--bare] [--template=<template_directory>]\n"
 "\t  [--separate-git-dir <git dir>] [--object-format=<format>]\n"
+"\t  [-b <branch-name> | --initial-branch=<branch-name>]\n"
 "\t  [--shared[=<permissions>]] [directory]\n"
 msgstr ""
 "'git init' [-q | --quiet] [--bare] [--template=<模板目錄>]\n"
@@ -29125,217 +29241,236 @@ msgstr ""
 "\t  [--shared[=<權限>]] [目錄]\n"
 
 #. type: Plain text
-#: en/git-init.txt:24
+#: en/git-init.txt:25
 #, priority:300
 msgid "This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files.  An initial `HEAD` file that references the HEAD of the master branch is also created."
 msgstr "這行指令會創建一個空的Git倉庫，基本上是一個名為`.git`的目錄，含有`objects`,`refs/heads`,`refs/tags`這幾個子目錄，其他模板檔案，跟一個指向`master`分支Head的初始`HEAD`檔案。"
 
 #. type: Plain text
-#: en/git-init.txt:27
+#: en/git-init.txt:28
 #, priority:300
 msgid "If the `$GIT_DIR` environment variable is set then it specifies a path to use instead of `./.git` for the base of the repository."
 msgstr "如果有設定環境變數`$GIT_DIR`，則會使用被指定的路徑，而不是`./.git`來建立倉庫的基礎檔案。"
 
 #. type: Plain text
-#: en/git-init.txt:32
+#: en/git-init.txt:33
 #, priority:300
 msgid "If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` environment variable then the sha1 directories are created underneath - otherwise the default `$GIT_DIR/objects` directory is used."
 msgstr "如果object儲存路徑有經由環境變數`$GIT_OBJECT_DIRECTORY`所指定，則SHA-1的目錄將會被設置在其底下，否則會使用預設的`$GIT_DIR/objects`目錄。"
 
 #. type: Plain text
-#: en/git-init.txt:37
+#: en/git-init.txt:38
 #, priority:300
 msgid "Running 'git init' in an existing repository is safe. It will not overwrite things that are already there. The primary reason for rerunning 'git init' is to pick up newly added templates (or to move the repository to another place if --separate-git-dir is given)."
 msgstr "在現有的倉庫執行'git init'是很安全的。它並不會覆蓋掉已存在的檔案。重新執行'git init'最主要的原因，是去取得新增的模板檔案(或是加上 --separate-git-dir 將倉庫移到另一個位置)。"
 
 #. type: Plain text
-#: en/git-init.txt:45
+#: en/git-init.txt:46
 #, priority:300
 msgid "Only print error and warning messages; all other output will be suppressed."
 msgstr "只會印出錯誤和警告訊息；其他輸出訊息皆會被遮蔽。"
 
 #. type: Plain text
-#: en/git-init.txt:50
+#: en/git-init.txt:51
 #, priority:300
 msgid "Create a bare repository. If `GIT_DIR` environment is not set, it is set to the current working directory."
 msgstr "創建一個裸倉庫。如果環境變數`GIT_DIR`未被設定 ，則會設置在當前作業目錄下。"
 
 #. type: Labeled list
-#: en/git-init.txt:51
+#: en/git-init.txt:52
 #, no-wrap, priority:300
 msgid "--object-format=<format>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:55
+#: en/git-init.txt:56
 #, priority:300
 msgid "Specify the given object format (hash algorithm) for the repository.  The valid values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:60
+#: en/git-init.txt:61
 #, priority:300
 msgid "Specify the directory from which templates will be used.  (See the \"TEMPLATE DIRECTORY\" section below.)"
 msgstr "指定用於取得模板檔案的目錄(請參考下面的\"模板檔案目錄\"章節。)"
 
 #. type: Plain text
-#: en/git-init.txt:67
+#: en/git-init.txt:68
 #, priority:300
 msgid "Instead of initializing the repository as a directory to either `$GIT_DIR` or `./.git/`, create a text file there containing the path to the actual repository.  This file acts as filesystem-agnostic Git symbolic link to the repository."
 msgstr "不使用`$GIT_DIR`或是`./.git/`作為初始化倉庫的路徑，而是創建一個儲存實際倉庫路徑的檔案。這個檔案會作為資料系統獨立的Git捷徑，連結到倉庫。"
 
 #. type: Plain text
-#: en/git-init.txt:69
+#: en/git-init.txt:70
 #, priority:300
 msgid "If this is reinitialization, the repository will be moved to the specified path."
 msgstr "如果重新初始化，倉庫則會被移到指定的路徑。"
 
 #. type: Labeled list
-#: en/git-init.txt:70
+#: en/git-init.txt:71
+#, fuzzy, no-wrap, priority:300
+#| msgid "--branch"
+msgid "-b <branch-name"
+msgstr "--branch"
+
+#. type: Labeled list
+#: en/git-init.txt:72
+#, no-wrap, priority:300
+msgid "--initial-branch=<branch-name>"
+msgstr ""
+
+#. type: Plain text
+#: en/git-init.txt:76
+#, priority:300
+msgid "Use the specified name for the initial branch in the newly created repository.  If not specified, fall back to the default name: `master`."
+msgstr ""
+
+#. type: Labeled list
+#: en/git-init.txt:77
 #, no-wrap, priority:300
 msgid "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 msgstr "--shared[=(false|true|umask|group|all|world|everybody|0xxx)]"
 
 #. type: Plain text
-#: en/git-init.txt:78
+#: en/git-init.txt:85
 #, priority:300
 msgid "Specify that the Git repository is to be shared amongst several users.  This allows users belonging to the same group to push into that repository.  When specified, the config variable \"core.sharedRepository\" is set so that files and directories under `$GIT_DIR` are created with the requested permissions.  When not specified, Git will use permissions reported by umask(2)."
 msgstr "指定的Git倉庫可在多個使用者之間共享，這會允許屬於相同群組的使用者對這個倉庫推送。指定時，組態參數\"core.sharedRepository\"將會被設定，讓在`$GIT_DIR`底下的檔案和目錄使用指定的權限來創建。當沒有指定時，Git會使用umask(2)所回報的權限。"
 
 #. type: Plain text
-#: en/git-init.txt:81
+#: en/git-init.txt:88
 #, priority:300
 msgid "The option can have the following values, defaulting to 'group' if no value is given:"
 msgstr "這個選項可以加上下列參數，若不使用參數則預設會使用'group'："
 
 #. type: Labeled list
-#: en/git-init.txt:83
+#: en/git-init.txt:90
 #, no-wrap, priority:300
 msgid "'umask' (or 'false')"
 msgstr "'umask' (或是 'false')"
 
 #. type: Plain text
-#: en/git-init.txt:87
+#: en/git-init.txt:94
 #, priority:300
 msgid "Use permissions reported by umask(2). The default, when `--shared` is not specified."
 msgstr "使用umask(2)回報的權限。也是當沒有指定`--shared`時的預設值。"
 
 #. type: Labeled list
-#: en/git-init.txt:88
+#: en/git-init.txt:95
 #, no-wrap, priority:300
 msgid "'group' (or 'true')"
 msgstr "'group' (或是 'true')"
 
 #. type: Plain text
-#: en/git-init.txt:96
+#: en/git-init.txt:103
 #, priority:300
 msgid "Make the repository group-writable, (and g+sx, since the git group may be not the primary group of all users). This is used to loosen the permissions of an otherwise safe umask(2) value. Note that the umask still applies to the other permission bits (e.g. if umask is '0022', using 'group' will not remove read privileges from other (non-group) users). See '0xxx' for how to exactly specify the repository permissions."
 msgstr "讓倉庫變成群組可寫入(還有g+sx，因為git群組可能並非所有使用者的主群組)。這用於放寬原本較為安全的umask(2)權限。請注意，umask仍然會適用於其他權限(舉例來說， 當umask是'0022'時,使用'group'並不會移除其他使用者(non-group)的讀取權限。請參閱'0xxx'來知道如何精確指定倉庫的權限。"
 
 #. type: Labeled list
-#: en/git-init.txt:97
+#: en/git-init.txt:104
 #, no-wrap, priority:300
 msgid "'all' (or 'world' or 'everybody')"
 msgstr "'all' (或 'world' 或是 'everybody')"
 
 #. type: Plain text
-#: en/git-init.txt:100
+#: en/git-init.txt:107
 #, priority:300
 msgid "Same as 'group', but make the repository readable by all users."
 msgstr "跟'group'大致相同，但會使倉庫可被所有使用者讀取。"
 
 #. type: Labeled list
-#: en/git-init.txt:101
+#: en/git-init.txt:108
 #, no-wrap, priority:300
 msgid "'0xxx'"
 msgstr "'0xxx'"
 
 #. type: Plain text
-#: en/git-init.txt:108
+#: en/git-init.txt:115
 #, priority:300
 msgid "'0xxx' is an octal number and each file will have mode '0xxx'. '0xxx' will override users' umask(2) value (and not only loosen permissions as 'group' and 'all' does). '0640' will create a repository which is group-readable, but not group-writable or accessible to others. '0660' will create a repo that is readable and writable to the current user and group, but inaccessible to others."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:113
+#: en/git-init.txt:120
 #, priority:300
 msgid "By default, the configuration flag `receive.denyNonFastForwards` is enabled in shared repositories, so that you cannot force a non fast-forwarding push into it."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:116
+#: en/git-init.txt:123
 #, priority:300
 msgid "If you provide a 'directory', the command is run inside it. If this directory does not exist, it will be created."
 msgstr ""
 
 #. type: Title -
-#: en/git-init.txt:118
+#: en/git-init.txt:125
 #, no-wrap, priority:300
 msgid "TEMPLATE DIRECTORY"
 msgstr "模版檔案目錄"
 
 #. type: Plain text
-#: en/git-init.txt:122
+#: en/git-init.txt:129
 #, priority:300
 msgid "Files and directories in the template directory whose name do not start with a dot will be copied to the `$GIT_DIR` after it is created."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:124
+#: en/git-init.txt:131
 #, priority:300
 msgid "The template directory will be one of the following (in order):"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:126
+#: en/git-init.txt:133
 #, priority:300
 msgid "the argument given with the `--template` option;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:128
+#: en/git-init.txt:135
 #, priority:300
 msgid "the contents of the `$GIT_TEMPLATE_DIR` environment variable;"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:130
+#: en/git-init.txt:137
 #, priority:300
 msgid "the `init.templateDir` configuration variable; or"
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:132
+#: en/git-init.txt:139
 #, priority:300
 msgid "the default template directory: `/usr/share/git-core/templates`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:135
+#: en/git-init.txt:142
 #, priority:300
 msgid "The default template directory includes some directory structure, suggested \"exclude patterns\" (see linkgit:gitignore[5]), and sample hook files."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:138
+#: en/git-init.txt:145
 #, priority:300
 msgid "The sample hooks are all disabled by default. To enable one of the sample hooks rename it by removing its `.sample` suffix."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:140
+#: en/git-init.txt:147
 #, priority:300
 msgid "See linkgit:githooks[5] for more general info on hook execution."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-init.txt:144
+#: en/git-init.txt:151
 #, no-wrap, priority:300
 msgid "Start a new Git repository for an existing code base"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-init.txt:151
+#: en/git-init.txt:158
 #, no-wrap, priority:300
 msgid ""
 "$ cd /path/to/my/codebase\n"
@@ -29345,19 +29480,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:154
+#: en/git-init.txt:161
 #, priority:300
 msgid "Create a /path/to/my/codebase/.git directory."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:155
+#: en/git-init.txt:162
 #, priority:300
 msgid "Add all existing files to the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git-init.txt:156
+#: en/git-init.txt:163
 #, priority:300
 msgid "Record the pristine state as the first commit in the history."
 msgstr ""
@@ -31237,9 +31372,9 @@ msgid ""
 "7ceca275d047c90c0c7d5afb13ab97efdf51bd6e\trefs/tags/v0.99.3\n"
 "c5db5456ae3b0873fc659c19fafdde22313cc441\trefs/tags/v0.99.2\n"
 "0918385dbd9656cab0d1d81ba7453d49bbc16250\trefs/tags/junio-gpg-pub\n"
-"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc\n"
+"$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc\n"
 "5fe978a5381f1fbad26a80e682ddd2a401966740\trefs/heads/master\n"
-"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/pu\n"
+"c781a84b5204fb294c9ccc79f8b3baceeb32c061\trefs/heads/seen\n"
 "$ git remote add korg http://www.kernel.org/pub/scm/git/git.git\n"
 "$ git ls-remote --tags korg v\\*\n"
 "d6602ec5194c87b0fc87103ca4d67251c76f233a\trefs/tags/v0.99\n"
@@ -36323,7 +36458,7 @@ msgid "Show progress."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-prune.txt:48 en/git-worktree.txt:192
+#: en/git-prune.txt:48 en/git-worktree.txt:194
 #, no-wrap, priority:240
 msgid "--expire <time>"
 msgstr ""
@@ -38716,12 +38851,8 @@ msgstr ""
 
 #. type: Plain text
 #: en/git-rebase.txt:266
-#, no-wrap, priority:100
-msgid ""
-"--apply:\n"
-"\tUse applying strategies to rebase (calling `git-am`\n"
-"\tinternally).  This option may become a no-op in the future\n"
-"\tonce the merge backend handles everything the apply one does.\n"
+#, priority:100
+msgid "Use applying strategies to rebase (calling `git-am` internally).  This option may become a no-op in the future once the merge backend handles everything the apply one does."
 msgstr ""
 
 #. type: Labeled list
@@ -41296,7 +41427,7 @@ msgstr ""
 #, ignore-ellipsis, no-wrap, priority:220
 msgid ""
 "'git remote' [-v | --verbose]\n"
-"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>\n"
+"'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>\n"
 "'git remote rename' <old> <new>\n"
 "'git remote remove' <name>\n"
 "'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)\n"
@@ -41319,7 +41450,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:39
 #, priority:220
-msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and subcommand."
+msgid "Be a little more verbose and show remote url after name.  NOTE: This must be placed between `remote` and `subcommand`."
 msgstr ""
 
 #. type: Plain text
@@ -41337,7 +41468,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:52
 #, priority:220
-msgid "Add a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
+msgid "Adds a remote named <name> for the repository at <url>.  The command `git fetch <name>` can then be used to create and update remote-tracking branches <name>/<branch>."
 msgstr ""
 
 #. type: Plain text
@@ -41445,13 +41576,13 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:116
 #, priority:220
-msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, `git remote set-head origin -a` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
+msgid "With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will only work if `refs/remotes/origin/next` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Plain text
 #: en/git-remote.txt:121
 #, priority:220
-msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
+msgid "Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., \"git remote set-head origin master\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/master`. This will only work if `refs/remotes/origin/master` already exists; if not it must be fetched first."
 msgstr ""
 
 #. type: Labeled list
@@ -41469,7 +41600,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:131
 #, priority:220
-msgid "The named branches will be interpreted as if specified with the `-t` option on the `git remote add` command line."
+msgid "The named branches will be interpreted as if specified with the `-t` option on the 'git remote add' command line."
 msgstr ""
 
 #. type: Plain text
@@ -41577,7 +41708,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:186
 #, priority:220
-msgid "With `--dry-run` option, report what branches would be pruned, but do not actually prune them."
+msgid "With `--dry-run` option, report what branches will be pruned, but do not actually prune them."
 msgstr ""
 
 #. type: Labeled list
@@ -41589,7 +41720,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-remote.txt:195
 #, priority:220
-msgid "Fetch updates for remotes or remote groups in the repository as defined by `remotes.<group>`. If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
+msgid "Fetch updates for remotes or remote groups in the repository as defined by remotes.<group>.  If neither group nor remote is specified on the command line, the configuration parameter remotes.default will be used; if remotes.default is not defined, all remotes which do not have the configuration parameter remote.<name>.skipDefaultUpdate set to true will be updated.  (See linkgit:git-config[1])."
 msgstr ""
 
 #. type: Plain text
@@ -46720,7 +46851,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-show-index.txt:13
 #, no-wrap, priority:100
-msgid "'git show-index'\n"
+msgid "'git show-index' [--object-format=<hash-algorithm>]\n"
 msgstr ""
 
 #. type: Plain text
@@ -46759,6 +46890,12 @@ msgstr ""
 msgid "Note that you can get more information on a packfile by calling linkgit:git-verify-pack[1]. However, as this command considers only the index file itself, it's both faster and more flexible."
 msgstr ""
 
+#. type: Plain text
+#: en/git-show-index.txt:47
+#, priority:100
+msgid "Specify the given object format (hash algorithm) for the index file.  The valid values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for the current repository (set by `extensions.objectFormat`), or 'sha1' if no value is set or outside a repository.."
+msgstr ""
+
 #. type: Title =
 #: en/git-show-ref.txt:2
 #, ignore-same, no-wrap, priority:100
@@ -48942,7 +49079,7 @@ msgstr ""
 #. type: Plain text
 #: en/git-submodule.txt:187
 #, priority:220
-msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to 'master'."
+msgid "Sets the default remote tracking branch for the submodule. The `--branch` option allows the remote branch to be specified. The `--default` option removes the submodule.<name>.branch configuration key, which causes the tracking branch to default to the remote 'HEAD'."
 msgstr ""
 
 #. type: Labeled list
@@ -49075,7 +49212,7 @@ msgstr "--branch"
 #. type: Plain text
 #: en/git-submodule.txt:288
 #, priority:220
-msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to 'master'."
+msgid "Branch of repository to add as submodule.  The name of the branch is recorded as `submodule.<name>.branch` in `.gitmodules` for `update --remote`.  A special value of `.` is used to indicate that the name of the branch in the submodule should be the same name as the current branch in the current repository.  If the option is not specified, it defaults to the remote 'HEAD'."
 msgstr ""
 
 #. type: Plain text
@@ -49123,7 +49260,7 @@ msgstr "--remote"
 #. type: Plain text
 #: en/git-submodule.txt:329
 #, priority:220
-msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
+msgid "This option is only valid for the update command.  Instead of using the superproject's recorded SHA-1 to update the submodule, use the status of the submodule's remote-tracking branch.  The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`.  The remote branch used defaults to the remote `HEAD`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in either `.gitmodules` or `.git/config` (with `.git/config` taking precedence)."
 msgstr ""
 
 #. type: Plain text
@@ -53374,13 +53511,13 @@ msgid "Enables general trace messages, e.g. alias expansion, built-in command ex
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:662 en/git.txt:740
+#: en/git.txt:662 en/git.txt:738
 #, priority:100
 msgid "If this variable is set to \"1\", \"2\" or \"true\" (comparison is case insensitive), trace messages will be printed to stderr."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:667 en/git.txt:745
+#: en/git.txt:667 en/git.txt:743
 #, priority:100
 msgid "If the variable is set to an integer value greater than 2 and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor."
 msgstr ""
@@ -53392,7 +53529,7 @@ msgid "Alternatively, if the variable is set to an absolute path (starting with
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:675 en/git.txt:762
+#: en/git.txt:675 en/git.txt:760
 #, priority:100
 msgid "Unsetting the variable, or setting it to empty, \"0\" or \"false\" (case insensitive) disables trace messages."
 msgstr ""
@@ -53494,391 +53631,391 @@ msgid "`GIT_TRACE_CURL`"
 msgstr "`GIT_TRACE_CURL`"
 
 #. type: Plain text
-#: en/git.txt:727
+#: en/git.txt:725
 #, priority:100
-msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  This option overrides setting the `GIT_CURL_VERBOSE` environment variable.  See `GIT_TRACE` for available trace output options."
+msgid "Enables a curl full trace dump of all incoming and outgoing data, including descriptive information, of the git transport protocol.  This is similar to doing curl `--trace-ascii` on the command line.  See `GIT_TRACE` for available trace output options."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:728
+#: en/git.txt:726
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE_CURL_NO_DATA`"
 msgstr "`GIT_TRACE_CURL_NO_DATA`"
 
 #. type: Plain text
-#: en/git.txt:731
+#: en/git.txt:729
 #, priority:100
 msgid "When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump data (that is, only dump info lines and headers)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:732
+#: en/git.txt:730
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2`"
 msgstr "`GIT_TRACE2`"
 
 #. type: Plain text
-#: en/git.txt:736
+#: en/git.txt:734
 #, priority:100
 msgid "Enables more detailed trace messages from the \"trace2\" library.  Output from `GIT_TRACE2` is a simple text-based format for human readability."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:754
+#: en/git.txt:752
 #, priority:100
 msgid "Alternatively, if the variable is set to an absolute path (starting with a '/' character), Git will interpret this as a file path and will try to append the trace messages to it.  If the path already exists and is a directory, the trace messages will be written to files (one per process)  in that directory, named according to the last component of the SID and an optional counter (to avoid filename collisions)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:759
+#: en/git.txt:757
 #, priority:100
 msgid "In addition, if the variable is set to `af_unix:[<socket_type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket.  The socket type can be either `stream` or `dgram`."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:765
+#: en/git.txt:763
 #, priority:100
 msgid "See link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:767
+#: en/git.txt:765
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_EVENT`"
 msgstr "`GIT_TRACE2_EVENT`"
 
 #. type: Plain text
-#: en/git.txt:772
+#: en/git.txt:770
 #, priority:100
 msgid "This setting writes a JSON-based format that is suited for machine interpretation.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:773
+#: en/git.txt:771
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_TRACE2_PERF`"
 msgstr "`GIT_TRACE2_PERF`"
 
 #. type: Plain text
-#: en/git.txt:779
+#: en/git.txt:777
 #, priority:100
 msgid "In addition to the text-based messages available in `GIT_TRACE2`, this setting writes a column-based format for understanding nesting regions.  See `GIT_TRACE2` for available trace output options and link:technical/api-trace2.html[Trace2 documentation] for full details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:780
+#: en/git.txt:778
 #, ignore-same, no-wrap, priority:100
-msgid "`GIT_REDACT_COOKIES`"
-msgstr "`GIT_REDACT_COOKIES`"
+msgid "`GIT_TRACE_REDACT`"
+msgstr "`GIT_TRACE_REDACT`"
 
 #. type: Plain text
-#: en/git.txt:785
+#: en/git.txt:782
 #, priority:100
-msgid "This can be set to a comma-separated list of strings. When a curl trace is enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by the client is dumped, values of cookies whose key is in that list (case-sensitive) are redacted."
+msgid "By default, when tracing is activated, Git redacts the values of cookies, the \"Authorization:\" header, and the \"Proxy-Authorization:\" header. Set this variable to `0` to prevent this redaction."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:786
+#: en/git.txt:783
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_LITERAL_PATHSPECS`"
 msgstr "`GIT_LITERAL_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:794
+#: en/git.txt:791
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:795
+#: en/git.txt:792
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_GLOB_PATHSPECS`"
 msgstr "`GIT_GLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:798
+#: en/git.txt:795
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as glob patterns (aka \"glob\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:799
+#: en/git.txt:796
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_NOGLOB_PATHSPECS`"
 msgstr "`GIT_NOGLOB_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:802
+#: en/git.txt:799
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as literal (aka \"literal\" magic)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:803
+#: en/git.txt:800
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ICASE_PATHSPECS`"
 msgstr "`GIT_ICASE_PATHSPECS`"
 
 #. type: Plain text
-#: en/git.txt:806
+#: en/git.txt:803
 #, priority:100
 msgid "Setting this variable to `1` will cause Git to treat all pathspecs as case-insensitive."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:807
+#: en/git.txt:804
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REFLOG_ACTION`"
 msgstr "`GIT_REFLOG_ACTION`"
 
 #. type: Plain text
-#: en/git.txt:816
+#: en/git.txt:813
 #, priority:100
 msgid "When a ref is updated, reflog entries are created to keep track of the reason why the ref was updated (which is typically the name of the high-level command that updated the ref), in addition to the old and new values of the ref.  A scripted Porcelain command can use set_reflog_action helper function in `git-sh-setup` to set its name to this variable when it is invoked as the top level command by the end user, to be recorded in the body of the reflog."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:817
+#: en/git.txt:814
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REF_PARANOIA`"
 msgstr "`GIT_REF_PARANOIA`"
 
 #. type: Plain text
-#: en/git.txt:827
+#: en/git.txt:824
 #, priority:100
 msgid "If set to `1`, include broken or badly named refs when iterating over lists of refs. In a normal, non-corrupted repository, this does nothing. However, enabling it may help git to detect and abort some operations in the presence of broken refs. Git sets this variable automatically when performing destructive operations like linkgit:git-prune[1]. You should not need to set it yourself unless you want to be paranoid about making sure an operation has touched every ref (e.g., because you are cloning a repository to make a backup)."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:828
+#: en/git.txt:825
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_ALLOW_PROTOCOL`"
 msgstr "`GIT_ALLOW_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:836
+#: en/git.txt:833
 #, priority:100
 msgid "If set to a colon-separated list of protocols, behave as if `protocol.allow` is set to `never`, and each of the listed protocols has `protocol.<name>.allow` set to `always` (overriding any existing configuration). In other words, any protocol not mentioned will be disallowed (i.e., this is a whitelist, not a blacklist). See the description of `protocol.allow` in linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:837
+#: en/git.txt:834
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL_FROM_USER`"
 msgstr "`GIT_PROTOCOL_FROM_USER`"
 
 #. type: Plain text
-#: en/git.txt:843
+#: en/git.txt:840
 #, priority:100
 msgid "Set to 0 to prevent protocols used by fetch/push/clone which are configured to the `user` state.  This is useful to restrict recursive submodule initialization from an untrusted repository or for programs which feed potentially-untrusted URLS to git commands.  See linkgit:git-config[1] for more details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:844
+#: en/git.txt:841
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_PROTOCOL`"
 msgstr "`GIT_PROTOCOL`"
 
 #. type: Plain text
-#: en/git.txt:849
+#: en/git.txt:846
 #, priority:100
 msgid "For internal use only.  Used in handshaking the wire protocol.  Contains a colon ':' separated list of keys with optional values 'key[=value]'.  Presence of unknown keys and values must be ignored."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:850
+#: en/git.txt:847
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_OPTIONAL_LOCKS`"
 msgstr "`GIT_OPTIONAL_LOCKS`"
 
 #. type: Plain text
-#: en/git.txt:857
+#: en/git.txt:854
 #, priority:100
 msgid "If set to `0`, Git will complete any requested operation without performing any optional sub-operations that require taking a lock.  For example, this will prevent `git status` from refreshing the index as a side effect. This is useful for processes running in the background which do not want to cause lock contention with other operations on the repository.  Defaults to `1`."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:858
+#: en/git.txt:855
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDIN`"
 msgstr "`GIT_REDIRECT_STDIN`"
 
 #. type: Labeled list
-#: en/git.txt:859
+#: en/git.txt:856
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDOUT`"
 msgstr "`GIT_REDIRECT_STDOUT`"
 
 #. type: Labeled list
-#: en/git.txt:860
+#: en/git.txt:857
 #, ignore-same, no-wrap, priority:100
 msgid "`GIT_REDIRECT_STDERR`"
 msgstr "`GIT_REDIRECT_STDERR`"
 
 #. type: Plain text
-#: en/git.txt:870
+#: en/git.txt:867
 #, priority:100
 msgid "Windows-only: allow redirecting the standard input/output/error handles to paths specified by the environment variables. This is particularly useful in multi-threaded applications where the canonical way to pass standard handles via `CreateProcess()` is not an option because it would require the handles to be marked inheritable (and consequently *every* spawned process would inherit them, possibly blocking regular Git operations). The primary intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe\\my-git-stdin-123`)."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:875
+#: en/git.txt:872
 #, priority:100
 msgid "Two special values are supported: `off` will simply close the corresponding standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will be redirected to the same handle as standard output."
 msgstr ""
 
 #. type: Labeled list
-#: en/git.txt:876
+#: en/git.txt:873
 #, no-wrap, priority:100
 msgid "`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:884
+#: en/git.txt:881
 #, priority:100
 msgid "If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value.  This affects indications of detached HEADs (linkgit:git-checkout[1]) and the raw diff output (linkgit:git-diff[1]).  Printing an ellipsis in the cases mentioned is no longer considered adequate and support for it is likely to be removed in the foreseeable future (along with the variable)."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:886
+#: en/git.txt:883
 #, no-wrap, priority:100
 msgid "Discussion[[Discussion]]"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:891
+#: en/git.txt:888
 #, priority:100
 msgid "More detail on the following is available from the link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:898
+#: en/git.txt:895
 #, priority:100
 msgid "A Git project normally consists of a working directory with a \".git\" subdirectory at the top level.  The .git directory contains, among other things, a compressed object database representing the complete history of the project, an \"index\" file which links that history to the current contents of the working tree, and named pointers into that history such as tags and branch heads."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:903
+#: en/git.txt:900
 #, priority:100
 msgid "The object database contains objects of three main types: blobs, which hold file data; trees, which point to blobs and other trees to build up directory hierarchies; and commits, which each reference a single tree and some number of parent commits."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:908
+#: en/git.txt:905
 #, priority:100
 msgid "The commit, equivalent to what other systems call a \"changeset\" or \"version\", represents a step in the project's history, and each parent represents an immediately preceding step.  Commits with more than one parent represent merges of independent lines of development."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:914
+#: en/git.txt:911
 #, priority:100
 msgid "All objects are named by the SHA-1 hash of their contents, normally written as a string of 40 hex digits.  Such names are globally unique.  The entire history leading up to a commit can be vouched for by signing just that commit.  A fourth object type, the tag, is provided for this purpose."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:917
+#: en/git.txt:914
 #, priority:100
 msgid "When first created, objects are stored in individual files, but for efficiency may later be compressed together into \"pack files\"."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:924
+#: en/git.txt:921
 #, priority:100
 msgid "Named pointers called refs mark interesting points in history.  A ref may contain the SHA-1 name of an object or the name of another ref.  Refs with names beginning `ref/head/` contain the SHA-1 name of the most recent commit (or \"head\") of a branch under development.  SHA-1 names of tags of interest are stored under `ref/tags/`.  A special ref named `HEAD` contains the name of the currently checked-out branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:933
+#: en/git.txt:930
 #, priority:100
 msgid "The index file is initialized with a list of all paths and, for each path, a blob object and a set of attributes.  The blob object represents the contents of the file as of the head of the current branch.  The attributes (last modified time, size, etc.) are taken from the corresponding file in the working tree.  Subsequent changes to the working tree can be found by comparing these attributes.  The index may be updated with new content, and new commits may be created from the content stored in the index."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:937
+#: en/git.txt:934
 #, priority:100
 msgid "The index is also capable of storing multiple entries (called \"stages\")  for a given pathname.  These stages are used to hold the various unmerged version of a file when a merge is in progress."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:939
+#: en/git.txt:936
 #, no-wrap, priority:100
 msgid "FURTHER DOCUMENTATION"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:944
+#: en/git.txt:941
 #, priority:100
 msgid "See the references in the \"description\" section to get started using Git.  The following is probably more detail than necessary for a first-time user."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:948
+#: en/git.txt:945
 #, priority:100
 msgid "The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide introductions to the underlying Git architecture."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:950
+#: en/git.txt:947
 #, priority:100
 msgid "See linkgit:gitworkflows[7] for an overview of recommended workflows."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:953
+#: en/git.txt:950
 #, priority:100
 msgid "See also the link:howto-index.html[howto] documents for some useful examples."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:956
+#: en/git.txt:953
 #, priority:100
 msgid "The internals are documented in the link:technical/api-index.html[Git API documentation]."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:959
+#: en/git.txt:956
 #, priority:100
 msgid "Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:962
+#: en/git.txt:959
 #, no-wrap, priority:100
 msgid "Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:967
+#: en/git.txt:964
 #, priority:100
 msgid "Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>.  http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:971
+#: en/git.txt:968
 #, priority:100
 msgid "If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you the authors for specific parts of the project."
 msgstr ""
 
 #. type: Title -
-#: en/git.txt:973
+#: en/git.txt:970
 #, no-wrap, priority:100
 msgid "Reporting Bugs"
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:980
+#: en/git.txt:977
 #, priority:100
 msgid "Report bugs to the Git mailing list <git@vger.kernel.org> where the development and maintenance is primarily done.  You do not have to be subscribed to the list to send a message there.  See the list archive at https://lore.kernel.org/git for previous bug reports and other discussions."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:983
+#: en/git.txt:980
 #, priority:100
 msgid "Issues which are security relevant should be disclosed privately to the Git Security mailing list <git-security@googlegroups.com>."
 msgstr ""
 
 #. type: Plain text
-#: en/git.txt:991
+#: en/git.txt:988
 #, priority:100
 msgid "linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:giteveryday[7], linkgit:gitcvs-migration[7], linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], linkgit:gitcli[7], link:user-manual.html[The Git User's Manual], linkgit:gitworkflows[7]"
 msgstr ""
@@ -56129,295 +56266,295 @@ msgid "By default, `add` refuses to create a new working tree when `<commit-ish>
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:130
+#: en/git-worktree.txt:132
 #, priority:240
-msgid "`move` refuses to move a locked working tree unless `--force` is specified twice."
+msgid "`move` refuses to move a locked working tree unless `--force` is specified twice. If the destination is already assigned to some other working tree but is missing (for instance, if `<new-path>` was deleted manually), then `--force` allows the move to proceed; use --force twice if the destination is locked."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:133
+#: en/git-worktree.txt:135
 #, priority:240
 msgid "`remove` refuses to remove an unclean working tree unless `--force` is used.  To remove a locked working tree, specify `--force` twice."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:134
+#: en/git-worktree.txt:136
 #, no-wrap, priority:240
 msgid "-b <new-branch>"
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:135
+#: en/git-worktree.txt:137
 #, no-wrap, priority:240
 msgid "-B <new-branch>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:142
+#: en/git-worktree.txt:144
 #, priority:240
 msgid "With `add`, create a new branch named `<new-branch>` starting at `<commit-ish>`, and check out `<new-branch>` into the new working tree.  If `<commit-ish>` is omitted, it defaults to HEAD.  By default, `-b` refuses to create a new branch if it already exists. `-B` overrides this safeguard, resetting `<new-branch>` to `<commit-ish>`."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:146
+#: en/git-worktree.txt:148
 #, priority:240
 msgid "With `add`, detach HEAD in the new working tree. See \"DETACHED HEAD\" in linkgit:git-checkout[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:147
+#: en/git-worktree.txt:149
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]checkout"
 msgstr "--[no-]checkout"
 
 #. type: Plain text
-#: en/git-worktree.txt:152
+#: en/git-worktree.txt:154
 #, priority:240
 msgid "By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be used to suppress checkout in order to make customizations, such as configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-tree[1]."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:153
+#: en/git-worktree.txt:155
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]guess-remote"
 msgstr "--[no-]guess-remote"
 
 #. type: Plain text
-#: en/git-worktree.txt:159
+#: en/git-worktree.txt:161
 #, priority:240
 msgid "With `worktree add <path>`, without `<commit-ish>`, instead of creating a new branch from HEAD, if there exists a tracking branch in exactly one remote matching the basename of `<path>`, base the new branch on the remote-tracking branch, and mark the remote-tracking branch as \"upstream\" from the new branch."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:162
+#: en/git-worktree.txt:164
 #, priority:240
 msgid "This can also be set up as the default behaviour by using the `worktree.guessRemote` config option."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:163
+#: en/git-worktree.txt:165
 #, ignore-same, no-wrap, priority:240
 msgid "--[no-]track"
 msgstr "--[no-]track"
 
 #. type: Plain text
-#: en/git-worktree.txt:168
+#: en/git-worktree.txt:170
 #, priority:240
 msgid "When creating a new branch, if `<commit-ish>` is a branch, mark it as \"upstream\" from the new branch.  This is the default if `<commit-ish>` is a remote-tracking branch.  See \"--track\" in linkgit:git-branch[1] for details."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:169
+#: en/git-worktree.txt:171
 #, ignore-same, no-wrap, priority:240
 msgid "--lock"
 msgstr "--lock"
 
 #. type: Plain text
-#: en/git-worktree.txt:173
+#: en/git-worktree.txt:175
 #, priority:240
 msgid "Keep the working tree locked after creation. This is the equivalent of `git worktree lock` after `git worktree add`, but without race condition."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:178
+#: en/git-worktree.txt:180
 #, priority:240
 msgid "With `prune`, do not remove anything; just report what it would remove."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:183
+#: en/git-worktree.txt:185
 #, priority:240
 msgid "With `list`, output in an easy-to-parse format for scripts.  This format will remain stable across Git versions and regardless of user configuration.  See below for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:187
+#: en/git-worktree.txt:189
 #, priority:240
 msgid "With 'add', suppress feedback messages."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:191
+#: en/git-worktree.txt:193
 #, priority:240
 msgid "With `prune`, report all removals."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:194
+#: en/git-worktree.txt:196
 #, priority:240
 msgid "With `prune`, only expire unused working trees older than <time>."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:195
+#: en/git-worktree.txt:197
 #, no-wrap, priority:240
 msgid "--reason <string>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:197
+#: en/git-worktree.txt:199
 #, priority:240
 msgid "With `lock`, an explanation why the working tree is locked."
 msgstr ""
 
 #. type: Labeled list
-#: en/git-worktree.txt:198
+#: en/git-worktree.txt:200
 #, no-wrap, priority:240
 msgid "<worktree>"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:201
+#: en/git-worktree.txt:203
 #, priority:240
 msgid "Working trees can be identified by path, either relative or absolute."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:206
+#: en/git-worktree.txt:208
 #, priority:240
 msgid "If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if you only have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi\" or \"def/ghi\" is enough to point to the former working tree."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:208
+#: en/git-worktree.txt:210
 #, no-wrap, priority:240
 msgid "REFS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:213
+#: en/git-worktree.txt:215
 #, priority:240
 msgid "In multiple working trees, some refs may be shared between all working trees, some refs are local. One example is HEAD is different for all working trees. This section is about the sharing rules and how to access refs of one working tree from another."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:219
+#: en/git-worktree.txt:221
 #, priority:240
 msgid "In general, all pseudo refs are per working tree and all refs starting with \"refs/\" are shared. Pseudo refs are ones like HEAD which are directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:224
+#: en/git-worktree.txt:226
 #, priority:240
 msgid "Refs that are per working tree can still be accessed from another working tree via two special paths, main-worktree and worktrees. The former gives access to per-worktree refs of the main working tree, while the latter to all linked working trees."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:231
+#: en/git-worktree.txt:233
 #, priority:240
 msgid "For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to the same value as the main working tree's HEAD and refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:235
+#: en/git-worktree.txt:237
 #, priority:240
 msgid "To access refs, it's best not to look inside GIT_DIR directly. Instead use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which will handle refs correctly."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:242
+#: en/git-worktree.txt:244
 #, priority:240
 msgid "By default, the repository \"config\" file is shared across all working trees. If the config variables `core.bare` or `core.worktree` are already present in the config file, they will be applied to the main working trees only."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:245
+#: en/git-worktree.txt:247
 #, priority:240
 msgid "In order to have configuration specific to working trees, you can turn on \"worktreeConfig\" extension, e.g.:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:248
+#: en/git-worktree.txt:250
 #, no-wrap, priority:240
 msgid "$ git config extensions.worktreeConfig true\n"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:254
+#: en/git-worktree.txt:256
 #, priority:240
 msgid "In this mode, specific configuration stays in the path pointed by `git rev-parse --git-path config.worktree`. You can add or update configuration in this file with `git config --worktree`. Older Git versions will refuse to access repositories with this extension."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:260
+#: en/git-worktree.txt:262
 #, priority:240
 msgid "Note that in this file, the exception for `core.bare` and `core.worktree` is gone. If you have them in $GIT_DIR/config before, you must move them to the `config.worktree` of the main working tree. You may also take this opportunity to review and move other configuration that you do not want to share to all working trees:"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:262
+#: en/git-worktree.txt:264
 #, priority:240
 msgid "`core.worktree` and `core.bare` should never be shared"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:265
+#: en/git-worktree.txt:267
 #, priority:240
 msgid "`core.sparseCheckout` is recommended per working tree, unless you are sure you always use sparse checkout for all working trees."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:267
+#: en/git-worktree.txt:269
 #, no-wrap, priority:240
 msgid "DETAILS"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:276
+#: en/git-worktree.txt:278
 #, priority:240
 msgid "Each linked working tree has a private sub-directory in the repository's $GIT_DIR/worktrees directory.  The private sub-directory's name is usually the base name of the linked working tree's path, possibly appended with a number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the command `git worktree add /path/other/test-next next` creates the linked working tree in `/path/other/test-next` and also creates a `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-next` is already taken)."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:282
+#: en/git-worktree.txt:284
 #, priority:240
 msgid "Within a linked working tree, $GIT_DIR is set to point to this private directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and $GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e.g. `/path/main/.git`). These settings are made in a `.git` file located at the top directory of the linked working tree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:292
+#: en/git-worktree.txt:294
 #, priority:240
 msgid "Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the linked working tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`, since refs are shared across all working trees, except refs/bisect and refs/worktree."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:297
+#: en/git-worktree.txt:299
 #, priority:240
 msgid "See linkgit:gitrepository-layout[5] for more information. The rule of thumb is do not make any assumption about whether a path belongs to $GIT_DIR or $GIT_COMMON_DIR when you need to directly access something inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:304
+#: en/git-worktree.txt:306
 #, priority:240
 msgid "If you manually move a linked working tree, you need to update the 'gitdir' file in the entry's directory. For example, if a linked working tree is moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next` instead."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:315
+#: en/git-worktree.txt:317
 #, priority:240
 msgid "To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful in some situations, such as when the entry's working tree is stored on a portable device), use the `git worktree lock` command, which adds a file named 'locked' to the entry's directory. The file contains the reason in plain text. For example, if a linked working tree's `.git` file points to `/path/main/.git/worktrees/test-next` then a file named `/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` entry from being pruned.  See linkgit:gitrepository-layout[5] for details."
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:318
+#: en/git-worktree.txt:320
 #, priority:240
 msgid "When extensions.worktreeConfig is enabled, the config file `.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
 msgstr ""
 
 #. type: Title -
-#: en/git-worktree.txt:320
+#: en/git-worktree.txt:322
 #, no-wrap, priority:240
 msgid "LIST OUTPUT FORMAT"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:323
+#: en/git-worktree.txt:325
 #, priority:240
 msgid "The worktree list command has two output formats.  The default format shows the details on a single line with columns.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:329
+#: en/git-worktree.txt:331
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list\n"
@@ -56427,19 +56564,19 @@ msgid ""
 msgstr ""
 
 #. type: Title ~
-#: en/git-worktree.txt:332
+#: en/git-worktree.txt:334
 #, no-wrap, priority:240
 msgid "Porcelain Format"
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:338
+#: en/git-worktree.txt:340
 #, priority:240
 msgid "The porcelain format has a line per attribute.  Attributes are listed with a label and value separated by a single space.  Boolean attributes (like 'bare' and 'detached') are listed as a label only, and are only present if and only if the value is true.  The first attribute of a worktree is always `worktree`, an empty line indicates the end of the record.  For example:"
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:343
+#: en/git-worktree.txt:345
 #, no-wrap, priority:240
 msgid ""
 "$ git worktree list --porcelain\n"
@@ -56448,7 +56585,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:347
+#: en/git-worktree.txt:349
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/linked-worktree\n"
@@ -56457,7 +56594,7 @@ msgid ""
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:351
+#: en/git-worktree.txt:353
 #, no-wrap, priority:240
 msgid ""
 "worktree /path/to/other-linked-worktree\n"
@@ -56466,13 +56603,13 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:364
+#: en/git-worktree.txt:366
 #, priority:240
 msgid "You are in the middle of a refactoring session and your boss comes in and demands that you fix something immediately. You might typically use linkgit:git-stash[1] to store your changes away temporarily, however, your working tree is in such a state of disarray (with new, moved, and removed files, and other bits and pieces strewn around) that you don't want to risk disturbing any of it. Instead, you create a temporary linked working tree to make the emergency fix, remove it when done, and then resume your earlier refactoring session."
 msgstr ""
 
 #. type: delimited block -
-#: en/git-worktree.txt:372
+#: en/git-worktree.txt:374
 #, ignore-ellipsis, no-wrap, priority:240
 msgid ""
 "$ git worktree add -b emergency-fix ../temp master\n"
@@ -56484,7 +56621,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/git-worktree.txt:379
+#: en/git-worktree.txt:381
 #, priority:240
 msgid "Multiple checkout in general is still experimental, and the support for submodules is incomplete. It is NOT recommended to make multiple checkouts of a superproject."
 msgstr ""
@@ -59258,7 +59395,7 @@ msgid "'%al'"
 msgstr "'%al'"
 
 #. type: Plain text
-#: en/pretty-formats.txt:184 en/pretty-formats.txt:200
+#: en/pretty-formats.txt:184
 #, priority:260
 msgid "author email local-part (the part before the '@' sign)"
 msgstr ""
@@ -59423,6 +59560,12 @@ msgstr ""
 msgid "'%cl'"
 msgstr "'%cl'"
 
+#. type: Plain text
+#: en/pretty-formats.txt:200
+#, priority:260
+msgid "committer email local-part (the part before the '@' sign)"
+msgstr ""
+
 #. type: Labeled list
 #: en/pretty-formats.txt:200
 #, ignore-same, no-wrap, priority:260
@@ -59432,7 +59575,7 @@ msgstr "'%cL'"
 #. type: Plain text
 #: en/pretty-formats.txt:201
 #, priority:260
-msgid "author local-part (see '%cl') respecting .mailmap, see"
+msgid "committer local-part (see '%cl') respecting .mailmap, see"
 msgstr ""
 
 #. type: Labeled list
@@ -65143,6 +65286,10 @@ msgstr ""
 msgid "[[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]"
 msgstr ""
 
+#, ignore-same
+#~ msgid "`GIT_REDACT_COOKIES`"
+#~ msgstr "`GIT_REDACT_COOKIES`"
+
 #, ignore-same
 #~ msgid "git-remote-testgit(1)"
 #~ msgstr "git-remote-testgit(1)"